Changeset 236513 in webkit

Timestamp:

Sep 26, 2018, 11:45:23 AM (8 years ago)

Author:

Chris Dumez

Message:

Unreviewed, apply post-landing review comments after r236512.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::didCreateMainFrame):
(WebKit::WebPageProxy::didCreateSubframe):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-09-26  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, apply post-landing review comments after r236512.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::didCreateMainFrame):
+        (WebKit::WebPageProxy::didCreateSubframe):
+
 2018-09-26  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -3358 +3358 @@
 void WebPageProxy::didCreateMainFrame(uint64_t frameID)
 {
+    // The DecidePolicyForNavigationActionSync IPC is synchronous and may therefore get processed before the DidCreateMainFrame one.
+    // When this happens, decidePolicyForNavigationActionSync() calls didCreateMainFrame() and we need to ignore the DidCreateMainFrame
+    // IPC when it later gets processed.
     if (m_mainFrame && m_mainFrame->frameID() == frameID)
         return;
@@ -3384 +3387 @@
     MESSAGE_CHECK(m_mainFrame);
 
+    // The DecidePolicyForNavigationActionSync IPC is synchronous and may therefore get processed before the DidCreateSubframe one.
+    // When this happens, decidePolicyForNavigationActionSync() calls didCreateSubframe() and we need to ignore the DidCreateSubframe
+    // IPC when it later gets processed.
     if (m_process->webFrame(frameID))
         return;