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

Side by Side Diff: cc/LayerChromium.h

Issue 10900021: Use std::string instead of WTF::String / TextStream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « cc/CCVideoLayerImpl.cpp ('k') | cc/LayerChromium.cpp » ('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 5
6 #ifndef LayerChromium_h 6 #ifndef LayerChromium_h
7 #define LayerChromium_h 7 #define LayerChromium_h
8 8
9 #if USE(ACCELERATED_COMPOSITING) 9 #if USE(ACCELERATED_COMPOSITING)
10 10
11 #include "CCLayerAnimationController.h" 11 #include "CCLayerAnimationController.h"
12 #include "CCOcclusionTracker.h" 12 #include "CCOcclusionTracker.h"
13 #include "CCPrioritizedTexture.h" 13 #include "CCPrioritizedTexture.h"
14 #include "FloatPoint.h" 14 #include "FloatPoint.h"
15 #include "Region.h" 15 #include "Region.h"
16 #include "RenderSurfaceChromium.h" 16 #include "RenderSurfaceChromium.h"
17 #include "SkColor.h" 17 #include "SkColor.h"
18
19 #include <public/WebFilterOperations.h> 18 #include <public/WebFilterOperations.h>
20 #include <public/WebTransformationMatrix.h> 19 #include <public/WebTransformationMatrix.h>
20 #include <string>
21 #include <wtf/OwnPtr.h> 21 #include <wtf/OwnPtr.h>
22 #include <wtf/PassOwnPtr.h> 22 #include <wtf/PassOwnPtr.h>
23 #include <wtf/PassRefPtr.h> 23 #include <wtf/PassRefPtr.h>
24 #include <wtf/RefCounted.h> 24 #include <wtf/RefCounted.h>
25 #include <wtf/Vector.h> 25 #include <wtf/Vector.h>
26 #include <wtf/text/StringHash.h>
27 #include <wtf/text/WTFString.h>
28 26
29 namespace WebKit { 27 namespace WebKit {
30 class WebAnimationDelegate; 28 class WebAnimationDelegate;
31 class WebLayerScrollClient; 29 class WebLayerScrollClient;
32 } 30 }
33 31
34 namespace WebCore { 32 namespace WebCore {
35 33
36 class CCActiveAnimation; 34 class CCActiveAnimation;
37 struct CCAnimationEvent; 35 struct CCAnimationEvent;
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 // These methods typically need to be overwritten by derived classes. 177 // These methods typically need to be overwritten by derived classes.
180 virtual bool drawsContent() const { return m_isDrawable; } 178 virtual bool drawsContent() const { return m_isDrawable; }
181 virtual void update(CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRend eringStats&) { } 179 virtual void update(CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRend eringStats&) { }
182 virtual bool needMoreUpdates() { return false; } 180 virtual bool needMoreUpdates() { return false; }
183 virtual void setIsMask(bool) { } 181 virtual void setIsMask(bool) { }
184 virtual void bindContentsTexture() { } 182 virtual void bindContentsTexture() { }
185 virtual bool needsContentsScale() const { return false; } 183 virtual bool needsContentsScale() const { return false; }
186 184
187 void setDebugBorderColor(SkColor); 185 void setDebugBorderColor(SkColor);
188 void setDebugBorderWidth(float); 186 void setDebugBorderWidth(float);
189 void setDebugName(const String&); 187 void setDebugName(const std::string&);
190 188
191 virtual void pushPropertiesTo(CCLayerImpl*); 189 virtual void pushPropertiesTo(CCLayerImpl*);
192 190
193 void clearRenderSurface() { m_renderSurface.clear(); } 191 void clearRenderSurface() { m_renderSurface.clear(); }
194 RenderSurfaceChromium* renderSurface() const { return m_renderSurface.get(); } 192 RenderSurfaceChromium* renderSurface() const { return m_renderSurface.get(); }
195 void createRenderSurface(); 193 void createRenderSurface();
196 194
197 float drawOpacity() const { return m_drawOpacity; } 195 float drawOpacity() const { return m_drawOpacity; }
198 void setDrawOpacity(float opacity) { m_drawOpacity = opacity; } 196 void setDrawOpacity(float opacity) { m_drawOpacity = opacity; }
199 197
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 bool m_scrollable; 316 bool m_scrollable;
319 bool m_shouldScrollOnMainThread; 317 bool m_shouldScrollOnMainThread;
320 bool m_haveWheelEventHandlers; 318 bool m_haveWheelEventHandlers;
321 Region m_nonFastScrollableRegion; 319 Region m_nonFastScrollableRegion;
322 bool m_nonFastScrollableRegionChanged; 320 bool m_nonFastScrollableRegionChanged;
323 FloatPoint m_position; 321 FloatPoint m_position;
324 FloatPoint m_anchorPoint; 322 FloatPoint m_anchorPoint;
325 SkColor m_backgroundColor; 323 SkColor m_backgroundColor;
326 SkColor m_debugBorderColor; 324 SkColor m_debugBorderColor;
327 float m_debugBorderWidth; 325 float m_debugBorderWidth;
328 String m_debugName; 326 std::string m_debugName;
329 float m_opacity; 327 float m_opacity;
330 WebKit::WebFilterOperations m_filters; 328 WebKit::WebFilterOperations m_filters;
331 WebKit::WebFilterOperations m_backgroundFilters; 329 WebKit::WebFilterOperations m_backgroundFilters;
332 float m_anchorPointZ; 330 float m_anchorPointZ;
333 bool m_isContainerForFixedPositionLayers; 331 bool m_isContainerForFixedPositionLayers;
334 bool m_fixedToContainerLayer; 332 bool m_fixedToContainerLayer;
335 bool m_isDrawable; 333 bool m_isDrawable;
336 bool m_masksToBounds; 334 bool m_masksToBounds;
337 bool m_opaque; 335 bool m_opaque;
338 bool m_doubleSided; 336 bool m_doubleSided;
(...skipping 29 matching lines...) Expand all
368 WebKit::WebAnimationDelegate* m_layerAnimationDelegate; 366 WebKit::WebAnimationDelegate* m_layerAnimationDelegate;
369 WebKit::WebLayerScrollClient* m_layerScrollClient; 367 WebKit::WebLayerScrollClient* m_layerScrollClient;
370 }; 368 };
371 369
372 void sortLayers(Vector<RefPtr<LayerChromium> >::iterator, Vector<RefPtr<LayerChr omium> >::iterator, void*); 370 void sortLayers(Vector<RefPtr<LayerChromium> >::iterator, Vector<RefPtr<LayerChr omium> >::iterator, void*);
373 371
374 } 372 }
375 #endif // USE(ACCELERATED_COMPOSITING) 373 #endif // USE(ACCELERATED_COMPOSITING)
376 374
377 #endif 375 #endif
OLDNEW
« no previous file with comments | « cc/CCVideoLayerImpl.cpp ('k') | cc/LayerChromium.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698