Title: [97795] trunk/Source/WebKit/chromium
- Revision
- 97795
- Author
- [email protected]
- Date
- 2011-10-18 15:37:40 -0700 (Tue, 18 Oct 2011)
Log Message
Enable out-of-thread compositing in WebKit compositor API
https://bugs.webkit.org/show_bug.cgi?id=69850
Patch by Antoine Labour <[email protected]> on 2011-10-18
Reviewed by James Robinson.
* src/WebLayerTreeView.cpp:
(WebKit::WebLayerTreeView::Settings::operator CCSettings):
(WebKit::WebLayerTreeView::composite):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (97794 => 97795)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-10-18 22:14:00 UTC (rev 97794)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-10-18 22:37:40 UTC (rev 97795)
@@ -1,3 +1,14 @@
+2011-10-18 Antoine Labour <[email protected]>
+
+ Enable out-of-thread compositing in WebKit compositor API
+ https://bugs.webkit.org/show_bug.cgi?id=69850
+
+ Reviewed by James Robinson.
+
+ * src/WebLayerTreeView.cpp:
+ (WebKit::WebLayerTreeView::Settings::operator CCSettings):
+ (WebKit::WebLayerTreeView::composite):
+
2011-10-18 James Robinson <[email protected]>
[chromium] Fix shutdown race when posting main thread task to CCThreadProxy and enable tests
Modified: trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp (97794 => 97795)
--- trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp 2011-10-18 22:14:00 UTC (rev 97794)
+++ trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp 2011-10-18 22:37:40 UTC (rev 97795)
@@ -38,10 +38,8 @@
CCSettings settings;
settings.acceleratePainting = acceleratePainting;
settings.compositeOffscreen = compositeOffscreen;
+ settings.enableCompositorThread = enableCompositorThread;
- // FIXME: compositor thread isn't supported currently.
- settings.enableCompositorThread = false;
-
// FIXME: showFPSCounter / showPlatformLayerTree aren't supported currently.
settings.showFPSCounter = false;
settings.showPlatformLayerTree = false;
@@ -70,9 +68,10 @@
void WebLayerTreeView::composite()
{
-#if !USE(THREADED_COMPOSITING)
- m_private->composite();
-#endif
+ if (m_private->settings().enableCompositorThread)
+ m_private->setNeedsCommitThenRedraw();
+ else
+ m_private->composite();
}
void WebLayerTreeView::setViewportSize(const WebSize& viewportSize)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
