Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2135)

Unified Diff: Source/web/WebViewImpl.cpp

Issue 1288623004: Devtools: Remove continuous repainting feature (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/WebViewImpl.h ('k') | Source/web/painting/ContinuousPainter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index 2fbacd7a9eb8bf64e2dfdab96a369d8d4d20f231..471844085b04eabd2223c35886432ab156e3108e 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -172,7 +172,6 @@
#include "web/WebRemoteFrameImpl.h"
#include "web/WebSettingsImpl.h"
#include "web/WorkerGlobalScopeProxyProviderImpl.h"
-#include "web/painting/ContinuousPainter.h"
#include "wtf/CurrentTime.h"
#include "wtf/RefPtr.h"
#include "wtf/TemporaryChange.h"
@@ -451,7 +450,6 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
, m_flingSourceDevice(false)
, m_fullscreenController(FullscreenController::create(this))
, m_showFPSCounter(false)
- , m_continuousPaintingEnabled(false)
, m_baseBackgroundColor(Color::white)
, m_backgroundColorOverride(Color::transparent)
, m_zoomFactorOverride(0)
@@ -964,7 +962,6 @@ void WebViewImpl::setShowFPSCounter(bool show)
{
if (m_layerTreeView) {
TRACE_EVENT0("blink", "WebViewImpl::setShowFPSCounter");
- // FIXME: allow emulation, fps counter and continuous painting at the same time: crbug.com/299837.
m_layerTreeView->setShowFPSCounter(show && !m_devToolsEmulator->deviceEmulationEnabled());
}
m_showFPSCounter = show;
@@ -985,25 +982,10 @@ void WebViewImpl::setShowDebugBorders(bool show)
m_layerTreeView->setShowDebugBorders(show);
}
-void WebViewImpl::setContinuousPaintingEnabled(bool enabled)
+void WebViewImpl::updateShowFPSCounter()
{
- if (m_layerTreeView) {
- TRACE_EVENT0("blink", "WebViewImpl::setContinuousPaintingEnabled");
- // FIXME: allow emulation, fps counter and continuous painting at the same time: crbug.com/299837.
- m_layerTreeView->setContinuousPaintingEnabled(enabled && !m_devToolsEmulator->deviceEmulationEnabled());
- }
- m_continuousPaintingEnabled = enabled;
- if (m_client)
- m_client->scheduleAnimation();
-}
-
-void WebViewImpl::updateShowFPSCounterAndContinuousPainting()
-{
- if (m_layerTreeView) {
- // FIXME: allow emulation, fps counter and continuous painting at the same time: crbug.com/299837.
- m_layerTreeView->setContinuousPaintingEnabled(m_continuousPaintingEnabled && !m_devToolsEmulator->deviceEmulationEnabled());
+ if (m_layerTreeView)
m_layerTreeView->setShowFPSCounter(m_showFPSCounter && !m_devToolsEmulator->deviceEmulationEnabled());
- }
}
void WebViewImpl::setShowScrollBottleneckRects(bool show)
@@ -1901,17 +1883,6 @@ void WebViewImpl::beginFrame(const WebBeginFrameArgs& frameTime)
// FIXME: This should probably be using the local root?
if (m_page->mainFrame()->isLocalFrame())
PageWidgetDelegate::animate(*m_page, validFrameTime.lastFrameTimeMonotonic, *m_page->deprecatedLocalMainFrame());
-
- if (m_continuousPaintingEnabled) {
- GraphicsLayer* inspectorOverlayLayer = nullptr;
- if (m_inspectorOverlay) {
- PageOverlay* inspectorPageOverlay = m_inspectorOverlay->pageOverlay();
- if (inspectorPageOverlay)
- inspectorOverlayLayer = inspectorPageOverlay->graphicsLayer();
- }
- ContinuousPainter::setNeedsDisplayRecursive(m_rootGraphicsLayer, inspectorOverlayLayer);
- m_client->scheduleAnimation();
- }
}
void WebViewImpl::layout()
« no previous file with comments | « Source/web/WebViewImpl.h ('k') | Source/web/painting/ContinuousPainter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698