Title: [101055] trunk/Source/WebKit/chromium
- Revision
- 101055
- Author
- [email protected]
- Date
- 2011-11-23 01:20:42 -0800 (Wed, 23 Nov 2011)
Log Message
[chromium] Expose showFPSCounter and showPlatformLayerTree in WebLayerTreeView::Settings
https://bugs.webkit.org/show_bug.cgi?id=72973
Patch by Antoine Labour <[email protected]> on 2011-11-23
Reviewed by Darin Fisher.
* public/WebLayerTreeView.h:
(WebKit::WebLayerTreeView::Settings::Settings):
* src/WebLayerTreeView.cpp:
(WebKit::WebLayerTreeView::Settings::operator CCSettings):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (101054 => 101055)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-11-23 09:10:52 UTC (rev 101054)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-11-23 09:20:42 UTC (rev 101055)
@@ -1,3 +1,15 @@
+2011-11-23 Antoine Labour <[email protected]>
+
+ [chromium] Expose showFPSCounter and showPlatformLayerTree in WebLayerTreeView::Settings
+ https://bugs.webkit.org/show_bug.cgi?id=72973
+
+ Reviewed by Darin Fisher.
+
+ * public/WebLayerTreeView.h:
+ (WebKit::WebLayerTreeView::Settings::Settings):
+ * src/WebLayerTreeView.cpp:
+ (WebKit::WebLayerTreeView::Settings::operator CCSettings):
+
2011-11-22 Dirk Pranke <[email protected]>
Roll DEPS to r111325 to fix an issue with the linux build
Modified: trunk/Source/WebKit/chromium/public/WebLayerTreeView.h (101054 => 101055)
--- trunk/Source/WebKit/chromium/public/WebLayerTreeView.h 2011-11-23 09:10:52 UTC (rev 101054)
+++ trunk/Source/WebKit/chromium/public/WebLayerTreeView.h 2011-11-23 09:20:42 UTC (rev 101055)
@@ -46,11 +46,15 @@
Settings()
: acceleratePainting(false)
, compositeOffscreen(false)
- , enableCompositorThread(false) { }
+ , enableCompositorThread(false)
+ , showFPSCounter(false)
+ , showPlatformLayerTree(false) { }
bool acceleratePainting;
bool compositeOffscreen;
bool enableCompositorThread;
+ bool showFPSCounter;
+ bool showPlatformLayerTree;
#if WEBKIT_IMPLEMENTATION
operator WebCore::CCSettings() const;
#endif
Modified: trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp (101054 => 101055)
--- trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp 2011-11-23 09:10:52 UTC (rev 101054)
+++ trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp 2011-11-23 09:20:42 UTC (rev 101055)
@@ -40,10 +40,8 @@
settings.acceleratePainting = acceleratePainting;
settings.compositeOffscreen = compositeOffscreen;
settings.enableCompositorThread = enableCompositorThread;
-
- // FIXME: showFPSCounter / showPlatformLayerTree aren't supported currently.
- settings.showFPSCounter = false;
- settings.showPlatformLayerTree = false;
+ settings.showFPSCounter = showFPSCounter;
+ settings.showPlatformLayerTree = showPlatformLayerTree;
return settings;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
