Title: [132443] trunk/Source/WebKit/blackberry
- Revision
- 132443
- Author
- commit-qu...@webkit.org
- Date
- 2012-10-24 20:41:59 -0700 (Wed, 24 Oct 2012)
Log Message
[BlackBerry] ASSERT(!needsOneShotDrawingSynchronization()) failed in commitRootLayerIfNeeded()
https://bugs.webkit.org/show_bug.cgi?id=100214
Patch by Sean Wang <xuewen.w...@torchmobile.com.cn> on 2012-10-24
Reviewed by Rob Buis.
ViewportSize has been changed before committing root layer, it asserts
that it needs relayout and render if needed before committing if it
Needs One Shot Drawing Synchronization.
This patch calls requestLayoutIfNeeded() when resumeScreenAndBackingStoreUpdates().
Fix a coding style in the BackingStore.cpp as well.
Reviewed internally by Arvid Nilsson.
PR #230253
* Api/BackingStore.cpp:
(BlackBerry::WebKit::BackingStorePrivate::resumeScreenAndBackingStoreUpdates):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/BackingStore.cpp (132442 => 132443)
--- trunk/Source/WebKit/blackberry/Api/BackingStore.cpp 2012-10-25 03:07:56 UTC (rev 132442)
+++ trunk/Source/WebKit/blackberry/Api/BackingStore.cpp 2012-10-25 03:41:59 UTC (rev 132443)
@@ -359,6 +359,10 @@
if (op == BackingStore::None)
return;
#if USE(ACCELERATED_COMPOSITING)
+ // It needs layout and render before committing root layer if we set OSDS
+ if (m_webPage->d->needsOneShotDrawingSynchronization())
+ m_webPage->d->requestLayoutIfNeeded();
+
// This will also blit since we set the OSDS flag above.
m_webPage->d->commitRootLayerIfNeeded();
#else
@@ -514,8 +518,7 @@
}
static const BlackBerry::Platform::Message::Type RenderJobMessageType = BlackBerry::Platform::Message::generateUniqueMessageType();
-class RenderJobMessage : public BlackBerry::Platform::ExecutableMessage
-{
+class RenderJobMessage : public BlackBerry::Platform::ExecutableMessage {
public:
RenderJobMessage(BlackBerry::Platform::MessageDelegate* delegate)
: BlackBerry::Platform::ExecutableMessage(delegate, BlackBerry::Platform::ExecutableMessage::UniqueCoalescing, RenderJobMessageType)
Modified: trunk/Source/WebKit/blackberry/ChangeLog (132442 => 132443)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-10-25 03:07:56 UTC (rev 132442)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-10-25 03:41:59 UTC (rev 132443)
@@ -1,3 +1,23 @@
+2012-10-24 Sean Wang <xuewen.w...@torchmobile.com.cn>
+
+ [BlackBerry] ASSERT(!needsOneShotDrawingSynchronization()) failed in commitRootLayerIfNeeded()
+ https://bugs.webkit.org/show_bug.cgi?id=100214
+
+ Reviewed by Rob Buis.
+
+ ViewportSize has been changed before committing root layer, it asserts
+ that it needs relayout and render if needed before committing if it
+ Needs One Shot Drawing Synchronization.
+ This patch calls requestLayoutIfNeeded() when resumeScreenAndBackingStoreUpdates().
+
+ Fix a coding style in the BackingStore.cpp as well.
+
+ Reviewed internally by Arvid Nilsson.
+ PR #230253
+
+ * Api/BackingStore.cpp:
+ (BlackBerry::WebKit::BackingStorePrivate::resumeScreenAndBackingStoreUpdates):
+
2012-10-24 Otto Derek Cheung <otche...@rim.com>
[BlackBerry] Geolocation is segfaulting
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
