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

Side by Side Diff: cc/layers/picture_image_layer.h

Issue 1083683003: Speculative revert by sheriff (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed an unrelated commit that had accidentally slipped in. Created 5 years, 8 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/layers/content_layer_client.h ('k') | cc/layers/picture_image_layer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2010 The Chromium Authors. All rights reserved. 1 // Copyright 2010 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_LAYERS_PICTURE_IMAGE_LAYER_H_ 5 #ifndef CC_LAYERS_PICTURE_IMAGE_LAYER_H_
6 #define CC_LAYERS_PICTURE_IMAGE_LAYER_H_ 6 #define CC_LAYERS_PICTURE_IMAGE_LAYER_H_
7 7
8 #include "cc/base/cc_export.h" 8 #include "cc/base/cc_export.h"
9 #include "cc/layers/content_layer_client.h" 9 #include "cc/layers/content_layer_client.h"
10 #include "cc/layers/picture_layer.h" 10 #include "cc/layers/picture_layer.h"
11 #include "third_party/skia/include/core/SkBitmap.h" 11 #include "third_party/skia/include/core/SkBitmap.h"
12 #include "ui/gfx/geometry/size.h" 12 #include "ui/gfx/geometry/size.h"
13 13
14 namespace cc { 14 namespace cc {
15 15
16 class CC_EXPORT PictureImageLayer : public PictureLayer, ContentLayerClient { 16 class CC_EXPORT PictureImageLayer : public PictureLayer, ContentLayerClient {
17 public: 17 public:
18 static scoped_refptr<PictureImageLayer> Create(); 18 static scoped_refptr<PictureImageLayer> Create();
19 19
20 void SetBitmap(const SkBitmap& image); 20 void SetBitmap(const SkBitmap& image);
21 21
22 // Layer implementation. 22 // Layer implementation.
23 scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override; 23 scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
24 24
25 // ContentLayerClient implementation. 25 // ContentLayerClient implementation.
26 void PaintContents( 26 void PaintContents(
27 SkCanvas* canvas, 27 SkCanvas* canvas,
28 const gfx::Rect& clip, 28 const gfx::Rect& clip,
29 ContentLayerClient::PaintingControlSetting painting_control) override; 29 ContentLayerClient::PaintingControlSetting painting_control) override;
30 void PaintContentsToDisplayList( 30 scoped_refptr<DisplayItemList> PaintContentsToDisplayList(
31 DisplayItemList* display_list,
32 const gfx::Rect& clip, 31 const gfx::Rect& clip,
33 ContentLayerClient::PaintingControlSetting painting_control) override; 32 ContentLayerClient::PaintingControlSetting painting_control) override;
34 bool FillsBoundsCompletely() const override; 33 bool FillsBoundsCompletely() const override;
35 34
36 protected: 35 protected:
37 bool HasDrawableContent() const override; 36 bool HasDrawableContent() const override;
38 37
39 private: 38 private:
40 PictureImageLayer(); 39 PictureImageLayer();
41 ~PictureImageLayer() override; 40 ~PictureImageLayer() override;
42 41
43 SkBitmap bitmap_; 42 SkBitmap bitmap_;
44 43
45 DISALLOW_COPY_AND_ASSIGN(PictureImageLayer); 44 DISALLOW_COPY_AND_ASSIGN(PictureImageLayer);
46 }; 45 };
47 46
48 } // namespace cc 47 } // namespace cc
49 48
50 #endif // CC_LAYERS_PICTURE_IMAGE_LAYER_H_ 49 #endif // CC_LAYERS_PICTURE_IMAGE_LAYER_H_
OLDNEW
« no previous file with comments | « cc/layers/content_layer_client.h ('k') | cc/layers/picture_image_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698