Changeset 79064 in webkit

Timestamp:

Feb 18, 2011 6:22:56 PM (13 years ago)

Author:

weinig@apple.com

Message:

Real fix for <rdar://problem/9025723> CrashTracer: [USER]
1 crash in WebProcess at com.apple.WebKit2:
WebKit::WebPage::didChangeScrollOffsetForMainFrame + 31

Reviewed by Adele Peterson.

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::didChangeScrollOffset):
Add null check for the FrameView. This function can be called when the
FrameView is being torn down during a transition to a new FrameView.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::didChangeScrollOffsetForMainFrame):
Revert last attempt.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-02-18  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Adele Peterson.
+
+        Real fix for <rdar://problem/9025723> CrashTracer: [USER] 
+        1 crash in WebProcess at com.apple.WebKit2: 
+        WebKit::WebPage::didChangeScrollOffsetForMainFrame + 31
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::didChangeScrollOffset):
+        Add null check for the FrameView. This function can be called when the
+        FrameView is being torn down during a transition to a new FrameView.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::didChangeScrollOffsetForMainFrame):
+        Revert last attempt.
+
 2011-02-18  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -1303 +1303 @@
         return;
 
+    // If this is called when tearing down a FrameView, the WebCore::Frame's
+    // current FrameView will be null.
+    if (!m_frame->coreFrame()->view())
+        return;
+
     webPage->didChangeScrollOffsetForMainFrame();
 }

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -1686 +1686 @@
 {
     Frame* frame = m_page->mainFrame();
-    if (!frame)
-        return;
-
     IntPoint scrollPosition = frame->view()->scrollPosition();
     IntPoint maximumScrollPosition = frame->view()->maximumScrollPosition();