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

Unified Diff: cc/CCLayerImpl.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
Index: cc/CCLayerImpl.h
diff --git a/cc/CCLayerImpl.h b/cc/CCLayerImpl.h
index 01b4b759e0e2d2d0a348141a7af145e3bf402804..2cba688b92b668e4ad0967badf7723247dea7dee 100644
--- a/cc/CCLayerImpl.h
+++ b/cc/CCLayerImpl.h
@@ -14,13 +14,12 @@
#include "IntRect.h"
#include "Region.h"
#include "SkColor.h"
-#include "TextStream.h"
#include <public/WebFilterOperations.h>
#include <public/WebTransformationMatrix.h>
#include <wtf/OwnPtr.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
-#include <wtf/text/WTFString.h>
+#include <string>
enne (OOO) 2012/09/10 03:43:42 nit: header order
namespace WebCore {
@@ -144,8 +143,8 @@ public:
bool hasDebugBorders() const;
// Debug layer name.
- void setDebugName(const String& debugName) { m_debugName = debugName; }
- String debugName() const { return m_debugName; }
+ void setDebugName(const std::string& debugName) { m_debugName = debugName; }
+ std::string debugName() const { return m_debugName; }
CCRenderSurface* renderSurface() const { return m_renderSurface.get(); }
void createRenderSurface();
@@ -224,7 +223,7 @@ public:
const FloatRect& updateRect() const { return m_updateRect; }
void setUpdateRect(const FloatRect& updateRect) { m_updateRect = updateRect; }
- String layerTreeAsText() const;
+ std::string layerTreeAsText() const;
void setStackingOrderChanged(bool);
@@ -257,8 +256,8 @@ protected:
void appendDebugBorderQuad(CCQuadSink&, const CCSharedQuadState*, CCAppendQuadsData&) const;
- virtual void dumpLayerProperties(TextStream&, int indent) const;
- static void writeIndent(TextStream&, int indent);
+ virtual void dumpLayerProperties(std::string*, int indent) const;
+ static std::string indentString(int indent);
private:
void setParent(CCLayerImpl* parent) { m_parent = parent; }
@@ -272,7 +271,7 @@ private:
virtual const char* layerTypeAsString() const { return "LayerChromium"; }
- void dumpLayer(TextStream&, int indent) const;
+ void dumpLayer(std::string*, int indent) const;
// Properties internal to CCLayerImpl
CCLayerImpl* m_parent;
@@ -351,7 +350,7 @@ private:
float m_debugBorderWidth;
// Debug layer name.
- String m_debugName;
+ std::string m_debugName;
WebKit::WebFilterOperations m_filters;
WebKit::WebFilterOperations m_backgroundFilters;
« no previous file with comments | « cc/CCIOSurfaceLayerImpl.cpp ('k') | cc/CCLayerImpl.cpp » ('j') | cc/ProgramBinding.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698