| 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;
|
|
|