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

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

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 #ifndef CC_RESOURCES_PICTURE_H_ 5 #ifndef CC_RESOURCES_PICTURE_H_
6 #define CC_RESOURCES_PICTURE_H_ 6 #define CC_RESOURCES_PICTURE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/containers/hash_tables.h" 13 #include "base/containers/hash_tables.h"
14 #include "base/debug/trace_event.h" 14 #include "base/debug/trace_event.h"
15 #include "base/lazy_instance.h" 15 #include "base/lazy_instance.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/memory/ref_counted.h" 17 #include "base/memory/ref_counted.h"
18 #include "base/memory/scoped_ptr.h" 18 #include "base/memory/scoped_ptr.h"
19 #include "cc/base/cc_export.h" 19 #include "cc/base/cc_export.h"
20 #include "cc/base/region.h" 20 #include "cc/base/region.h"
21 #include "skia/ext/refptr.h" 21 #include "skia/ext/refptr.h"
22 #include "third_party/skia/include/core/SkBBHFactory.h" 22 #include "third_party/skia/include/core/SkBBHFactory.h"
23 #include "third_party/skia/include/core/SkPicture.h" 23 #include "third_party/skia/include/core/SkPicture.h"
24 #include "ui/gfx/geometry/rect.h" 24 #include "ui/gfx/geometry/rect.h"
25 25
robertphillips 2015/01/06 16:08:09 This also will go away after the renaming as the p
26 class SkDrawPictureCallback;
26 class SkPixelRef; 27 class SkPixelRef;
27 28
28 namespace base { 29 namespace base {
29 class Value; 30 class Value;
30 } 31 }
31 32
32 namespace skia { 33 namespace skia {
33 class AnalysisCanvas; 34 class AnalysisCanvas;
34 } 35 }
35 36
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 AsTraceableRecordData() const; 162 AsTraceableRecordData() const;
162 163
163 friend class base::RefCountedThreadSafe<Picture>; 164 friend class base::RefCountedThreadSafe<Picture>;
164 friend class PixelRefIterator; 165 friend class PixelRefIterator;
165 DISALLOW_COPY_AND_ASSIGN(Picture); 166 DISALLOW_COPY_AND_ASSIGN(Picture);
166 }; 167 };
167 168
168 } // namespace cc 169 } // namespace cc
169 170
170 #endif // CC_RESOURCES_PICTURE_H_ 171 #endif // CC_RESOURCES_PICTURE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698