Index: cc/ContentLayerChromium.cpp |
diff --git a/cc/ContentLayerChromium.cpp b/cc/ContentLayerChromium.cpp |
deleted file mode 100644 |
index ee8277b466f94b1af2e2ca3b97d93b3184856210..0000000000000000000000000000000000000000 |
--- a/cc/ContentLayerChromium.cpp |
+++ /dev/null |
@@ -1,113 +0,0 @@ |
-// Copyright 2010 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" |
- |
-#if USE(ACCELERATED_COMPOSITING) |
- |
-#include "ContentLayerChromium.h" |
- |
-#include "base/time.h" |
-#include "BitmapCanvasLayerTextureUpdater.h" |
-#include "BitmapSkPictureCanvasLayerTextureUpdater.h" |
-#include "CCLayerTreeHost.h" |
-#include "CCSettings.h" |
-#include "ContentLayerChromiumClient.h" |
-#include "FrameBufferSkPictureCanvasLayerTextureUpdater.h" |
-#include "LayerPainterChromium.h" |
-#include <public/Platform.h> |
- |
-namespace cc { |
- |
-ContentLayerPainter::ContentLayerPainter(ContentLayerChromiumClient* client) |
- : m_client(client) |
-{ |
-} |
- |
-PassOwnPtr<ContentLayerPainter> ContentLayerPainter::create(ContentLayerChromiumClient* client) |
-{ |
- return adoptPtr(new ContentLayerPainter(client)); |
-} |
- |
-void ContentLayerPainter::paint(SkCanvas* canvas, const IntRect& contentRect, FloatRect& opaque) |
-{ |
- base::TimeTicks paintStart = base::TimeTicks::HighResNow(); |
- m_client->paintContents(canvas, contentRect, opaque); |
- base::TimeTicks paintEnd = base::TimeTicks::HighResNow(); |
- double pixelsPerSec = (contentRect.width() * contentRect.height()) / (paintEnd - paintStart).InSecondsF(); |
- WebKit::Platform::current()->histogramCustomCounts("Renderer4.AccelContentPaintDurationMS", (paintEnd - paintStart).InMillisecondsF(), 0, 120, 30); |
- WebKit::Platform::current()->histogramCustomCounts("Renderer4.AccelContentPaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30); |
-} |
- |
-scoped_refptr<ContentLayerChromium> ContentLayerChromium::create(ContentLayerChromiumClient* client) |
-{ |
- return make_scoped_refptr(new ContentLayerChromium(client)); |
-} |
- |
-ContentLayerChromium::ContentLayerChromium(ContentLayerChromiumClient* client) |
- : TiledLayerChromium() |
- , m_client(client) |
-{ |
-} |
- |
-ContentLayerChromium::~ContentLayerChromium() |
-{ |
-} |
- |
-bool ContentLayerChromium::drawsContent() const |
-{ |
- return TiledLayerChromium::drawsContent() && m_client; |
-} |
- |
-void ContentLayerChromium::setTexturePriorities(const CCPriorityCalculator& priorityCalc) |
-{ |
- // Update the tile data before creating all the layer's tiles. |
- updateTileSizeAndTilingOption(); |
- |
- TiledLayerChromium::setTexturePriorities(priorityCalc); |
-} |
- |
-void ContentLayerChromium::update(CCTextureUpdateQueue& queue, const CCOcclusionTracker* occlusion, CCRenderingStats& stats) |
-{ |
- createTextureUpdaterIfNeeded(); |
- TiledLayerChromium::update(queue, occlusion, stats); |
- m_needsDisplay = false; |
-} |
- |
-bool ContentLayerChromium::needMoreUpdates() |
-{ |
- return needsIdlePaint(); |
-} |
- |
-LayerTextureUpdater* ContentLayerChromium::textureUpdater() const |
-{ |
- return m_textureUpdater.get(); |
-} |
- |
-void ContentLayerChromium::createTextureUpdaterIfNeeded() |
-{ |
- if (m_textureUpdater) |
- return; |
- if (layerTreeHost()->settings().acceleratePainting) |
- m_textureUpdater = FrameBufferSkPictureCanvasLayerTextureUpdater::create(ContentLayerPainter::create(m_client)); |
- else if (CCSettings::perTilePaintingEnabled()) |
- m_textureUpdater = BitmapSkPictureCanvasLayerTextureUpdater::create(ContentLayerPainter::create(m_client)); |
- else |
- m_textureUpdater = BitmapCanvasLayerTextureUpdater::create(ContentLayerPainter::create(m_client)); |
- m_textureUpdater->setOpaque(contentsOpaque()); |
- |
- GC3Denum textureFormat = layerTreeHost()->rendererCapabilities().bestTextureFormat; |
- setTextureFormat(textureFormat); |
- setSampledTexelFormat(textureUpdater()->sampledTexelFormat(textureFormat)); |
-} |
- |
-void ContentLayerChromium::setContentsOpaque(bool opaque) |
-{ |
- LayerChromium::setContentsOpaque(opaque); |
- if (m_textureUpdater) |
- m_textureUpdater->setOpaque(opaque); |
-} |
- |
-} |
-#endif // USE(ACCELERATED_COMPOSITING) |