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

Side by Side Diff: cc/blink/web_layer_impl.h

Issue 1419913002: Remove blink::WebLayerClient and WebGraphicsLayerDebugInfo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: try making webcore_shared link with base to fix win dbg component Created 5 years, 2 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 | « no previous file | cc/blink/web_layer_impl.cc » ('j') | cc/blink/web_layer_impl.cc » ('J')
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_LAYER_IMPL_H_ 5 #ifndef CC_BLINK_WEB_LAYER_IMPL_H_
6 #define CC_BLINK_WEB_LAYER_IMPL_H_ 6 #define CC_BLINK_WEB_LAYER_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "cc/blink/cc_blink_export.h" 13 #include "cc/blink/cc_blink_export.h"
14 #include "cc/layers/layer_client.h" 14 #include "cc/layers/layer_client.h"
15 #include "third_party/WebKit/public/platform/WebCString.h" 15 #include "third_party/WebKit/public/platform/WebCString.h"
16 #include "third_party/WebKit/public/platform/WebColor.h" 16 #include "third_party/WebKit/public/platform/WebColor.h"
17 #include "third_party/WebKit/public/platform/WebCompositorAnimation.h" 17 #include "third_party/WebKit/public/platform/WebCompositorAnimation.h"
18 #include "third_party/WebKit/public/platform/WebDoublePoint.h" 18 #include "third_party/WebKit/public/platform/WebDoublePoint.h"
19 #include "third_party/WebKit/public/platform/WebFloatPoint.h" 19 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
20 #include "third_party/WebKit/public/platform/WebLayer.h" 20 #include "third_party/WebKit/public/platform/WebLayer.h"
21 #include "third_party/WebKit/public/platform/WebPoint.h" 21 #include "third_party/WebKit/public/platform/WebPoint.h"
22 #include "third_party/WebKit/public/platform/WebRect.h" 22 #include "third_party/WebKit/public/platform/WebRect.h"
23 #include "third_party/WebKit/public/platform/WebSize.h" 23 #include "third_party/WebKit/public/platform/WebSize.h"
24 #include "third_party/WebKit/public/platform/WebString.h" 24 #include "third_party/WebKit/public/platform/WebString.h"
25 #include "third_party/WebKit/public/platform/WebVector.h" 25 #include "third_party/WebKit/public/platform/WebVector.h"
26 #include "third_party/skia/include/utils/SkMatrix44.h" 26 #include "third_party/skia/include/utils/SkMatrix44.h"
27 27
28 namespace blink { 28 namespace blink {
29 class WebFilterOperations; 29 class WebFilterOperations;
30 class WebLayerClient;
31 struct WebFloatRect; 30 struct WebFloatRect;
32 } 31 }
33 32
34 namespace base { 33 namespace base {
35 namespace trace_event { 34 namespace trace_event {
36 class ConvertableToTraceFormat; 35 class ConvertableToTraceFormat;
37 } 36 }
38 } 37 }
39 38
40 namespace cc { 39 namespace cc {
41 class Layer; 40 class Layer;
42 class LayerSettings; 41 class LayerSettings;
43 } 42 }
44 43
45 namespace cc_blink { 44 namespace cc_blink {
46 45
47 class WebToCCAnimationDelegateAdapter; 46 class WebToCCAnimationDelegateAdapter;
48 47
49 class WebLayerImpl : public blink::WebLayer, public cc::LayerClient { 48 class WebLayerImpl : public blink::WebLayer {
50 public: 49 public:
51 CC_BLINK_EXPORT WebLayerImpl(); 50 CC_BLINK_EXPORT WebLayerImpl();
52 CC_BLINK_EXPORT explicit WebLayerImpl(scoped_refptr<cc::Layer>); 51 CC_BLINK_EXPORT explicit WebLayerImpl(scoped_refptr<cc::Layer>);
53 ~WebLayerImpl() override; 52 ~WebLayerImpl() override;
54 53
55 CC_BLINK_EXPORT static void SetLayerSettings( 54 CC_BLINK_EXPORT static void SetLayerSettings(
56 const cc::LayerSettings& settings); 55 const cc::LayerSettings& settings);
57 CC_BLINK_EXPORT static const cc::LayerSettings& LayerSettings(); 56 CC_BLINK_EXPORT static const cc::LayerSettings& LayerSettings();
58 57
59 CC_BLINK_EXPORT cc::Layer* layer() const; 58 CC_BLINK_EXPORT cc::Layer* layer() const;
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 override; 137 override;
139 blink::WebVector<std::pair<int64_t, blink::WebRect>> frameTimingRequests() 138 blink::WebVector<std::pair<int64_t, blink::WebRect>> frameTimingRequests()
140 const override; 139 const override;
141 void setIsContainerForFixedPositionLayers(bool is_container) override; 140 void setIsContainerForFixedPositionLayers(bool is_container) override;
142 bool isContainerForFixedPositionLayers() const override; 141 bool isContainerForFixedPositionLayers() const override;
143 void setPositionConstraint( 142 void setPositionConstraint(
144 const blink::WebLayerPositionConstraint& constraint) override; 143 const blink::WebLayerPositionConstraint& constraint) override;
145 blink::WebLayerPositionConstraint positionConstraint() const override; 144 blink::WebLayerPositionConstraint positionConstraint() const override;
146 void setScrollClient(blink::WebLayerScrollClient* client) override; 145 void setScrollClient(blink::WebLayerScrollClient* client) override;
147 bool isOrphan() const override; 146 bool isOrphan() const override;
148 void setWebLayerClient(blink::WebLayerClient* client) override; 147 void setLayerClient(cc::LayerClient* client) override;
149 148 const cc::Layer* ccLayer() const override;
150 // LayerClient implementation.
151 scoped_refptr<base::trace_event::ConvertableToTraceFormat> TakeDebugInfo()
152 override;
153 149
154 void setScrollParent(blink::WebLayer* parent) override; 150 void setScrollParent(blink::WebLayer* parent) override;
155 void setClipParent(blink::WebLayer* parent) override; 151 void setClipParent(blink::WebLayer* parent) override;
156 152
157 protected: 153 protected:
158 scoped_refptr<cc::Layer> layer_; 154 scoped_refptr<cc::Layer> layer_;
159 blink::WebLayerClient* web_layer_client_;
160 155
161 bool contents_opaque_is_fixed_; 156 bool contents_opaque_is_fixed_;
162 157
163 private: 158 private:
164 scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_; 159 scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_;
165 160
166 DISALLOW_COPY_AND_ASSIGN(WebLayerImpl); 161 DISALLOW_COPY_AND_ASSIGN(WebLayerImpl);
167 }; 162 };
168 163
169 } // namespace cc_blink 164 } // namespace cc_blink
170 165
171 #endif // CC_BLINK_WEB_LAYER_IMPL_H_ 166 #endif // CC_BLINK_WEB_LAYER_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | cc/blink/web_layer_impl.cc » ('j') | cc/blink/web_layer_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698