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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/CCVideoLayerImpl.cpp ('k') | cc/LayerChromium.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/LayerChromium.h
diff --git a/cc/LayerChromium.h b/cc/LayerChromium.h
index 7b06a6d7bea27a9a8cdb0068c5c74ac97e96ccde..583a4482c6fcc4e70e3a276753f3aea0a02df69d 100644
--- a/cc/LayerChromium.h
+++ b/cc/LayerChromium.h
@@ -15,16 +15,14 @@
#include "Region.h"
#include "RenderSurfaceChromium.h"
#include "SkColor.h"
-
#include <public/WebFilterOperations.h>
#include <public/WebTransformationMatrix.h>
+#include <string>
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/Vector.h>
-#include <wtf/text/StringHash.h>
-#include <wtf/text/WTFString.h>
namespace WebKit {
class WebAnimationDelegate;
@@ -186,7 +184,7 @@ public:
void setDebugBorderColor(SkColor);
void setDebugBorderWidth(float);
- void setDebugName(const String&);
+ void setDebugName(const std::string&);
virtual void pushPropertiesTo(CCLayerImpl*);
@@ -325,7 +323,7 @@ private:
SkColor m_backgroundColor;
SkColor m_debugBorderColor;
float m_debugBorderWidth;
- String m_debugName;
+ std::string m_debugName;
float m_opacity;
WebKit::WebFilterOperations m_filters;
WebKit::WebFilterOperations m_backgroundFilters;
« 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