Changeset 147945 in webkit

Timestamp:

Apr 8, 2013 1:05:42 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] More null checks for m_mainFrame
​https://bugs.webkit.org/show_bug.cgi?id=114172

Patch by Jakob Petsovits <​jpetsovits@blackberry.com> on 2013-04-08
Reviewed by Rob Buis.

After r147744, some unit tests were crashing on WebPage
shutdown, because BackingStorePrivate::repaint() now uses
pixelContentsRect() (accessing m_webPage->contentsRect())
instead of BackingStoreClient::contentsRect(). In m_webPage,
m_mainFrame had already been set to 0.

Make us more robust against these errors by checking
the existence of m_mainFrame more diligently.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::shouldZoomAboutPoint):
(BlackBerry::WebKit::WebPagePrivate::shouldSendResizeEvent):
(BlackBerry::WebKit::WebPagePrivate::contentsSize):
(BlackBerry::WebKit::WebPagePrivate::absoluteVisibleOverflowSize):
(BlackBerry::WebKit::WebPagePrivate::setViewMode):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPage.cpp (modified) (5 diffs)
• ChangeLog (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -1178 +1178 @@
 bool WebPagePrivate::shouldZoomAboutPoint(double scale, const FloatPoint&, bool enforceScaleClamping, double* clampedScale)
 {
-    if (!m_mainFrame->view())
+    if (!m_mainFrame || !m_mainFrame->view())
         return false;
 
@@ -1382 +1382 @@
 bool WebPagePrivate::shouldSendResizeEvent()
 {
-    if (!m_mainFrame->document())
+    if (!m_mainFrame || !m_mainFrame->document())
         return false;
 
@@ -1519 +1519 @@
 IntSize WebPagePrivate::contentsSize() const
 {
-    if (!m_mainFrame->view())
+    if (!m_mainFrame || !m_mainFrame->view())
         return IntSize();
 
@@ -1527 +1527 @@
 IntSize WebPagePrivate::absoluteVisibleOverflowSize() const
 {
-    if (!m_mainFrame->contentRenderer())
+    if (!m_mainFrame || !m_mainFrame->contentRenderer())
         return IntSize();
 
@@ -1860 +1860 @@
 bool WebPagePrivate::setViewMode(ViewMode mode)
 {
-    if (!m_mainFrame->view())
+    if (!m_mainFrame || !m_mainFrame->view())
         return false;
 

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-04-08  Jakob Petsovits  <jpetsovits@blackberry.com>
+
+        [BlackBerry] More null checks for m_mainFrame
+        https://bugs.webkit.org/show_bug.cgi?id=114172
+
+        Reviewed by Rob Buis.
+
+        After r147744, some unit tests were crashing on WebPage
+        shutdown, because BackingStorePrivate::repaint() now uses
+        pixelContentsRect() (accessing m_webPage->contentsRect())
+        instead of BackingStoreClient::contentsRect(). In m_webPage,
+        m_mainFrame had already been set to 0.
+
+        Make us more robust against these errors by checking
+        the existence of m_mainFrame more diligently.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::shouldZoomAboutPoint):
+        (BlackBerry::WebKit::WebPagePrivate::shouldSendResizeEvent):
+        (BlackBerry::WebKit::WebPagePrivate::contentsSize):
+        (BlackBerry::WebKit::WebPagePrivate::absoluteVisibleOverflowSize):
+        (BlackBerry::WebKit::WebPagePrivate::setViewMode):
+
 2013-04-08  Iris Wu  <shuwu@blackberry.com>