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

Unified Diff: Source/web/tests/sim/SimCompositor.cpp

Issue 1316673009: Revert of Add a FOUC painting test. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 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/tests/sim/SimCompositor.h ('k') | Source/web/tests/sim/SimDisplayItemList.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/tests/sim/SimCompositor.cpp
diff --git a/Source/web/tests/sim/SimCompositor.cpp b/Source/web/tests/sim/SimCompositor.cpp
deleted file mode 100644
index bce1fa201db217a4db5a81758cdb5589b702f6f3..0000000000000000000000000000000000000000
--- a/Source/web/tests/sim/SimCompositor.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "config.h"
-#include "web/tests/sim/SimCompositor.h"
-
-#include "core/frame/FrameView.h"
-#include "core/layout/LayoutView.h"
-#include "core/layout/compositing/CompositedDeprecatedPaintLayerMapping.h"
-#include "core/paint/DeprecatedPaintLayer.h"
-#include "platform/graphics/ContentLayerDelegate.h"
-#include "public/platform/WebRect.h"
-#include "web/WebLocalFrameImpl.h"
-#include "web/WebViewImpl.h"
-#include "web/tests/sim/SimDisplayItemList.h"
-#include "web/tests/sim/SimLayerTreeView.h"
-#include "wtf/CurrentTime.h"
-
-namespace blink {
-
-static void paintLayers(DeprecatedPaintLayer& layer, SimDisplayItemList& displayList)
-{
- if (layer.compositingState() == PaintsIntoOwnBacking) {
- CompositedDeprecatedPaintLayerMapping* mapping = layer.compositedDeprecatedPaintLayerMapping();
- GraphicsLayer* graphicsLayer = mapping->mainGraphicsLayer();
- if (graphicsLayer->hasTrackedPaintInvalidations()) {
- ContentLayerDelegate* delegate = graphicsLayer->contentLayerDelegateForTesting();
- delegate->paintContents(&displayList, WebRect(0, 0, layer.size().width(), layer.size().height()));
- graphicsLayer->resetTrackedPaintInvalidations();
- }
- }
- for (DeprecatedPaintLayer* child = layer.firstChild(); child; child = child->nextSibling())
- paintLayers(*child, displayList);
-}
-
-static void paintFrames(LocalFrame& root, SimDisplayItemList& displayList)
-{
- for (Frame* frame = &root; frame; frame = frame->tree().traverseNext(&root)) {
- if (!frame->isLocalFrame())
- continue;
- DeprecatedPaintLayer* layer = toLocalFrame(frame)->view()->layoutView()->layer();
- paintLayers(*layer, displayList);
- }
-}
-
-SimCompositor::SimCompositor(SimLayerTreeView& layerTreeView)
- : m_layerTreeView(&layerTreeView)
- , m_webViewImpl(0)
- , m_lastFrameTimeMonotonic(0)
-{
- FrameView::setInitialTracksPaintInvalidationsForTesting(true);
-}
-
-SimCompositor::~SimCompositor()
-{
- FrameView::setInitialTracksPaintInvalidationsForTesting(false);
-}
-
-void SimCompositor::setWebViewImpl(WebViewImpl& webViewImpl)
-{
- m_webViewImpl = &webViewImpl;
-}
-
-SimCompositor::BeginFrameResult SimCompositor::beginFrame()
-{
- ASSERT(m_webViewImpl);
- ASSERT(!m_layerTreeView->deferCommits());
- ASSERT(m_layerTreeView->needsAnimate());
-
- // Always advance the time as if the compositor was running at 60fps.
- m_lastFrameTimeMonotonic = monotonicallyIncreasingTime() + 0.016;
-
- WebBeginFrameArgs args(m_lastFrameTimeMonotonic, 0, 0);
- m_webViewImpl->beginFrame(args);
- m_webViewImpl->layout();
-
- LocalFrame* root = m_webViewImpl->mainFrameImpl()->frame();
-
- SimDisplayItemList displayList;
- paintFrames(*root, displayList);
-
- BeginFrameResult result;
- result.didDrawText = displayList.didDrawText();
- result.drawCount = displayList.drawCount();
-
- m_layerTreeView->clearNeedsAnimate();
-
- return result;
-}
-
-} // namespace blink
« no previous file with comments | « Source/web/tests/sim/SimCompositor.h ('k') | Source/web/tests/sim/SimDisplayItemList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698