Title: [141302] trunk/Source
Revision
141302
Author
[email protected]
Date
2013-01-30 13:03:48 -0800 (Wed, 30 Jan 2013)

Log Message

[chromium] Add recordRenderingStats to WebSettings
https://bugs.webkit.org/show_bug.cgi?id=108358

Reviewed by James Robinson.

Source/Platform:

* chromium/public/WebLayerTreeView.h:
(WebKit::WebLayerTreeView::Settings::Settings):
(Settings):

Source/WebKit/chromium:

* public/WebSettings.h:
* src/WebSettingsImpl.cpp:
(WebKit::WebSettingsImpl::setRecordRenderingStats):
(WebKit):
* src/WebSettingsImpl.h:
(WebSettingsImpl):
(WebKit::WebSettingsImpl::recordRenderingStats):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::setIsAcceleratedCompositingActive):

Modified Paths

Diff

Modified: trunk/Source/Platform/ChangeLog (141301 => 141302)


--- trunk/Source/Platform/ChangeLog	2013-01-30 21:02:20 UTC (rev 141301)
+++ trunk/Source/Platform/ChangeLog	2013-01-30 21:03:48 UTC (rev 141302)
@@ -1,3 +1,14 @@
+2013-01-30  Dana Jansens  <[email protected]>
+
+        [chromium] Add recordRenderingStats to WebSettings
+        https://bugs.webkit.org/show_bug.cgi?id=108358
+
+        Reviewed by James Robinson.
+
+        * chromium/public/WebLayerTreeView.h:
+        (WebKit::WebLayerTreeView::Settings::Settings):
+        (Settings):
+
 2013-01-29  Tommy Widenflycht  <[email protected]>
 
         MediaStream API: A MediaStreamComponent should be able to return the MediaStreamDescriptor it belongs to

Modified: trunk/Source/Platform/chromium/public/WebLayerTreeView.h (141301 => 141302)


--- trunk/Source/Platform/chromium/public/WebLayerTreeView.h	2013-01-30 21:02:20 UTC (rev 141301)
+++ trunk/Source/Platform/chromium/public/WebLayerTreeView.h	2013-01-30 21:03:48 UTC (rev 141302)
@@ -56,6 +56,7 @@
             , partialSwapEnabled(false)
             , acceleratedAnimationEnabled(true)
             , pageScalePinchZoomEnabled(false)
+            , recordRenderingStats(false)
             , refreshRate(0)
             , defaultTileSize(WebSize(256, 256))
             , maxUntiledLayerSize(WebSize(512, 512))
@@ -73,6 +74,7 @@
         bool partialSwapEnabled;
         bool acceleratedAnimationEnabled;
         bool pageScalePinchZoomEnabled;
+        bool recordRenderingStats;
         double refreshRate;
         WebSize defaultTileSize;
         WebSize maxUntiledLayerSize;

Modified: trunk/Source/WebKit/chromium/ChangeLog (141301 => 141302)


--- trunk/Source/WebKit/chromium/ChangeLog	2013-01-30 21:02:20 UTC (rev 141301)
+++ trunk/Source/WebKit/chromium/ChangeLog	2013-01-30 21:03:48 UTC (rev 141302)
@@ -1,3 +1,20 @@
+2013-01-30  Dana Jansens  <[email protected]>
+
+        [chromium] Add recordRenderingStats to WebSettings
+        https://bugs.webkit.org/show_bug.cgi?id=108358
+
+        Reviewed by James Robinson.
+
+        * public/WebSettings.h:
+        * src/WebSettingsImpl.cpp:
+        (WebKit::WebSettingsImpl::setRecordRenderingStats):
+        (WebKit):
+        * src/WebSettingsImpl.h:
+        (WebSettingsImpl):
+        (WebKit::WebSettingsImpl::recordRenderingStats):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+
 2013-01-30  Tony Gentilcore  <[email protected]>
 
         Fix compile error in WebFrameTest

Modified: trunk/Source/WebKit/chromium/public/WebSettings.h (141301 => 141302)


--- trunk/Source/WebKit/chromium/public/WebSettings.h	2013-01-30 21:02:20 UTC (rev 141301)
+++ trunk/Source/WebKit/chromium/public/WebSettings.h	2013-01-30 21:03:48 UTC (rev 141302)
@@ -141,6 +141,7 @@
     virtual void setPictographFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
     virtual void setPluginsEnabled(bool) = 0;
     virtual void setPrivilegedWebGLExtensionsEnabled(bool) = 0;
+    virtual void setRecordRenderingStats(bool) = 0;
     virtual void setRenderVSyncEnabled(bool) = 0;
     virtual void setRenderVSyncNotificationEnabled(bool) = 0;
     virtual void setSansSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;

Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (141301 => 141302)


--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp	2013-01-30 21:02:20 UTC (rev 141301)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp	2013-01-30 21:03:48 UTC (rev 141302)
@@ -401,6 +401,11 @@
     m_settings->setPrivilegedWebGLExtensionsEnabled(enabled);
 }
 
+void WebSettingsImpl::setRecordRenderingStats(bool enabled)
+{
+    m_recordRenderingStats = enabled;
+}
+
 void WebSettingsImpl::setRenderVSyncEnabled(bool enabled)
 {
     m_renderVSyncEnabled = enabled;

Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.h (141301 => 141302)


--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.h	2013-01-30 21:02:20 UTC (rev 141301)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.h	2013-01-30 21:03:48 UTC (rev 141302)
@@ -135,6 +135,7 @@
     virtual void setPictographFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
     virtual void setPluginsEnabled(bool);
     virtual void setPrivilegedWebGLExtensionsEnabled(bool);
+    virtual void setRecordRenderingStats(bool);
     virtual void setRenderVSyncEnabled(bool);
     virtual void setRenderVSyncNotificationEnabled(bool);
     virtual void setSansSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
@@ -182,6 +183,7 @@
     bool doubleTapToZoomEnabled() const { return m_doubleTapToZoomEnabled; }
     bool perTilePaintingEnabled() const { return m_perTilePaintingEnabled; }
     bool acceleratedAnimationEnabled() const { return m_acceleratedAnimationEnabled; }
+    bool recordRenderingStats() const { return m_recordRenderingStats; }
     WebSize defaultTileSize() const { return m_defaultTileSize; }
     WebSize maxUntiledLayerSize() const { return m_maxUntiledLayerSize; }
 
@@ -199,6 +201,7 @@
     bool m_doubleTapToZoomEnabled;
     bool m_perTilePaintingEnabled;
     bool m_acceleratedAnimationEnabled;
+    bool m_recordRenderingStats;
     WebSize m_defaultTileSize;
     WebSize m_maxUntiledLayerSize;
 };

Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (141301 => 141302)


--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp	2013-01-30 21:02:20 UTC (rev 141301)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp	2013-01-30 21:03:48 UTC (rev 141302)
@@ -4116,6 +4116,7 @@
         layerTreeViewSettings.perTilePaintingEnabled = settingsImpl()->perTilePaintingEnabled();
         layerTreeViewSettings.acceleratedAnimationEnabled = settingsImpl()->acceleratedAnimationEnabled();
         layerTreeViewSettings.pageScalePinchZoomEnabled = settingsImpl()->applyPageScaleFactorInCompositor();
+        layerTreeViewSettings.recordRenderingStats = settingsImpl()->recordRenderingStats();
 
         layerTreeViewSettings.defaultTileSize = settingsImpl()->defaultTileSize();
         layerTreeViewSettings.maxUntiledLayerSize = settingsImpl()->maxUntiledLayerSize();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to