Enable disabling WebCore::GraphicsContext in telemetry.

cc/resources/picture.cc

 // Copyright 2012 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 "cc/resources/picture.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 
@@ skipping 255 matching lines @@
 
   scoped_ptr<EXPERIMENTAL::SkRecording> recording;
 
   skia::RefPtr<SkCanvas> canvas;
   canvas = skia::SharePtr(
       recorder.beginRecording(layer_rect_.width(),
                               layer_rect_.height(),
                               &factory,
                               SkPicture::kUsePathBoundsForClip_RecordingFlag));
 
+  ContentLayerClient::GraphicsContextStatus graphics_context_status =
+      ContentLayerClient::GraphicsContextEnabled;
+
   switch (recording_mode) {
     case RECORD_NORMALLY:
-      // Already setup for normal recording
+      // Already setup for normal recording.
       break;
     case RECORD_WITH_SK_NULL_CANVAS:
       canvas = skia::AdoptRef(SkCreateNullCanvas());
       break;
     case RECORD_WITH_PAINTING_DISABLED:
-      // Blink's GraphicsContext will disable painting when given a NULL
-      // canvas.
-      canvas.clear();
+      // We pass a disable flag through the paint calls.
+      graphics_context_status = ContentLayerClient::GraphicsContextDisabled;
       break;
     case RECORD_WITH_SKRECORD:
       recording.reset(new EXPERIMENTAL::SkRecording(layer_rect_.width(),
                                                     layer_rect_.height()));
       canvas = skia::SharePtr(recording->canvas());
       break;
     default:
       NOTREACHED();
   }
 
   if (canvas) {

[danakj, 2014/05/01 17:07:50]

This if() can go away too?

[Stephen Chennney, 2014/05/01 19:12:26]

Yep, done. I also think we should use the null canvas when drawing painting
disabled, to make the work done with PAINTING_DISABLED a strict subset of the
NULL_CANVAS situation.

     canvas->save();
     canvas->translate(SkFloatToScalar(-layer_rect_.x()),
                       SkFloatToScalar(-layer_rect_.y()));
 
     SkRect layer_skrect = SkRect::MakeXYWH(layer_rect_.x(),
                                            layer_rect_.y(),
                                            layer_rect_.width(),
                                            layer_rect_.height());
     canvas->clipRect(layer_skrect);
   }
 
   gfx::RectF opaque_layer_rect;
-  painter->PaintContents(canvas.get(), layer_rect_, &opaque_layer_rect);
+  painter->PaintContents(
+      canvas.get(), layer_rect_, &opaque_layer_rect, graphics_context_status);
 
   if (canvas)

[danakj, 2014/05/01 17:07:50]

and this?

[Stephen Chennney, 2014/05/01 19:12:26]

Done.

     canvas->restore();
   picture_ = skia::AdoptRef(recorder.endRecording());
   DCHECK(picture_);
 
   if (recording) {
     // SkRecording requires it's the only one holding onto canvas before we
     // may call releasePlayback().  (This helps enforce thread-safety.)
     canvas.clear();
     playback_.reset(recording->releasePlayback());
   }
@@ skipping 254 matching lines @@
 
 scoped_refptr<base::debug::ConvertableToTraceFormat>
     Picture::AsTraceableRecordData() const {
   scoped_ptr<base::DictionaryValue> record_data(new base::DictionaryValue());
   record_data->Set("picture_id", TracedValue::CreateIDRef(this).release());
   record_data->Set("layer_rect", MathUtil::AsValue(layer_rect_).release());
   return TracedValue::FromValue(record_data.release());
 }
 
 }  // namespace cc