diff --git a/build/automation.py.in b/build/automation.py.in index b292a67f63b..2bd5844f76f 100644 --- a/build/automation.py.in +++ b/build/automation.py.in @@ -339,7 +339,6 @@ user_pref("dom.disable_open_during_load", false); user_pref("dom.max_script_run_time", 0); // no slow script dialogs user_pref("dom.max_chrome_script_run_time", 0); user_pref("dom.popup_maximum", -1); -user_pref("dom.send_after_paint_to_content", true); user_pref("dom.successive_dialog_time_limit", 0); user_pref("signed.applets.codebase_principal_support", true); user_pref("security.warn_submit_insecure", false); diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp index 875222413d5..b48f0b3afa2 100644 --- a/layout/base/nsPresContext.cpp +++ b/layout/base/nsPresContext.cpp @@ -229,7 +229,6 @@ nsPresContext::nsPresContext(nsIDocument* aDocument, nsPresContextType aType) mActiveLinkColor = NS_RGB(0xEE, 0x00, 0x00); mVisitedLinkColor = NS_RGB(0x55, 0x1A, 0x8B); mUnderlineLinks = PR_TRUE; - mSendAfterPaintToContent = PR_FALSE; mFocusTextColor = mDefaultColor; mFocusBackgroundColor = mBackgroundColor; @@ -304,9 +303,6 @@ nsPresContext::~nsPresContext() #ifdef IBMBIDI nsContentUtils::UnregisterPrefCallback("bidi.", PrefChangedCallback, this); #endif // IBMBIDI - nsContentUtils::UnregisterPrefCallback("dom.send_after_paint_to_content", - nsPresContext::PrefChangedCallback, - this); nsContentUtils::UnregisterPrefCallback("gfx.font_rendering.", nsPresContext::PrefChangedCallback, this); @@ -653,10 +649,6 @@ nsPresContext::GetUserPreferences() // * document colors GetDocumentColorPreferences(); - mSendAfterPaintToContent = - nsContentUtils::GetBoolPref("dom.send_after_paint_to_content", - mSendAfterPaintToContent); - // * link colors mUnderlineLinks = nsContentUtils::GetBoolPref("browser.underline_anchors", mUnderlineLinks); @@ -964,9 +956,6 @@ nsPresContext::Init(nsIDeviceContext* aDeviceContext) nsContentUtils::RegisterPrefCallback("bidi.", PrefChangedCallback, this); #endif - nsContentUtils::RegisterPrefCallback("dom.send_after_paint_to_content", - nsPresContext::PrefChangedCallback, - this); nsContentUtils::RegisterPrefCallback("gfx.font_rendering.", PrefChangedCallback, this); nsContentUtils::RegisterPrefCallback("layout.css.dpi", @@ -2103,20 +2092,13 @@ nsPresContext::FireDOMPaintEvent() nsCOMPtr dispatchTarget = do_QueryInterface(ourWindow); nsCOMPtr eventTarget = dispatchTarget; if (!IsChrome()) { - PRBool notifyContent = mSendAfterPaintToContent; - - if (notifyContent) { - // If the pref is set, we still don't post events when they're - // entirely cross-doc. - notifyContent = PR_FALSE; - for (PRUint32 i = 0; i < mInvalidateRequests.mRequests.Length(); ++i) { - if (!(mInvalidateRequests.mRequests[i].mFlags & - nsIFrame::INVALIDATE_CROSS_DOC)) { - notifyContent = PR_TRUE; - } + PRBool isCrossDocOnly = PR_TRUE; + for (PRUint32 i = 0; i < mInvalidateRequests.mRequests.Length(); ++i) { + if (!(mInvalidateRequests.mRequests[i].mFlags & nsIFrame::INVALIDATE_CROSS_DOC)) { + isCrossDocOnly = PR_FALSE; } } - if (!notifyContent) { + if (isCrossDocOnly) { // Don't tell the window about this event, it should not know that // something happened in a subdocument. Tell only the chrome event handler. // (Events sent to the window get propagated to the chrome event handler diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h index 9e674516aef..c07fa83b8c9 100644 --- a/layout/base/nsPresContext.h +++ b/layout/base/nsPresContext.h @@ -1121,7 +1121,6 @@ protected: unsigned mUseDocumentFonts : 1; unsigned mUseDocumentColors : 1; unsigned mUnderlineLinks : 1; - unsigned mSendAfterPaintToContent : 1; unsigned mUseFocusColors : 1; unsigned mFocusRingOnAnything : 1; unsigned mFocusRingStyle : 1; diff --git a/layout/base/tests/Makefile.in b/layout/base/tests/Makefile.in index e9d1232be92..06c442b17dd 100644 --- a/layout/base/tests/Makefile.in +++ b/layout/base/tests/Makefile.in @@ -66,7 +66,6 @@ _TEST_FILES = \ bug369950-subframe.xml \ bug495648.rdf \ decoration_line_rendering.js \ - test_after_paint_pref.html \ test_border_radius_hit_testing.html \ test_bug66619.html \ test_bug114649.html \ diff --git a/layout/base/tests/test_after_paint_pref.html b/layout/base/tests/test_after_paint_pref.html deleted file mode 100644 index 0ff22d3d861..00000000000 --- a/layout/base/tests/test_after_paint_pref.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - Test for MozAfterPaint pref Bug 608030 - - - - - -Mozilla Bug 608030 -
-
-
-
- - diff --git a/layout/tools/reftest/reftest-cmdline.js b/layout/tools/reftest/reftest-cmdline.js index ec4bc2bfa36..41b99771caf 100644 --- a/layout/tools/reftest/reftest-cmdline.js +++ b/layout/tools/reftest/reftest-cmdline.js @@ -107,7 +107,6 @@ RefTestCmdLineHandler.prototype = branch.setBoolPref("gfx.color_management.force_srgb", true); branch.setBoolPref("browser.dom.window.dump.enabled", true); branch.setIntPref("ui.caretBlinkTime", -1); - branch.setBoolPref("dom.send_after_paint_to_content", true); // no slow script dialogs branch.setIntPref("dom.max_script_run_time", 0); branch.setIntPref("dom.max_chrome_script_run_time", 0); diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js index a06a109c90a..cceac5849c6 100644 --- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js @@ -570,8 +570,6 @@ pref("dom.disable_open_click_delay", 1000); pref("dom.storage.enabled", true); pref("dom.storage.default_quota", 5120); -pref("dom.send_after_paint_to_content", false); - // Timeout clamp in ms for timeouts we clamp pref("dom.min_timeout_value", 10);