From 64b6f74f894183a8abbb6d263f8a995cecb99459 Mon Sep 17 00:00:00 2001 From: win7-7 Date: Fri, 24 May 2019 20:00:07 +0300 Subject: [PATCH 01/42] Lots of time spent maintaining nsDisplayLayerEventRegions (#1116) * Simplify the dispatch-to-content region Simplify the dispatch-to-content region in nsDisplayLayerEventRegions::AddFrame() and AddInactiveScrollPort() if it starts to get large. * tabs to spaces --- layout/base/nsDisplayList.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp index c830891a50..a55ec1e393 100644 --- a/layout/base/nsDisplayList.cpp +++ b/layout/base/nsDisplayList.cpp @@ -3808,12 +3808,14 @@ nsDisplayLayerEventRegions::AddFrame(nsDisplayListBuilder* aBuilder, // region on scrollbar frames that won't be placed in their own layer. See // bug 1213324 for details. mDispatchToContentHitRegion.Or(mDispatchToContentHitRegion, borderBox); + mDispatchToContentHitRegion.SimplifyOutward(8); } else if (aFrame->GetType() == nsGkAtoms::objectFrame) { // If the frame is a plugin frame and wants to handle wheel events as // default action, we should add the frame to dispatch-to-content region. nsPluginFrame* pluginFrame = do_QueryFrame(aFrame); if (pluginFrame && pluginFrame->WantsToHandleWheelEventAsDefaultAction()) { mDispatchToContentHitRegion.Or(mDispatchToContentHitRegion, borderBox); + mDispatchToContentHitRegion.SimplifyOutward(8); } } @@ -3850,6 +3852,7 @@ nsDisplayLayerEventRegions::AddFrame(nsDisplayListBuilder* aBuilder, } if (alreadyHadRegions) { mDispatchToContentHitRegion.OrWith(CombinedTouchActionRegion()); + mDispatchToContentHitRegion.SimplifyOutward(8); } } } @@ -3859,6 +3862,7 @@ nsDisplayLayerEventRegions::AddInactiveScrollPort(const nsRect& aRect) { mHitRegion.Or(mHitRegion, aRect); mDispatchToContentHitRegion.Or(mDispatchToContentHitRegion, aRect); + mDispatchToContentHitRegion.SimplifyOutward(8); } bool From 8ca43343c95fb5c00ad511068b2fe41f05a80c7a Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 25 May 2019 00:31:24 +0200 Subject: [PATCH 02/42] Fix architecture flag for PPC64 Fixes #1092 --- js/src/jstypes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/jstypes.h b/js/src/jstypes.h index 6cfb3d4ad2..04ffbe00d3 100644 --- a/js/src/jstypes.h +++ b/js/src/jstypes.h @@ -147,7 +147,7 @@ # define JS_64BIT # endif #elif defined(__GNUC__) -# if defined(__x86_64__) || defined(__64BIT__) +# if defined(__x86_64__) || defined(__LP64__) # define JS_64BIT # endif #elif defined(__xlc__) || defined(__xlC__) /* IBM XL C/C++ */ From 4ab1401ee6ecec9f1e22a45a09b84988b8170ac3 Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Fri, 24 May 2019 20:14:44 -0400 Subject: [PATCH 03/42] Issue #1102 - Disable Create a new pref 'dom.meta-set-cookie.enabled' which is set to 'false', disabling http-equiv meta cookies. --- dom/base/nsContentSink.cpp | 3 ++- .../cookie/test/file_domain_hierarchy_inner.html | 1 - .../test/file_domain_hierarchy_inner.html^headers^ | 1 + .../test/file_domain_hierarchy_inner_inner.html | 1 - .../file_domain_hierarchy_inner_inner.html^headers^ | 1 + .../test/file_domain_hierarchy_inner_inner_inner.html | 1 - ...e_domain_hierarchy_inner_inner_inner.html^headers^ | 1 + extensions/cookie/test/file_domain_inner.html | 1 - .../cookie/test/file_domain_inner.html^headers^ | 1 + extensions/cookie/test/file_domain_inner_inner.html | 1 - .../cookie/test/file_domain_inner_inner.html^headers^ | 1 + extensions/cookie/test/file_image_inner.html | 1 - extensions/cookie/test/file_image_inner.html^headers^ | 1 + extensions/cookie/test/file_image_inner_inner.html | 1 - .../cookie/test/file_image_inner_inner.html^headers^ | 1 + extensions/cookie/test/file_loadflags_inner.html | 1 - .../cookie/test/file_loadflags_inner.html^headers^ | 1 + extensions/cookie/test/file_localhost_inner.html | 1 - .../cookie/test/file_localhost_inner.html^headers^ | 1 + extensions/cookie/test/file_loopback_inner.html | 1 - .../cookie/test/file_loopback_inner.html^headers^ | 1 + extensions/cookie/test/file_subdomain_inner.html | 1 - .../cookie/test/file_subdomain_inner.html^headers^ | 1 + extensions/cookie/test/mochitest.ini | 11 +++++++++++ extensions/cookie/test/test_same_base_domain.html | 2 +- extensions/cookie/test/test_same_base_domain_2.html | 2 +- extensions/cookie/test/test_same_base_domain_3.html | 2 +- extensions/cookie/test/test_same_base_domain_5.html | 2 +- extensions/cookie/test/test_samedomain.html | 2 +- modules/libpref/init/all.js | 3 +++ 30 files changed, 32 insertions(+), 17 deletions(-) create mode 100644 extensions/cookie/test/file_domain_hierarchy_inner.html^headers^ create mode 100644 extensions/cookie/test/file_domain_hierarchy_inner_inner.html^headers^ create mode 100644 extensions/cookie/test/file_domain_hierarchy_inner_inner_inner.html^headers^ create mode 100644 extensions/cookie/test/file_domain_inner.html^headers^ create mode 100644 extensions/cookie/test/file_domain_inner_inner.html^headers^ create mode 100644 extensions/cookie/test/file_image_inner.html^headers^ create mode 100644 extensions/cookie/test/file_image_inner_inner.html^headers^ create mode 100644 extensions/cookie/test/file_loadflags_inner.html^headers^ create mode 100644 extensions/cookie/test/file_localhost_inner.html^headers^ create mode 100644 extensions/cookie/test/file_loopback_inner.html^headers^ create mode 100644 extensions/cookie/test/file_subdomain_inner.html^headers^ diff --git a/dom/base/nsContentSink.cpp b/dom/base/nsContentSink.cpp index 85b3d07bf8..490f0ec17c 100644 --- a/dom/base/nsContentSink.cpp +++ b/dom/base/nsContentSink.cpp @@ -304,7 +304,8 @@ nsContentSink::ProcessHeaderData(nsIAtom* aHeader, const nsAString& aValue, mDocument->SetHeaderData(aHeader, aValue); - if (aHeader == nsGkAtoms::setcookie) { + if (aHeader == nsGkAtoms::setcookie && + Preferences::GetBool("dom.meta-set-cookie.enabled", true)) { // Don't allow setting cookies in cookie-averse documents. if (mDocument->IsCookieAverse()) { return NS_OK; diff --git a/extensions/cookie/test/file_domain_hierarchy_inner.html b/extensions/cookie/test/file_domain_hierarchy_inner.html index 1a37345975..a62e1b9e42 100644 --- a/extensions/cookie/test/file_domain_hierarchy_inner.html +++ b/extensions/cookie/test/file_domain_hierarchy_inner.html @@ -1,7 +1,6 @@ - - +

         
   
 
-
+
 

         
   
 
-
+
 

         
   
 
-
+
 

         
   
 
-
+