cc/playback/picture.cc - Issue 1138923005: Remove SK_LEGACY_DRAWPICTURECALLBACK

Side by Side Diff: cc/playback/picture.cc

Issue 1138923005: Remove SK_LEGACY_DRAWPICTURECALLBACK (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: analysis_canvas_unittest fix Created 5 years, 7 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 unified diff | Download patch

« no previous file with comments | « cc/playback/float_clip_display_item.cc ('k') | cc/playback/picture_pile_impl.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2012 The Chromium Authors. All rights reserved.	1 // Copyright 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "cc/playback/picture.h"	5 #include "cc/playback/picture.h"

6	6

7 #include <set>	7 #include <set>

8 #include <string>	8 #include <string>

9	9

10 #include "base/base64.h"	10 #include "base/base64.h"

11 #include "base/trace_event/trace_event.h"	11 #include "base/trace_event/trace_event.h"

12 #include "base/trace_event/trace_event_argument.h"	12 #include "base/trace_event/trace_event_argument.h"

13 #include "base/values.h"	13 #include "base/values.h"

14 #include "cc/base/math_util.h"	14 #include "cc/base/math_util.h"

15 #include "cc/base/util.h"	15 #include "cc/base/util.h"

16 #include "cc/debug/picture_debug_util.h"	16 #include "cc/debug/picture_debug_util.h"

17 #include "cc/debug/traced_picture.h"	17 #include "cc/debug/traced_picture.h"

18 #include "cc/debug/traced_value.h"	18 #include "cc/debug/traced_value.h"

19 #include "cc/layers/content_layer_client.h"	19 #include "cc/layers/content_layer_client.h"

20 #include "skia/ext/pixel_ref_utils.h"	20 #include "skia/ext/pixel_ref_utils.h"

21 #include "third_party/skia/include/core/SkCanvas.h"	21 #include "third_party/skia/include/core/SkCanvas.h"

22 #include "third_party/skia/include/core/SkDrawPictureCallback.h"

23 #include "third_party/skia/include/core/SkPaint.h"	22 #include "third_party/skia/include/core/SkPaint.h"

24 #include "third_party/skia/include/core/SkPictureRecorder.h"	23 #include "third_party/skia/include/core/SkPictureRecorder.h"

25 #include "third_party/skia/include/core/SkStream.h"	24 #include "third_party/skia/include/core/SkStream.h"

26 #include "third_party/skia/include/utils/SkNullCanvas.h"	25 #include "third_party/skia/include/utils/SkNullCanvas.h"

27 #include "third_party/skia/include/utils/SkPictureUtils.h"	26 #include "third_party/skia/include/utils/SkPictureUtils.h"

28 #include "ui/gfx/codec/jpeg_codec.h"	27 #include "ui/gfx/codec/jpeg_codec.h"

29 #include "ui/gfx/codec/png_codec.h"	28 #include "ui/gfx/codec/png_codec.h"

30 #include "ui/gfx/geometry/rect_conversions.h"	29 #include "ui/gfx/geometry/rect_conversions.h"

31 #include "ui/gfx/skia_util.h"	30 #include "ui/gfx/skia_util.h"

32	31

(...skipping 298 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
331 scoped_refptr<base::trace_event::ConvertableToTraceFormat>	330 scoped_refptr<base::trace_event::ConvertableToTraceFormat>

332 Picture::AsTraceableRecordData() const {	331 Picture::AsTraceableRecordData() const {

333 scoped_refptr<base::trace_event::TracedValue> record_data =	332 scoped_refptr<base::trace_event::TracedValue> record_data =

334 new base::trace_event::TracedValue();	333 new base::trace_event::TracedValue();

335 TracedValue::SetIDRef(this, record_data.get(), "picture_id");	334 TracedValue::SetIDRef(this, record_data.get(), "picture_id");

336 MathUtil::AddToTracedValue("layer_rect", layer_rect_, record_data.get());	335 MathUtil::AddToTracedValue("layer_rect", layer_rect_, record_data.get());

337 return record_data;	336 return record_data;

338 }	337 }

339	338

340 } // namespace cc	339 } // namespace cc

OLD	NEW