wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1087293 - Remove unused nsIFrameLoader::renderMode. r=kats

Browse Source
This commit is contained in:
Markus Stange 2014-10-23 22:45:14 +02:00
parent 4ac24cbbd6
commit edd6bde493
7 changed files with 1 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/metro/base/content/browser.js
View File

@ -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;
},

20
content/base/public/nsIFrameLoader.idl
View File

@ -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

19
content/base/src/nsFrameLoader.cpp
View File

@ -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)
{

10
content/base/src/nsFrameLoader.h
View File

@ -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;

6
layout/tools/reftest/reftest-content.js
View File

@ -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()
{

12
layout/tools/reftest/reftest.js
View File

@ -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);

3
mobile/android/chrome/content/browser.js
View File

@ -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;