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

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

Issue 806553004: Fix inclusion of SkDrawPictureCallback.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clean up Created 5 years, 11 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
OLDNEW
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/resources/picture.h" 5 #include "cc/resources/picture.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <set> 9 #include <set>
10 10
11 #include "base/base64.h" 11 #include "base/base64.h"
12 #include "base/debug/trace_event.h" 12 #include "base/debug/trace_event.h"
13 #include "base/debug/trace_event_argument.h" 13 #include "base/debug/trace_event_argument.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "cc/base/math_util.h" 15 #include "cc/base/math_util.h"
16 #include "cc/base/util.h" 16 #include "cc/base/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/SkBBHFactory.h" 21 #include "third_party/skia/include/core/SkBBHFactory.h"
22 #include "third_party/skia/include/core/SkCanvas.h" 22 #include "third_party/skia/include/core/SkCanvas.h"
23 #include "third_party/skia/include/core/SkData.h" 23 #include "third_party/skia/include/core/SkData.h"
24 #include "third_party/skia/include/core/SkDrawPictureCallback.h"
danakj 2015/01/06 15:42:46 the forward declaration from the .h should be enou
robertphillips 2015/01/06 16:08:09 This will also go away after the Chromium-side ren
24 #include "third_party/skia/include/core/SkPaint.h" 25 #include "third_party/skia/include/core/SkPaint.h"
25 #include "third_party/skia/include/core/SkPictureRecorder.h" 26 #include "third_party/skia/include/core/SkPictureRecorder.h"
26 #include "third_party/skia/include/core/SkPixelSerializer.h" 27 #include "third_party/skia/include/core/SkPixelSerializer.h"
27 #include "third_party/skia/include/core/SkStream.h" 28 #include "third_party/skia/include/core/SkStream.h"
28 #include "third_party/skia/include/utils/SkNullCanvas.h" 29 #include "third_party/skia/include/utils/SkNullCanvas.h"
29 #include "third_party/skia/include/utils/SkPictureUtils.h" 30 #include "third_party/skia/include/utils/SkPictureUtils.h"
30 #include "ui/gfx/codec/jpeg_codec.h" 31 #include "ui/gfx/codec/jpeg_codec.h"
31 #include "ui/gfx/codec/png_codec.h" 32 #include "ui/gfx/codec/png_codec.h"
32 #include "ui/gfx/geometry/rect_conversions.h" 33 #include "ui/gfx/geometry/rect_conversions.h"
33 #include "ui/gfx/skia_util.h" 34 #include "ui/gfx/skia_util.h"
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 scoped_refptr<base::debug::TracedValue> record_data = 521 scoped_refptr<base::debug::TracedValue> record_data =
521 new base::debug::TracedValue(); 522 new base::debug::TracedValue();
522 TracedValue::SetIDRef(this, record_data.get(), "picture_id"); 523 TracedValue::SetIDRef(this, record_data.get(), "picture_id");
523 record_data->BeginArray("layer_rect"); 524 record_data->BeginArray("layer_rect");
524 MathUtil::AddToTracedValue(layer_rect_, record_data.get()); 525 MathUtil::AddToTracedValue(layer_rect_, record_data.get());
525 record_data->EndArray(); 526 record_data->EndArray();
526 return record_data; 527 return record_data;
527 } 528 }
528 529
529 } // namespace cc 530 } // namespace cc
OLDNEW
« cc/resources/picture.h ('K') | « cc/resources/picture.h ('k') | skia/ext/analysis_canvas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698