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

Unified Diff: cc/LayerChromium.cpp

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/LayerChromium.h ('k') | cc/ProgramBinding.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/LayerChromium.cpp
diff --git a/cc/LayerChromium.cpp b/cc/LayerChromium.cpp
index c8f6d66764a6a54418f1f5808ef33f557f16427c..3b7182460f1b620bd410c9259a8d1301a07263bd 100644
--- a/cc/LayerChromium.cpp
+++ b/cc/LayerChromium.cpp
@@ -13,8 +13,6 @@
#include "CCLayerImpl.h"
#include "CCLayerTreeHost.h"
#include "CCSettings.h"
-#include "TextStream.h"
-
#include <public/WebAnimationDelegate.h>
#include <public/WebLayerScrollClient.h>
#include <public/WebSize.h>
@@ -509,7 +507,7 @@ void LayerChromium::pushPropertiesTo(CCLayerImpl* layer)
layer->setContentBounds(contentBounds());
layer->setDebugBorderColor(m_debugBorderColor);
layer->setDebugBorderWidth(m_debugBorderWidth);
- layer->setDebugName(m_debugName.isolatedCopy()); // We have to use isolatedCopy() here to safely pass ownership to another thread.
+ layer->setDebugName(m_debugName);
layer->setDoubleSided(m_doubleSided);
layer->setDrawCheckerboardForMissingTiles(m_drawCheckerboardForMissingTiles);
layer->setForceRenderSurface(m_forceRenderSurface);
@@ -581,7 +579,7 @@ void LayerChromium::setDebugBorderWidth(float width)
setNeedsCommit();
}
-void LayerChromium::setDebugName(const String& debugName)
+void LayerChromium::setDebugName(const std::string& debugName)
{
m_debugName = debugName;
setNeedsCommit();
« no previous file with comments | « cc/LayerChromium.h ('k') | cc/ProgramBinding.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698