Title: [104738] trunk/Source/WebKit
- Revision
- 104738
- Author
- [email protected]
- Date
- 2012-01-11 13:23:20 -0800 (Wed, 11 Jan 2012)
Log Message
[BlackBerry] ASSERT failure in BackingStorePrivate::blitVisibleContents()
https://bugs.webkit.org/show_bug.cgi?id=76096
Patch by Jacky Jiang <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (104737 => 104738)
--- trunk/Source/WebKit/ChangeLog 2012-01-11 21:12:21 UTC (rev 104737)
+++ trunk/Source/WebKit/ChangeLog 2012-01-11 21:23:20 UTC (rev 104738)
@@ -1,3 +1,17 @@
+2012-01-11 Jacky Jiang <[email protected]>
+
+ [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 <[email protected]>
[Qt][WK2] Fix the build for newer Qt5
Modified: trunk/Source/WebKit/blackberry/Api/BackingStore.cpp (104737 => 104738)
--- trunk/Source/WebKit/blackberry/Api/BackingStore.cpp 2012-01-11 21:12:21 UTC (rev 104737)
+++ trunk/Source/WebKit/blackberry/Api/BackingStore.cpp 2012-01-11 21:23:20 UTC (rev 104738)
@@ -333,7 +333,7 @@
#endif
if (immediate) {
- if (render(rect))
+ if (render(rect) && !shouldDirectRenderingToWindow())
blitVisibleContents();
} else
m_renderQueue->addToQueue(RenderQueue::RegularRender, rect);
@@ -354,7 +354,7 @@
Platform::IntRect rect = m_webPage->d->mapToTransformed(m_client->mapFromViewportToContents(windowRect));
if (immediate) {
- if (render(rect) && !isSuspended())
+ if (render(rect) && !isSuspended() && !shouldDirectRenderingToWindow())
blitVisibleContents();
} else {
m_renderQueue->addToQueue(RenderQueue::VisibleScroll, rect);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
