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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/stubs/TextStream.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "WebLayerImpl.h" 6 #include "WebLayerImpl.h"
7 7
8 #include "CCActiveAnimation.h" 8 #include "CCActiveAnimation.h"
9 #include "LayerChromium.h" 9 #include "LayerChromium.h"
10 #include "SkMatrix44.h" 10 #include "SkMatrix44.h"
11 #include "WebAnimationImpl.h" 11 #include "WebAnimationImpl.h"
12 #ifdef LOG
13 #undef LOG
14 #endif
15 #include "base/string_util.h"
12 #include <public/WebFloatPoint.h> 16 #include <public/WebFloatPoint.h>
13 #include <public/WebFloatRect.h> 17 #include <public/WebFloatRect.h>
14 #include <public/WebSize.h> 18 #include <public/WebSize.h>
15 #include <public/WebTransformationMatrix.h> 19 #include <public/WebTransformationMatrix.h>
16 20
17 using WebCore::CCActiveAnimation; 21 using WebCore::CCActiveAnimation;
18 using WebCore::LayerChromium; 22 using WebCore::LayerChromium;
19 23
20 namespace WebKit { 24 namespace WebKit {
21 25
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 m_layer->setDebugBorderColor(color); 272 m_layer->setDebugBorderColor(color);
269 } 273 }
270 274
271 void WebLayerImpl::setDebugBorderWidth(float width) 275 void WebLayerImpl::setDebugBorderWidth(float width)
272 { 276 {
273 m_layer->setDebugBorderWidth(width); 277 m_layer->setDebugBorderWidth(width);
274 } 278 }
275 279
276 void WebLayerImpl::setDebugName(WebString name) 280 void WebLayerImpl::setDebugName(WebString name)
277 { 281 {
278 m_layer->setDebugName(name); 282 m_layer->setDebugName(UTF16ToASCII(string16(name.data(), name.length())));
279 } 283 }
280 284
281 void WebLayerImpl::setAnimationDelegate(WebAnimationDelegate* delegate) 285 void WebLayerImpl::setAnimationDelegate(WebAnimationDelegate* delegate)
282 { 286 {
283 m_layer->setLayerAnimationDelegate(delegate); 287 m_layer->setLayerAnimationDelegate(delegate);
284 } 288 }
285 289
286 bool WebLayerImpl::addAnimation(WebAnimation* animation) 290 bool WebLayerImpl::addAnimation(WebAnimation* animation)
287 { 291 {
288 return m_layer->addAnimation(static_cast<WebAnimationImpl*>(animation)->clon eToCCAnimation()); 292 return m_layer->addAnimation(static_cast<WebAnimationImpl*>(animation)->clon eToCCAnimation());
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 { 388 {
385 m_layer->setLayerScrollClient(scrollClient); 389 m_layer->setLayerScrollClient(scrollClient);
386 } 390 }
387 391
388 LayerChromium* WebLayerImpl::layer() const 392 LayerChromium* WebLayerImpl::layer() const
389 { 393 {
390 return m_layer.get(); 394 return m_layer.get();
391 } 395 }
392 396
393 } // namespace WebKit 397 } // namespace WebKit
OLDNEW
« 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