Commit 13e1cccb authored by Wes Kocher's avatar Wes Kocher
Browse files

Merge inbound to central, a=merge 

MozReview-Commit-ID: EEMZdLCheAm
parents aa292f21 7b865b5d

accessible/ipc/DocAccessibleParent.cpp

+6 −1
Original line number Diff line number Diff line
@@ -411,8 +411,13 @@ DocAccessibleParent::AddChildDoc(DocAccessibleParent* aChildDoc, 
  // We do not use GetAccessible here because we want to be sure to not get the

  // document it self.

  ProxyEntry* e = mAccessibles.GetEntry(aParentID);

  if (!e)

  if (!e) {

#ifdef DEBUG

    return IPC_FAIL(this, "binding to nonexistant proxy!");

#else

    return IPC_OK();

#endif

  }



  ProxyAccessible* outerDoc = e->mProxy;

  MOZ_ASSERT(outerDoc);

browser/components/sessionstore/test/browser_crashedTabs.js

+3 −4
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ const PAGE_2 = "data:text/html,<html><body>Another%20regular,%20everyday,%20norm 
add_task(function* test_initialize() {

  yield SpecialPowers.pushPrefEnv({

    set: [

      [ "dom.ipc.processCount", 1 ],

      [ "browser.tabs.animate", false]

  ] });

});
@@ -241,7 +240,7 @@ add_task(function* test_revive_tab_from_session_store() { 
  browser.loadURI(PAGE_1);

  yield promiseBrowserLoaded(browser);



  let newTab2 = gBrowser.addTab();

  let newTab2 = gBrowser.addTab("about:blank", { sameProcessAsFrameLoader: browser.frameLoader });

  let browser2 = newTab2.linkedBrowser;

  ok(browser2.isRemoteBrowser, "Should be a remote browser");

  yield promiseBrowserLoaded(browser2);
@@ -298,7 +297,7 @@ add_task(function* test_revive_all_tabs_from_session_store() { 
  // a second window, since only selected tabs will show

  // about:tabcrashed.

  let win2 = yield BrowserTestUtils.openNewBrowserWindow();

  let newTab2 = win2.gBrowser.addTab(PAGE_1);

  let newTab2 = win2.gBrowser.addTab(PAGE_1, { sameProcessAsFrameLoader: browser.frameLoader });

  win2.gBrowser.selectedTab = newTab2;

  let browser2 = newTab2.linkedBrowser;

  ok(browser2.isRemoteBrowser, "Should be a remote browser");
@@ -405,7 +404,7 @@ add_task(function* test_hide_restore_all_button() { 
  // Load up a second window so we can get another tab to show

  // about:tabcrashed

  let win2 = yield BrowserTestUtils.openNewBrowserWindow();

  let newTab3 = win2.gBrowser.addTab(PAGE_2);

  let newTab3 = win2.gBrowser.addTab(PAGE_2, { sameProcessAsFrameLoader: browser.frameLoader });

  win2.gBrowser.selectedTab = newTab3;

  let otherWinBrowser = newTab3.linkedBrowser;

  yield promiseBrowserLoaded(otherWinBrowser);

browser/locales/jar.mn

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ 
    locale/browser/searchplugins/list.json      (.deps/generated_@AB_CD@/list.json)

#endif

    locale/browser/searchplugins/images/wikipedia.ico  (searchplugins/images/wikipedia.ico)

    locale/browser/searchplugins/images/yandex-en.ico  (searchplugins/images/yandex-en.ico)

% locale browser-region @AB_CD@ %locale/browser-region/

    locale/browser-region/region.properties        (%chrome/browser-region/region.properties)

# the following files are browser-specific overrides

browser/locales/search/list.json

+6 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
      },

      "experimental-hidden": {

        "visibleDefaultEngines": [

          "yahoo-en-CA"

          "yahoo-en-CA", "yandex-en"

        ]

      }

    },
@@ -194,6 +194,11 @@ 
        "visibleDefaultEngines": [

          "google", "yahoo-en-GB", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "twitter", "wikipedia"

        ]

      },

      "experimental-hidden": {

        "visibleDefaultEngines": [

          "yandex-en"

        ]

      }

    },

    "en-ZA": {

browser/locales/searchplugins/images/yandex-en.ico

0 → 100644
+1.65 KiB
Loading image diff...