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