diff --git a/browser/metro/base/content/browser.js b/browser/metro/base/content/browser.js index 0382d4e9707b..cd4296d9ad8f 100644 --- a/browser/metro/base/content/browser.js +++ b/browser/metro/base/content/browser.js @@ -1477,9 +1477,6 @@ Tab.prototype = { // stop about:blank from loading browser.stop(); - let fl = browser.QueryInterface(Ci.nsIFrameLoaderOwner).frameLoader; - fl.renderMode = Ci.nsIFrameLoader.RENDER_MODE_ASYNC_SCROLL; - return browser; }, diff --git a/content/base/public/nsIFrameLoader.idl b/content/base/public/nsIFrameLoader.idl index e3ed0363f3d4..beff6e1e66c8 100644 --- a/content/base/public/nsIFrameLoader.idl +++ b/content/base/public/nsIFrameLoader.idl @@ -16,7 +16,7 @@ interface nsIDOMElement; interface nsITabParent; interface nsILoadContext; -[scriptable, builtinclass, uuid(55a772b8-855a-4c5f-b4a1-284b6b3bec28)] +[scriptable, builtinclass, uuid(7600aa92-88dc-491c-896d-0564159b6a66)] interface nsIFrameLoader : nsISupports { /** @@ -116,24 +116,6 @@ interface nsIFrameLoader : nsISupports */ void requestNotifyAfterRemotePaint(); - /** - * The default rendering mode is synchronous scrolling. In this - * mode, it's an error to try to set a target viewport. - */ - const unsigned long RENDER_MODE_DEFAULT = 0x00000000; - - /** - * When asynchronous scrolling is enabled, a target viewport can be - * set to transform content pixels wrt its CSS viewport. - * - * NB: when async scrolling is enabled, it's the *user's* - * responsibility to update the target scroll offset. In effect, - * the platform hands over control of scroll offset to the user. - */ - const unsigned long RENDER_MODE_ASYNC_SCROLL = 0x00000001; - - attribute unsigned long renderMode; - /** * The default event mode automatically forwards the events * handled in EventStateManager::HandleCrossProcessEvent to diff --git a/content/base/src/nsFrameLoader.cpp b/content/base/src/nsFrameLoader.cpp index 6589f87a949f..ec811a5341a7 100644 --- a/content/base/src/nsFrameLoader.cpp +++ b/content/base/src/nsFrameLoader.cpp @@ -171,7 +171,6 @@ nsFrameLoader::nsFrameLoader(Element* aOwner, bool aNetworkCreated) , mCurrentRemoteFrame(nullptr) , mRemoteBrowser(nullptr) , mChildID(0) - , mRenderMode(RENDER_MODE_DEFAULT) , mEventMode(EVENT_MODE_NORMAL_DISPATCH) , mPendingFrameSent(false) { @@ -1952,24 +1951,6 @@ nsFrameLoader::UpdateBaseWindowPositionAndSize(nsSubDocumentFrame *aIFrame) return NS_OK; } -NS_IMETHODIMP -nsFrameLoader::GetRenderMode(uint32_t* aRenderMode) -{ - *aRenderMode = mRenderMode; - return NS_OK; -} - -NS_IMETHODIMP -nsFrameLoader::SetRenderMode(uint32_t aRenderMode) -{ - if (aRenderMode == mRenderMode) { - return NS_OK; - } - - mRenderMode = aRenderMode; - return NS_OK; -} - NS_IMETHODIMP nsFrameLoader::GetEventMode(uint32_t* aEventMode) { diff --git a/content/base/src/nsFrameLoader.h b/content/base/src/nsFrameLoader.h index f8a4fbe7e673..530b9af76d35 100644 --- a/content/base/src/nsFrameLoader.h +++ b/content/base/src/nsFrameLoader.h @@ -69,11 +69,6 @@ protected: ~nsFrameLoader(); public: - bool AsyncScrollEnabled() const - { - return !!(mRenderMode & RENDER_MODE_ASYNC_SCROLL); - } - static nsFrameLoader* Create(mozilla::dom::Element* aOwner, bool aNetworkCreated); @@ -367,11 +362,6 @@ private: TabParent* mRemoteBrowser; uint64_t mChildID; - // See nsIFrameLoader.idl. Short story, if !(mRenderMode & - // RENDER_MODE_ASYNC_SCROLL), all the fields below are ignored in - // favor of what content tells. - uint32_t mRenderMode; - // See nsIFrameLoader.idl. EVENT_MODE_NORMAL_DISPATCH automatically // forwards some input events to out-of-process content. uint32_t mEventMode; diff --git a/layout/tools/reftest/reftest-content.js b/layout/tools/reftest/reftest-content.js index 63acd8f43d4e..2c307e1bafca 100644 --- a/layout/tools/reftest/reftest-content.js +++ b/layout/tools/reftest/reftest-content.js @@ -227,7 +227,6 @@ function setupDisplayport(contentRootElement) { } if (contentRootElement.hasAttribute("reftest-async-scroll")) { - SendEnableAsyncScroll(); setupDisplayportForElementSubtree(contentRootElement); } else { setupDisplayportForElement(contentRootElement); @@ -865,11 +864,6 @@ function SendFailedNoPaint() sendAsyncMessage("reftest:FailedNoPaint"); } -function SendEnableAsyncScroll() -{ - sendAsyncMessage("reftest:EnableAsyncScroll"); -} - // Return true if a snapshot was taken. function SendInitCanvasWithSnapshot() { diff --git a/layout/tools/reftest/reftest.js b/layout/tools/reftest/reftest.js index d8eb8ad7c39e..d89ec4a73b02 100644 --- a/layout/tools/reftest/reftest.js +++ b/layout/tools/reftest/reftest.js @@ -1780,7 +1780,6 @@ function FinishTestItem() gDumpLog("REFTEST INFO | Loading a blank page\n"); // After clearing, content will notify us of the assertion count // and tests will continue. - SetAsyncScroll(false); SendClear(); gFailedNoPaint = false; } @@ -1910,21 +1909,10 @@ function RegisterMessageListenersAndLoadContentScript() "reftest:ExpectProcessCrash", function (m) { RecvExpectProcessCrash(); } ); - gBrowserMessageManager.addMessageListener( - "reftest:EnableAsyncScroll", - function (m) { SetAsyncScroll(true); } - ); gBrowserMessageManager.loadFrameScript("chrome://reftest/content/reftest-content.js", true, true); } -function SetAsyncScroll(enabled) -{ - gBrowser.QueryInterface(CI.nsIFrameLoaderOwner).frameLoader.renderMode = - enabled ? CI.nsIFrameLoader.RENDER_MODE_ASYNC_SCROLL : - CI.nsIFrameLoader.RENDER_MODE_DEFAULT; -} - function RecvAssertionCount(count) { DoAssertionCheck(count); diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index aef3d56b0a2f..379aa4a5ad74 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -3220,9 +3220,6 @@ Tab.prototype = { this.browser.stop(); - let frameLoader = this.browser.QueryInterface(Ci.nsIFrameLoaderOwner).frameLoader; - frameLoader.renderMode = Ci.nsIFrameLoader.RENDER_MODE_ASYNC_SCROLL; - // only set tab uri if uri is valid let uri = null; let title = aParams.title || aURL;