Title: [265242] trunk/Source/WebCore
Revision
265242
Author
[email protected]
Date
2020-08-03 22:57:39 -0700 (Mon, 03 Aug 2020)

Log Message

m_isEditableRegionEnabled should be reset in didCommitLoad, not didFinishLoad
https://bugs.webkit.org/show_bug.cgi?id=215115

Reviewed by Wenson Hsieh.

Resetting m_isEditableRegionEnabled in didFinishLoad() is too late because
inline script at the end of the <body> (e.g. in a layout test) will have already
run before the reset.

Fix by adding Page::didCommitLoad() and resetting m_isEditableRegionEnabled there.

* loader/FrameLoader.cpp:
(WebCore::FrameLoader::dispatchDidCommitLoad):
* page/Page.cpp:
(WebCore::Page::didCommitLoad):
(WebCore::Page::didFinishLoad):
* page/Page.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (265241 => 265242)


--- trunk/Source/WebCore/ChangeLog	2020-08-04 04:49:59 UTC (rev 265241)
+++ trunk/Source/WebCore/ChangeLog	2020-08-04 05:57:39 UTC (rev 265242)
@@ -1,3 +1,23 @@
+2020-08-03  Simon Fraser  <[email protected]>
+
+        m_isEditableRegionEnabled should be reset in didCommitLoad, not didFinishLoad
+        https://bugs.webkit.org/show_bug.cgi?id=215115
+
+        Reviewed by Wenson Hsieh.
+
+        Resetting m_isEditableRegionEnabled in didFinishLoad() is too late because
+        inline script at the end of the <body> (e.g. in a layout test) will have already
+        run before the reset.
+        
+        Fix by adding Page::didCommitLoad() and resetting m_isEditableRegionEnabled there.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::dispatchDidCommitLoad):
+        * page/Page.cpp:
+        (WebCore::Page::didCommitLoad):
+        (WebCore::Page::didFinishLoad):
+        * page/Page.h:
+
 2020-08-03  Myles C. Maxfield  <[email protected]>
 
         Unconditionally record string offsets in the fast text codepath

Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (265241 => 265242)


--- trunk/Source/WebCore/loader/FrameLoader.cpp	2020-08-04 04:49:59 UTC (rev 265241)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp	2020-08-04 05:57:39 UTC (rev 265242)
@@ -3980,10 +3980,8 @@
 
     m_client->dispatchDidCommitLoad(initialHasInsecureContent, initialUsedLegacyTLS);
 
-    if (m_frame.isMainFrame()) {
-        m_frame.page()->resetSeenPlugins();
-        m_frame.page()->resetSeenMediaEngines();
-    }
+    if (m_frame.isMainFrame())
+        m_frame.page()->didCommitLoad();
 
     InspectorInstrumentation::didCommitLoad(m_frame, m_documentLoader.get());
 

Modified: trunk/Source/WebCore/page/Page.cpp (265241 => 265242)


--- trunk/Source/WebCore/page/Page.cpp	2020-08-04 04:49:59 UTC (rev 265241)
+++ trunk/Source/WebCore/page/Page.cpp	2020-08-04 05:57:39 UTC (rev 265242)
@@ -1229,11 +1229,17 @@
         m_performanceMonitor->didStartProvisionalLoad();
 }
 
-void Page::didFinishLoad()
+void Page::didCommitLoad()
 {
 #if ENABLE(EDITABLE_REGION)
     m_isEditableRegionEnabled = false;
 #endif
+    resetSeenPlugins();
+    resetSeenMediaEngines();
+}
+
+void Page::didFinishLoad()
+{
     resetRelevantPaintedObjectCounter();
 
     if (m_performanceMonitor)

Modified: trunk/Source/WebCore/page/Page.h (265241 => 265242)


--- trunk/Source/WebCore/page/Page.h	2020-08-04 04:49:59 UTC (rev 265241)
+++ trunk/Source/WebCore/page/Page.h	2020-08-04 05:57:39 UTC (rev 265242)
@@ -348,7 +348,8 @@
     WEBCORE_EXPORT void updateMediaElementRateChangeRestrictions();
 
     void didStartProvisionalLoad();
-    void didFinishLoad(); // Called when the load has been committed in the main frame.
+    void didCommitLoad();
+    void didFinishLoad();
 
     bool delegatesScaling() const { return m_delegatesScaling; }
     WEBCORE_EXPORT void setDelegatesScaling(bool);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to