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

Side by Side Diff: cc/blink/web_content_layer_impl.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/blink/web_compositor_support_impl.cc ('k') | cc/blink/web_content_layer_impl.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_BLINK_WEB_CONTENT_LAYER_IMPL_H_ 5 #ifndef CC_BLINK_WEB_CONTENT_LAYER_IMPL_H_
6 #define CC_BLINK_WEB_CONTENT_LAYER_IMPL_H_ 6 #define CC_BLINK_WEB_CONTENT_LAYER_IMPL_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "cc/blink/cc_blink_export.h" 9 #include "cc/blink/cc_blink_export.h"
10 #include "cc/blink/web_layer_impl.h" 10 #include "cc/blink/web_layer_impl.h"
(...skipping 21 matching lines...) Expand all
32 virtual void setDoubleSided(bool double_sided); 32 virtual void setDoubleSided(bool double_sided);
33 virtual void setDrawCheckerboardForMissingTiles(bool checkerboard); 33 virtual void setDrawCheckerboardForMissingTiles(bool checkerboard);
34 34
35 protected: 35 protected:
36 virtual ~WebContentLayerImpl(); 36 virtual ~WebContentLayerImpl();
37 37
38 // ContentLayerClient implementation. 38 // ContentLayerClient implementation.
39 void PaintContents(SkCanvas* canvas, 39 void PaintContents(SkCanvas* canvas,
40 const gfx::Rect& clip, 40 const gfx::Rect& clip,
41 PaintingControlSetting painting_control) override; 41 PaintingControlSetting painting_control) override;
42 void PaintContentsToDisplayList( 42 scoped_refptr<cc::DisplayItemList> PaintContentsToDisplayList(
43 cc::DisplayItemList* display_list,
44 const gfx::Rect& clip, 43 const gfx::Rect& clip,
45 PaintingControlSetting painting_control) override; 44 PaintingControlSetting painting_control) override;
46 bool FillsBoundsCompletely() const override; 45 bool FillsBoundsCompletely() const override;
47 46
48 scoped_ptr<WebLayerImpl> layer_; 47 scoped_ptr<WebLayerImpl> layer_;
49 blink::WebContentLayerClient* client_; 48 blink::WebContentLayerClient* client_;
50 bool draws_content_; 49 bool draws_content_;
51 50
52 private: 51 private:
53 DISALLOW_COPY_AND_ASSIGN(WebContentLayerImpl); 52 DISALLOW_COPY_AND_ASSIGN(WebContentLayerImpl);
54 }; 53 };
55 54
56 } // namespace cc_blink 55 } // namespace cc_blink
57 56
58 #endif // CC_BLINK_WEB_CONTENT_LAYER_IMPL_H_ 57 #endif // CC_BLINK_WEB_CONTENT_LAYER_IMPL_H_
OLDNEW
« no previous file with comments | « cc/blink/web_compositor_support_impl.cc ('k') | cc/blink/web_content_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698