summaryrefslogtreecommitdiffstats
path: root/ui/compositor
diff options
context:
space:
mode:
authorschenney@chromium.org <schenney@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-02 21:03:03 +0000
committerschenney@chromium.org <schenney@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-02 21:03:03 +0000
commit276172b8f1e00033c253301fa2bdd76cfc980800 (patch)
treeee9a60e4fb1540e00150e247656a216fc0c28a38 /ui/compositor
parentced067e6da6e3092a00546ed820d9657a1707d91 (diff)
downloadchromium_src-276172b8f1e00033c253301fa2bdd76cfc980800.zip
chromium_src-276172b8f1e00033c253301fa2bdd76cfc980800.tar.gz
chromium_src-276172b8f1e00033c253301fa2bdd76cfc980800.tar.bz2
Enable disabling WebCore::GraphicsContext in telemetry.
Plumb a flag through from telemetry tests to the layer painting code that disables the WebCore::GraphicsContext. This allows us to isolate the various systems that paint web content in Chromium. R=nduca@chromium.org,skyostil@chromium.org BUG=350684 Review URL: https://codereview.chromium.org/253013003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267913 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/compositor')
-rw-r--r--ui/compositor/layer.cc3
-rw-r--r--ui/compositor/layer.h5
2 files changed, 6 insertions, 2 deletions
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
index a0a3bca..81cff54 100644
--- a/ui/compositor/layer.cc
+++ b/ui/compositor/layer.cc
@@ -654,7 +654,8 @@ void Layer::RequestCopyOfOutput(scoped_ptr<cc::CopyOutputRequest> request) {
void Layer::PaintContents(SkCanvas* sk_canvas,
const gfx::Rect& clip,
- gfx::RectF* opaque) {
+ gfx::RectF* opaque,
+ ContentLayerClient::GraphicsContextStatus gc_status) {
TRACE_EVENT0("ui", "Layer::PaintContents");
scoped_ptr<gfx::Canvas> canvas(gfx::Canvas::CreateCanvasWithoutScaling(
sk_canvas, device_scale_factor_));
diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h
index c42cbfe5..3cc7aa8 100644
--- a/ui/compositor/layer.h
+++ b/ui/compositor/layer.h
@@ -315,7 +315,10 @@ class COMPOSITOR_EXPORT Layer
// ContentLayerClient
virtual void PaintContents(
- SkCanvas* canvas, const gfx::Rect& clip, gfx::RectF* opaque) OVERRIDE;
+ SkCanvas* canvas,
+ const gfx::Rect& clip,
+ gfx::RectF* opaque,
+ ContentLayerClient::GraphicsContextStatus gc_status) OVERRIDE;
virtual void DidChangeLayerCanUseLCDText() OVERRIDE {}
virtual bool FillsBoundsCompletely() const OVERRIDE;