Changeset 140798 in webkit

Timestamp:

Jan 25, 2013 1:03:59 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: add checkbox for continuous painting to the inspector's settings
​https://bugs.webkit.org/show_bug.cgi?id=107352

Patch by Eberhard Graether <​egraether@google.com> on 2013-01-25
Reviewed by Pavel Feldman.

This change adds a checkbox to activate continuous painting to the WebInspector's
rendering settings and plumbs the setting to Chromium's WebLayerTreeView. The
setting is visible if InspectorClient::canContinuouslyPaint() returns true.

Source/Platform:

• chromium/public/WebLayerTreeView.h:

(WebLayerTreeView):
(WebKit::WebLayerTreeView::setContinuousPaintingEnabled):

Source/WebCore:

No new tests.

• English.lproj/localizedStrings.js:
• inspector/Inspector.json:
• inspector/InspectorClient.h:

(WebCore::InspectorClient::canContinuouslyPaint):
(WebCore::InspectorClient::setContinuousPaintingEnabled):
(InspectorClient):

• inspector/InspectorPageAgent.cpp:

(PageAgentState):
(WebCore::InspectorPageAgent::restore):
(WebCore::InspectorPageAgent::disable):
(WebCore::InspectorPageAgent::canContinuouslyPaint):
(WebCore):
(WebCore::InspectorPageAgent::setContinuousPaintingEnabled):

• inspector/InspectorPageAgent.h:
• inspector/front-end/Settings.js:
• inspector/front-end/SettingsScreen.js:

(WebInspector.GenericSettingsTab):
(WebInspector.GenericSettingsTab.prototype.get _continuousPaintingChanged):

• inspector/front-end/inspector.js:

(WebInspector.doLoadedDone):

Source/WebKit/chromium:

• public/WebView.h:

(WebView):

• src/InspectorClientImpl.cpp:

(WebKit::InspectorClientImpl::canContinuouslyPaint):
(WebKit):
(WebKit::InspectorClientImpl::setContinuousPaintingEnabled):

• src/InspectorClientImpl.h:

(InspectorClientImpl):

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::setContinuousPaintingEnabled):
(WebKit):
(WebKit::WebViewImpl::setIsAcceleratedCompositingActive):

• src/WebViewImpl.h:

Location:

trunk/Source

Files:

• Platform/ChangeLog (modified) (1 diff)
• Platform/chromium/public/WebLayerTreeView.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/English.lproj/localizedStrings.js (modified) (1 diff)
• WebCore/inspector/Inspector.json (modified) (1 diff)
• WebCore/inspector/InspectorClient.h (modified) (1 diff)
• WebCore/inspector/InspectorPageAgent.cpp (modified) (4 diffs)
• WebCore/inspector/InspectorPageAgent.h (modified) (1 diff)
• WebCore/inspector/front-end/Settings.js (modified) (2 diffs)
• WebCore/inspector/front-end/SettingsScreen.js (modified) (2 diffs)
• WebCore/inspector/front-end/inspector.js (modified) (2 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebView.h (modified) (1 diff)
• WebKit/chromium/src/InspectorClientImpl.cpp (modified) (1 diff)
• WebKit/chromium/src/InspectorClientImpl.h (modified) (1 diff)
• WebKit/chromium/src/WebViewImpl.cpp (modified) (2 diffs)
• WebKit/chromium/src/WebViewImpl.h (modified) (1 diff)

trunk/Source/Platform/ChangeLog

@@ +1 @@
+2013-01-25  Eberhard Graether  <egraether@google.com>
+
+        Web Inspector: add checkbox for continuous painting to the inspector's settings
+        https://bugs.webkit.org/show_bug.cgi?id=107352
+
+        Reviewed by Pavel Feldman.
+
+        This change adds a checkbox to activate continuous painting to the WebInspector's
+        rendering settings and plumbs the setting to Chromium's WebLayerTreeView. The
+        setting is visible if InspectorClient::canContinuouslyPaint() returns true.
+
+        * chromium/public/WebLayerTreeView.h:
+        (WebLayerTreeView):
+        (WebKit::WebLayerTreeView::setContinuousPaintingEnabled):
+
 2013-01-22  Nat Duca  <nduca@chromium.org>
 

trunk/Source/Platform/chromium/public/WebLayerTreeView.h

@@ -184 +184 @@
     virtual void setShowPaintRects(bool) { }
 
+    // Toggles continuous painting
+    virtual void setContinuousPaintingEnabled(bool) { }
+
     // FIXME: Remove this.
     virtual void loseCompositorContext(int numTimes) { }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-25  Eberhard Graether  <egraether@google.com>
+
+        Web Inspector: add checkbox for continuous painting to the inspector's settings
+        https://bugs.webkit.org/show_bug.cgi?id=107352
+
+        Reviewed by Pavel Feldman.
+
+        This change adds a checkbox to activate continuous painting to the WebInspector's
+        rendering settings and plumbs the setting to Chromium's WebLayerTreeView. The
+        setting is visible if InspectorClient::canContinuouslyPaint() returns true.
+
+        No new tests.
+
+        * English.lproj/localizedStrings.js:
+        * inspector/Inspector.json:
+        * inspector/InspectorClient.h:
+        (WebCore::InspectorClient::canContinuouslyPaint):
+        (WebCore::InspectorClient::setContinuousPaintingEnabled):
+        (InspectorClient):
+        * inspector/InspectorPageAgent.cpp:
+        (PageAgentState):
+        (WebCore::InspectorPageAgent::restore):
+        (WebCore::InspectorPageAgent::disable):
+        (WebCore::InspectorPageAgent::canContinuouslyPaint):
+        (WebCore):
+        (WebCore::InspectorPageAgent::setContinuousPaintingEnabled):
+        * inspector/InspectorPageAgent.h:
+        * inspector/front-end/Settings.js:
+        * inspector/front-end/SettingsScreen.js:
+        (WebInspector.GenericSettingsTab):
+        (WebInspector.GenericSettingsTab.prototype.get _continuousPaintingChanged):
+        * inspector/front-end/inspector.js:
+        (WebInspector.doLoadedDone):
+
 2013-01-25  Dominic Mazzoni  <dmazzoni@google.com>
 

trunk/Source/WebCore/English.lproj/localizedStrings.js

@@ -181 +181 @@
 localizedStrings["Enable Breakpoint"] = "Enable Breakpoint";
 localizedStrings["Enable breakpoint"] = "Enable breakpoint";
+localizedStrings["Enable continuous page repainting"] = "Enable continuous page repainting";
 localizedStrings["Enable Debugging"] = "Enable Debugging";
 localizedStrings["Enable Profiling"] = "Enable Profiling";

trunk/Source/WebCore/inspector/Inspector.json

@@ -363 +363 @@
                 "parameters": [
                     { "name": "show", "type": "boolean", "description": "True for showing the FPS counter" }
+                ],
+                "hidden": true
+            },
+            {
+                "name": "canContinuouslyPaint",
+                "description": "Tells if backend supports continuous painting",
+                "returns": [
+                    { "name": "value", "type": "boolean", "description": "True if continuous painting is available" }
+                ],
+                "hidden": true
+            },
+            {
+                "name": "setContinuousPaintingEnabled",
+                "description": "Requests that backend enables continuous painting",
+                "parameters": [
+                    { "name": "enabled", "type": "boolean", "description": "True for enabling cointinuous painting" }
                 ],
                 "hidden": true

trunk/Source/WebCore/inspector/InspectorClient.h

@@ -77 +77 @@
     virtual void setShowFPSCounter(bool) { }
 
+    virtual bool canContinuouslyPaint() { return false; }
+    virtual void setContinuousPaintingEnabled(bool) { }
+
     virtual bool supportsFrameInstrumentation() { return false; }
 

trunk/Source/WebCore/inspector/InspectorPageAgent.cpp

@@ -94 +94 @@
 static const char pageAgentFitWindow[] = "pageAgentFitWindow";
 static const char pageAgentShowFPSCounter[] = "pageAgentShowFPSCounter";
+static const char pageAgentContinuousPaintingEnabled[] = "pageAgentContinuousPaintingEnabled";
 static const char pageAgentShowPaintRects[] = "pageAgentShowPaintRects";
 #if ENABLE(TOUCH_EVENTS)
@@ -367 +368 @@
         String emulatedMedia = m_state->getString(PageAgentState::pageAgentEmulatedMedia);
         setEmulatedMedia(0, emulatedMedia);
+        bool continuousPaintingEnabled = m_state->getBoolean(PageAgentState::pageAgentContinuousPaintingEnabled);
+        setContinuousPaintingEnabled(0, continuousPaintingEnabled);
 
         int currentWidth = static_cast<int>(m_state->getLong(PageAgentState::pageAgentScreenWidthOverride));
@@ -402 +405 @@
     setShowFPSCounter(0, false);
     setEmulatedMedia(0, "");
+    setContinuousPaintingEnabled(0, false);
 
     // When disabling the agent, reset the override values.
@@ -750 +754 @@
 }
 
+void InspectorPageAgent::canContinuouslyPaint(ErrorString*, bool* outParam)
+{
+    *outParam = m_client->canContinuouslyPaint();
+}
+
+void InspectorPageAgent::setContinuousPaintingEnabled(ErrorString*, bool enabled)
+{
+    m_state->setBoolean(PageAgentState::pageAgentContinuousPaintingEnabled, enabled);
+    m_client->setContinuousPaintingEnabled(enabled);
+
+    if (!enabled && mainFrame() && mainFrame()->view())
+        mainFrame()->view()->invalidate();
+}
+
 void InspectorPageAgent::getScriptExecutionStatus(ErrorString*, PageCommandHandler::Result::Enum* status)
 {

trunk/Source/WebCore/inspector/InspectorPageAgent.h

@@ -112 +112 @@
     virtual void canShowFPSCounter(ErrorString*, bool*);
     virtual void setShowFPSCounter(ErrorString*, bool show);
+    virtual void canContinuouslyPaint(ErrorString*, bool*);
+    virtual void setContinuousPaintingEnabled(ErrorString*, bool enabled);
     virtual void getScriptExecutionStatus(ErrorString*, PageCommandHandler::Result::Enum*);
     virtual void setScriptExecutionDisabled(ErrorString*, bool);

trunk/Source/WebCore/inspector/front-end/Settings.js

@@ -61 +61 @@
     canOverrideGeolocation: false,
     canOverrideDeviceOrientation: false,
-    canShowFPSCounter: false
+    canShowFPSCounter: false,
+    canContinuouslyPaint: false
 }
 
@@ -100 +101 @@
     this.emulateTouchEvents = this.createSetting("emulateTouchEvents", false);
     this.showPaintRects = this.createSetting("showPaintRects", false);
+    this.continuousPainting = this.createSetting("continuousPainting", false);
     this.showFPSCounter = this.createSetting("showFPSCounter", false);
     this.showShadowDOM = this.createSetting("showShadowDOM", false);

trunk/Source/WebCore/inspector/front-end/SettingsScreen.js

@@ -297 +297 @@
         WebInspector.settings.showFPSCounter.addChangeListener(this._showFPSCounterChanged, this);
     }
+    if (Capabilities.canContinuouslyPaint) {
+        p.appendChild(this._createCheckboxSetting(WebInspector.UIString("Enable continuous page repainting"), WebInspector.settings.continuousPainting));
+        WebInspector.settings.continuousPainting.addChangeListener(this._continuousPaintingChanged, this);
+    }
 
     p = this._appendSection(WebInspector.UIString("Sources"));
@@ -345 +349 @@
     },
 
+    _continuousPaintingChanged: function()
+    {
+        PageAgent.setContinuousPaintingEnabled(WebInspector.settings.continuousPainting.get());
+    },
+
     _updateScriptDisabledCheckbox: function()
     {

trunk/Source/WebCore/inspector/front-end/inspector.js

@@ -373 +373 @@
     TimelineAgent.canMonitorMainThread(WebInspector._initializeCapability.bind(WebInspector, "timelineCanMonitorMainThread", null));
     PageAgent.canShowFPSCounter(WebInspector._initializeCapability.bind(WebInspector, "canShowFPSCounter", null));
+    PageAgent.canContinuouslyPaint(WebInspector._initializeCapability.bind(WebInspector, "canContinuouslyPaint", null));
     PageAgent.canOverrideDeviceMetrics(WebInspector._initializeCapability.bind(WebInspector, "canOverrideDeviceMetrics", null));
     PageAgent.canOverrideGeolocation(WebInspector._initializeCapability.bind(WebInspector, "canOverrideGeolocation", null));
@@ -491 +492 @@
     if (WebInspector.settings.showPaintRects.get())
         PageAgent.setShowPaintRects(true);
+
+    if (WebInspector.settings.continuousPainting.get())
+        PageAgent.setContinuousPaintingEnabled(true);
 
     if (WebInspector.settings.javaScriptDisabled.get())

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-01-25  Eberhard Graether  <egraether@google.com>
+
+        Web Inspector: add checkbox for continuous painting to the inspector's settings
+        https://bugs.webkit.org/show_bug.cgi?id=107352
+
+        Reviewed by Pavel Feldman.
+
+        This change adds a checkbox to activate continuous painting to the WebInspector's
+        rendering settings and plumbs the setting to Chromium's WebLayerTreeView. The
+        setting is visible if InspectorClient::canContinuouslyPaint() returns true.
+
+        * public/WebView.h:
+        (WebView):
+        * src/InspectorClientImpl.cpp:
+        (WebKit::InspectorClientImpl::canContinuouslyPaint):
+        (WebKit):
+        (WebKit::InspectorClientImpl::setContinuousPaintingEnabled):
+        * src/InspectorClientImpl.h:
+        (InspectorClientImpl):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::setContinuousPaintingEnabled):
+        (WebKit):
+        (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+        * src/WebViewImpl.h:
+
 2013-01-24  Keishi Hattori  <keishi@webkit.org>
 

trunk/Source/WebKit/chromium/public/WebView.h

@@ -473 +473 @@
     virtual void setShowPaintRects(bool) = 0;
     virtual void setShowFPSCounter(bool) = 0;
+    virtual void setContinuousPaintingEnabled(bool) = 0;
 
     // Benchmarking support -------------------------------------------------

trunk/Source/WebKit/chromium/src/InspectorClientImpl.cpp

@@ -173 +173 @@
 }
 
+bool InspectorClientImpl::canContinuouslyPaint()
+{
+    return true;
+}
+
+void InspectorClientImpl::setContinuousPaintingEnabled(bool enabled)
+{
+    m_inspectedWebView->setContinuousPaintingEnabled(enabled);
+}
+
 bool InspectorClientImpl::supportsFrameInstrumentation()
 {

trunk/Source/WebKit/chromium/src/InspectorClientImpl.h

@@ -80 +80 @@
     virtual void setShowFPSCounter(bool);
 
+    virtual bool canContinuouslyPaint();
+    virtual void setContinuousPaintingEnabled(bool);
+
     virtual bool supportsFrameInstrumentation();
 

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -874 +874 @@
 }
 
+void WebViewImpl::setContinuousPaintingEnabled(bool enabled)
+{
+    if (isAcceleratedCompositingActive()) {
+        TRACE_EVENT0("webkit", "WebViewImpl::setContinuousPaintingEnabled");
+        m_layerTreeView->setContinuousPaintingEnabled(enabled);
+    }
+    m_continuousPaintingEnabled = enabled;
+}
+
 bool WebViewImpl::handleKeyEvent(const WebKeyboardEvent& event)
 {
@@ -4070 +4079 @@
             m_layerTreeView->setShowFPSCounter(m_showFPSCounter);
             m_layerTreeView->setShowPaintRects(m_showPaintRects);
+            m_layerTreeView->setContinuousPaintingEnabled(m_continuousPaintingEnabled);
         } else {
             m_nonCompositedContentHost.clear();

trunk/Source/WebKit/chromium/src/WebViewImpl.h

@@ -312 +312 @@
     virtual void setShowPaintRects(bool);
     virtual void setShowFPSCounter(bool);
+    virtual void setContinuousPaintingEnabled(bool);
 
     // WebLayerTreeViewClient