Changeset 104738 in webkit

Timestamp:

Jan 11, 2012 1:23:20 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] ASSERT failure in BackingStorePrivate::blitVisibleContents()
​https://bugs.webkit.org/show_bug.cgi?id=76096

Patch by Jacky Jiang <​zhajiang@rim.com> on 2012-01-11
Reviewed by Rob Buis.

We shouldn't blit visible contents for direct rendering. Guard it from
call sites.

• blackberry/Api/BackingStore.cpp:

(BlackBerry::WebKit::BackingStorePrivate::repaint):
(BlackBerry::WebKit::BackingStorePrivate::slowScroll):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• blackberry/Api/BackingStore.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2012-01-11  Jacky Jiang  <zhajiang@rim.com>
+
+        [BlackBerry] ASSERT failure in BackingStorePrivate::blitVisibleContents()
+        https://bugs.webkit.org/show_bug.cgi?id=76096
+
+        Reviewed by Rob Buis.
+
+        We shouldn't blit visible contents for direct rendering. Guard it from
+        call sites.
+
+        * blackberry/Api/BackingStore.cpp:
+        (BlackBerry::WebKit::BackingStorePrivate::repaint):
+        (BlackBerry::WebKit::BackingStorePrivate::slowScroll):
+
 2012-01-11  Rafael Brandao  <rafael.lobo@openbossa.org>
 

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

@@ -334 +334 @@
 
         if (immediate) {
-            if (render(rect))
+            if (render(rect) && !shouldDirectRenderingToWindow())
                 blitVisibleContents();
         } else
@@ -355 +355 @@
 
     if (immediate) {
-        if (render(rect) && !isSuspended())
+        if (render(rect) && !isSuspended() && !shouldDirectRenderingToWindow())
             blitVisibleContents();
     } else {