Diff
Modified: trunk/Source/Platform/ChangeLog (116834 => 116835)
--- trunk/Source/Platform/ChangeLog 2012-05-12 02:11:10 UTC (rev 116834)
+++ trunk/Source/Platform/ChangeLog 2012-05-12 02:20:50 UTC (rev 116835)
@@ -1,3 +1,14 @@
+2012-05-11 Shawn Singh <shawnsi...@chromium.org>
+
+ [chromium] Plumb --show-paint-rects to accelerated compositor
+ https://bugs.webkit.org/show_bug.cgi?id=86255
+
+ Reviewed by James Robinson.
+
+ * chromium/public/WebLayerTreeView.h:
+ (WebKit::WebLayerTreeView::Settings::Settings):
+ (Settings):
+
2012-05-11 Mark Pilgrim <pilg...@chromium.org>
[Chromium] Move createLocalStorageNamespace to Platform.h
Modified: trunk/Source/Platform/chromium/public/WebLayerTreeView.h (116834 => 116835)
--- trunk/Source/Platform/chromium/public/WebLayerTreeView.h 2012-05-12 02:11:10 UTC (rev 116834)
+++ trunk/Source/Platform/chromium/public/WebLayerTreeView.h 2012-05-12 02:20:50 UTC (rev 116835)
@@ -52,6 +52,7 @@
: acceleratePainting(false)
, showFPSCounter(false)
, showPlatformLayerTree(false)
+ , showPaintRects(false)
, refreshRate(0)
, perTilePainting(false)
, partialSwapEnabled(false)
@@ -62,6 +63,7 @@
bool acceleratePainting;
bool showFPSCounter;
bool showPlatformLayerTree;
+ bool showPaintRects;
double refreshRate;
bool perTilePainting;
bool partialSwapEnabled;
Modified: trunk/Source/WebKit/chromium/ChangeLog (116834 => 116835)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-05-12 02:11:10 UTC (rev 116834)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-05-12 02:20:50 UTC (rev 116835)
@@ -1,3 +1,29 @@
+2012-05-11 Shawn Singh <shawnsi...@chromium.org>
+
+ [chromium] Plumb --show-paint-rects to accelerated compositor
+ https://bugs.webkit.org/show_bug.cgi?id=86255
+
+ Reviewed by James Robinson.
+
+ * public/WebSettings.h:
+ * src/WebLayerTreeView.cpp:
+ (WebKit::WebLayerTreeView::Settings::operator CCSettings):
+ * src/WebSettingsImpl.cpp:
+ (WebKit::WebSettingsImpl::WebSettingsImpl):
+ (WebKit::WebSettingsImpl::setShowPaintRects):
+ (WebKit):
+ * src/WebSettingsImpl.h:
+ (WebSettingsImpl):
+ (WebKit::WebSettingsImpl::showFPSCounter):
+ (WebKit::WebSettingsImpl::showPlatformLayerTree):
+ (WebKit::WebSettingsImpl::showPaintRects):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::settingsImpl):
+ (WebKit::WebViewImpl::settings):
+ (WebKit):
+ (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+ * src/WebViewImpl.h:
+
2012-05-11 Ryosuke Niwa <rn...@webkit.org>
Do a DEPS roll per build failure caused by r116810.
Modified: trunk/Source/WebKit/chromium/public/WebSettings.h (116834 => 116835)
--- trunk/Source/WebKit/chromium/public/WebSettings.h 2012-05-12 02:11:10 UTC (rev 116834)
+++ trunk/Source/WebKit/chromium/public/WebSettings.h 2012-05-12 02:20:50 UTC (rev 116835)
@@ -104,9 +104,8 @@
virtual void setWebGLErrorsToConsoleEnabled(bool) = 0;
virtual void setShowDebugBorders(bool) = 0;
virtual void setShowFPSCounter(bool) = 0;
- virtual bool showFPSCounter() const = 0;
virtual void setShowPlatformLayerTree(bool) = 0;
- virtual bool showPlatformLayerTree() const = 0;
+ virtual void setShowPaintRects(bool) = 0;
virtual void setEditingBehavior(EditingBehavior) = 0;
virtual void setAcceleratedCompositingEnabled(bool) = 0;
virtual void setForceCompositingMode(bool) = 0;
Modified: trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp (116834 => 116835)
--- trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp 2012-05-12 02:11:10 UTC (rev 116834)
+++ trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp 2012-05-12 02:20:50 UTC (rev 116835)
@@ -43,6 +43,7 @@
settings.acceleratePainting = acceleratePainting;
settings.showFPSCounter = showFPSCounter;
settings.showPlatformLayerTree = showPlatformLayerTree;
+ settings.showPaintRects = showPaintRects;
settings.refreshRate = refreshRate;
settings.perTilePainting = perTilePainting;
settings.partialSwapEnabled = partialSwapEnabled;
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (116834 => 116835)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-05-12 02:11:10 UTC (rev 116834)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-05-12 02:20:50 UTC (rev 116835)
@@ -49,6 +49,7 @@
: m_settings(settings)
, m_showFPSCounter(false)
, m_showPlatformLayerTree(false)
+ , m_showPaintRects(false)
, m_viewportEnabled(false)
{
ASSERT(settings);
@@ -333,6 +334,11 @@
m_showPlatformLayerTree = show;
}
+void WebSettingsImpl::setShowPaintRects(bool show)
+{
+ m_showPaintRects = show;
+}
+
void WebSettingsImpl::setEditingBehavior(EditingBehavior behavior)
{
m_settings->setEditingBehaviorType(static_cast<WebCore::EditingBehaviorType>(behavior));
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.h (116834 => 116835)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-05-12 02:11:10 UTC (rev 116834)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-05-12 02:20:50 UTC (rev 116835)
@@ -96,9 +96,8 @@
virtual void setWebGLErrorsToConsoleEnabled(bool);
virtual void setShowDebugBorders(bool);
virtual void setShowFPSCounter(bool);
- virtual bool showFPSCounter() const { return m_showFPSCounter; }
virtual void setShowPlatformLayerTree(bool);
- virtual bool showPlatformLayerTree() const { return m_showPlatformLayerTree; }
+ virtual void setShowPaintRects(bool);
virtual void setEditingBehavior(EditingBehavior);
virtual void setAcceleratedCompositingEnabled(bool);
virtual void setForceCompositingMode(bool);
@@ -142,10 +141,15 @@
virtual void setViewportEnabled(bool);
virtual bool viewportEnabled() const { return m_viewportEnabled; }
+ bool showFPSCounter() const { return m_showFPSCounter; }
+ bool showPlatformLayerTree() const { return m_showPlatformLayerTree; }
+ bool showPaintRects() const { return m_showPaintRects; }
+
private:
WebCore::Settings* m_settings;
bool m_showFPSCounter;
bool m_showPlatformLayerTree;
+ bool m_showPaintRects;
bool m_viewportEnabled;
};
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (116834 => 116835)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-05-12 02:11:10 UTC (rev 116834)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-05-12 02:20:50 UTC (rev 116835)
@@ -2060,7 +2060,7 @@
// WebView --------------------------------------------------------------------
-WebSettings* WebViewImpl::settings()
+WebSettingsImpl* WebViewImpl::settingsImpl()
{
if (!m_webSettings)
m_webSettings = adoptPtr(new WebSettingsImpl(m_page->settings()));
@@ -2068,6 +2068,11 @@
return m_webSettings.get();
}
+WebSettings* WebViewImpl::settings()
+{
+ return settingsImpl();
+}
+
WebString WebViewImpl::pageEncoding() const
{
if (!m_page)
@@ -3308,8 +3313,9 @@
WebLayerTreeView::Settings layerTreeViewSettings;
layerTreeViewSettings.acceleratePainting = page()->settings()->acceleratedDrawingEnabled();
- layerTreeViewSettings.showFPSCounter = settings()->showFPSCounter();
- layerTreeViewSettings.showPlatformLayerTree = settings()->showPlatformLayerTree();
+ layerTreeViewSettings.showFPSCounter = settingsImpl()->showFPSCounter();
+ layerTreeViewSettings.showPlatformLayerTree = settingsImpl()->showPlatformLayerTree();
+ layerTreeViewSettings.showPaintRects = settingsImpl()->showPaintRects();
layerTreeViewSettings.perTilePainting = page()->settings()->perTileDrawingEnabled();
layerTreeViewSettings.partialSwapEnabled = page()->settings()->partialSwapEnabled();
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.h (116834 => 116835)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-05-12 02:11:10 UTC (rev 116834)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-05-12 02:20:50 UTC (rev 116835)
@@ -615,6 +615,8 @@
virtual bool handleKeyEvent(const WebKeyboardEvent&) OVERRIDE;
virtual bool handleCharEvent(const WebKeyboardEvent&) OVERRIDE;
+ WebSettingsImpl* settingsImpl();
+
WebViewClient* m_client;
WebAutofillClient* m_autofillClient;
WebPermissionClient* m_permissionClient;
