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

Unified Diff: webkit/compositor_bindings/WebLayerImpl.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/stubs/TextStream.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/compositor_bindings/WebLayerImpl.cpp
diff --git a/webkit/compositor_bindings/WebLayerImpl.cpp b/webkit/compositor_bindings/WebLayerImpl.cpp
index 84f5e5ae87d9357456ba1198e2c2836ff0cbc7e6..c087bf8b28b7d69dd97b3e8385d8aeeb3f84dd98 100644
--- a/webkit/compositor_bindings/WebLayerImpl.cpp
+++ b/webkit/compositor_bindings/WebLayerImpl.cpp
@@ -9,6 +9,10 @@
#include "LayerChromium.h"
#include "SkMatrix44.h"
#include "WebAnimationImpl.h"
+#ifdef LOG
+#undef LOG
+#endif
+#include "base/string_util.h"
#include <public/WebFloatPoint.h>
#include <public/WebFloatRect.h>
#include <public/WebSize.h>
@@ -275,7 +279,7 @@ void WebLayerImpl::setDebugBorderWidth(float width)
void WebLayerImpl::setDebugName(WebString name)
{
- m_layer->setDebugName(name);
+ m_layer->setDebugName(UTF16ToASCII(string16(name.data(), name.length())));
}
void WebLayerImpl::setAnimationDelegate(WebAnimationDelegate* delegate)
« no previous file with comments | « cc/stubs/TextStream.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698