diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-10 19:15:27 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-10 19:15:27 +0000 |
| commit | 515e8d239945244e961c2a78e165f56ee1ccf858 (patch) | |
| tree | b8932af64861df25a283dc08bde611789580f8d3 /cc/LayerChromium.h | |
| parent | 2dd3dc1948312256f1321c0ba0186acffda12fcd (diff) | |
| download | chromium_src-515e8d239945244e961c2a78e165f56ee1ccf858.zip chromium_src-515e8d239945244e961c2a78e165f56ee1ccf858.tar.gz chromium_src-515e8d239945244e961c2a78e165f56ee1ccf858.tar.bz2 | |
Use std::string instead of WTF::String / TextStream
BUG=
Review URL: https://chromiumcodereview.appspot.com/10900021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/LayerChromium.h')
| -rw-r--r-- | cc/LayerChromium.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cc/LayerChromium.h b/cc/LayerChromium.h index 7b06a6d..583a448 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; |