Changeset 116657 in webkit

Timestamp:

May 10, 2012 10:15:55 AM (12 years ago)

Author:

tonikitoo@webkit.org

Message:

[BlackBerry] Assertions and assumptions in BackingStoreClient around m_frame and m_frame->view() are invalid
​https://bugs.webkit.org/show_bug.cgi?id=86096

Reviewed by Rob Buis.
Patch by Antonio Gomes <​agomes@rim.com>

A Frame's FrameView has always to be checked since it is
a volatile object, and gets created and destroyed all the time.

We have been facing a particular issue, where during our automated
interaction tests, the main frame object was being pinch zoomed in
the middle of it creation, and WebKit thread was blocked by a mutex.
In practice, it is a case that would not be possible in a real
world scenario, but shows that the ASSERTs are bogus regardless.

• WebKitSupport/BackingStoreClient.cpp:

(BlackBerry::WebKit::BackingStoreClient::scrollPosition):
(BlackBerry::WebKit::BackingStoreClient::setScrollPosition):
(BlackBerry::WebKit::BackingStoreClient::maximumScrollPosition):
(BlackBerry::WebKit::BackingStoreClient::viewportSize):
(BlackBerry::WebKit::BackingStoreClient::transformedViewportSize):
(BlackBerry::WebKit::BackingStoreClient::visibleContentsRect):
(BlackBerry::WebKit::BackingStoreClient::contentsSize):

Location:

trunk/Source/WebKit/blackberry

Files:

• ChangeLog (modified) (1 diff)
• WebKitSupport/BackingStoreClient.cpp (modified) (7 diffs)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-05-10  Antonio Gomes  <agomes@rim.com>
+
+        [BlackBerry] Assertions and assumptions in BackingStoreClient around m_frame and m_frame->view() are invalid
+        https://bugs.webkit.org/show_bug.cgi?id=86096
+
+        Reviewed by Rob Buis.
+
+        A Frame's FrameView has always to be checked since it is
+        a volatile object, and gets created and destroyed all the time.
+
+        We have been facing a particular issue, where during our automated
+        interaction tests, the main frame object was being pinch zoomed in
+        the middle of it creation, and WebKit thread was blocked by a mutex.
+        In practice, it is a case that would not be possible in a real
+        world scenario, but shows that the ASSERTs are bogus regardless.
+
+        * WebKitSupport/BackingStoreClient.cpp:
+        (BlackBerry::WebKit::BackingStoreClient::scrollPosition):
+        (BlackBerry::WebKit::BackingStoreClient::setScrollPosition):
+        (BlackBerry::WebKit::BackingStoreClient::maximumScrollPosition):
+        (BlackBerry::WebKit::BackingStoreClient::viewportSize):
+        (BlackBerry::WebKit::BackingStoreClient::transformedViewportSize):
+        (BlackBerry::WebKit::BackingStoreClient::visibleContentsRect):
+        (BlackBerry::WebKit::BackingStoreClient::contentsSize):
+
 2012-05-09  Jonathan Dong  <jonathan.dong@torchmobile.com.cn>
 

trunk/Source/WebKit/blackberry/WebKitSupport/BackingStoreClient.cpp

@@ -169 +169 @@
 {
     ASSERT(m_frame);
+    if (!m_frame->view())
+        return IntPoint();
+
     return m_frame->view()->scrollPosition() - pointToSize(m_frame->view()->minimumScrollPosition());
 }
@@ -179 +182 @@
 void BackingStoreClient::setScrollPosition(const IntPoint& pos)
 {
-    ASSERT(m_frame->view());
+    ASSERT(m_frame);
+    if (!m_frame->view())
+        return;
+
     if (pos == scrollPosition())
         return;
@@ -197 +203 @@
 IntPoint BackingStoreClient::maximumScrollPosition() const
 {
-    ASSERT(m_frame->view());
+    ASSERT(m_frame);
+    if (!m_frame->view())
+        return IntPoint();
+
     return m_frame->view()->maximumScrollPosition() - pointToSize(m_frame->view()->minimumScrollPosition());
 }
@@ -221 +230 @@
 IntSize BackingStoreClient::viewportSize() const
 {
-    ASSERT(m_frame->view());
+    ASSERT(m_frame);
+    if (!m_frame->view())
+        return IntSize();
+
     if (isMainFrame())
         return m_webPage->d->viewportSize();
@@ -230 +242 @@
 IntSize BackingStoreClient::transformedViewportSize() const
 {
+    ASSERT(m_frame);
+    if (!m_frame->view())
+        return IntSize();
+
     if (isMainFrame())
         return m_webPage->d->transformedViewportSize();
 
-    ASSERT(m_frame->view());
     const IntSize untransformedViewportSize = m_frame->view()->visibleContentRect().size();
     const FloatPoint transformedBottomRight = m_webPage->d->m_transformationMatrix->mapPoint(
@@ -242 +257 @@
 IntRect BackingStoreClient::visibleContentsRect() const
 {
-    ASSERT(m_frame->view());
+    ASSERT(m_frame);
+    if (!m_frame->view())
+        return IntRect();
+
     IntRect visibleContentRect = m_frame->view()->visibleContentRect();
     if (isMainFrame())
@@ -274 +292 @@
 IntSize BackingStoreClient::contentsSize() const
 {
-    ASSERT(m_frame->view());
+    ASSERT(m_frame);
+    if (!m_frame->view())
+        return IntSize();
+
     return m_frame->view()->contentsSize();
 }