Changeset 84757 in webkit

Timestamp:

Apr 24, 2011 11:29:49 AM (13 years ago)

Author:

mitz@apple.com

Message:

../WebCore: Manual test for <rdar://problem/9329741> Reproducible crash in WebChromeClient::invalidateContentsAndWindow() on simonscat.com
​https://bugs.webkit.org/show_bug.cgi?id=59299

Reviewed by Maciej Stachowiak.

• manual-tests/back-from-document-with-scrollbar.html: Added.

../WebKit2: <rdar://problem/9329741> Reproducible crash in WebChromeClient::invalidateContentsAndWindow() on simonscat.com
​https://bugs.webkit.org/show_bug.cgi?id=59299

Reviewed by Maciej Stachowiak.

• WebProcess/WebCoreSupport/WebChromeClient.cpp:

(WebKit::WebChromeClient::invalidateContentsAndWindow): Null-check the document.
(WebKit::WebChromeClient::invalidateContentsForSlowScroll): Ditto.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/manual-tests/back-from-document-with-scrollbar.html (added)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-24  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        Manual test for <rdar://problem/9329741> Reproducible crash in WebChromeClient::invalidateContentsAndWindow() on simonscat.com
+        https://bugs.webkit.org/show_bug.cgi?id=59299
+
+        * manual-tests/back-from-document-with-scrollbar.html: Added.
+
 2011-04-24  Rik Cabanier  <cabanier@adobe.com>
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-24  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        <rdar://problem/9329741> Reproducible crash in WebChromeClient::invalidateContentsAndWindow() on simonscat.com
+        https://bugs.webkit.org/show_bug.cgi?id=59299
+
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::invalidateContentsAndWindow): Null-check the document.
+        (WebKit::WebChromeClient::invalidateContentsForSlowScroll): Ditto.
+
 2011-04-23  Sheriff Bot  <webkit.review.bot@gmail.com>
 

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

@@ -357 +357 @@
 void WebChromeClient::invalidateContentsAndWindow(const IntRect& rect, bool)
 {
-    if (m_page->corePage()->mainFrame()->document()->printing())
-        return;
+    if (Document* document = m_page->corePage()->mainFrame()->document()) {
+        if (document->printing())
+            return;
+    }
+
     m_page->drawingArea()->setNeedsDisplay(rect);
 }
@@ -364 +367 @@
 void WebChromeClient::invalidateContentsForSlowScroll(const IntRect& rect, bool)
 {
-    if (m_page->corePage()->mainFrame()->document()->printing())
-        return;
+    if (Document* document = m_page->corePage()->mainFrame()->document()) {
+        if (document->printing())
+            return;
+    }
+
     m_page->pageDidScroll();
     m_page->drawingArea()->setNeedsDisplay(rect);