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

Side by Side Diff: cc/CCLayerImpl.cpp

Issue 10942040: Fix CC*Renderer and CC*LayerImpl to compile with Clang (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
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 6
7 #if USE(ACCELERATED_COMPOSITING) 7 #if USE(ACCELERATED_COMPOSITING)
8 8
9 #include "CCLayerImpl.h" 9 #include "CCLayerImpl.h"
10 10
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 m_layerPropertyChanged = true; 306 m_layerPropertyChanged = true;
307 noteLayerPropertyChangedForDescendants(); 307 noteLayerPropertyChangedForDescendants();
308 } 308 }
309 309
310 void CCLayerImpl::noteLayerPropertyChangedForDescendants() 310 void CCLayerImpl::noteLayerPropertyChangedForDescendants()
311 { 311 {
312 for (size_t i = 0; i < m_children.size(); ++i) 312 for (size_t i = 0; i < m_children.size(); ++i)
313 m_children[i]->noteLayerPropertyChangedForSubtree(); 313 m_children[i]->noteLayerPropertyChangedForSubtree();
314 } 314 }
315 315
316 const char* CCLayerImpl::layerTypeAsString() const
317 {
318 return "LayerChromium";
319 }
320
316 void CCLayerImpl::resetAllChangeTrackingForSubtree() 321 void CCLayerImpl::resetAllChangeTrackingForSubtree()
317 { 322 {
318 m_layerPropertyChanged = false; 323 m_layerPropertyChanged = false;
319 m_layerSurfacePropertyChanged = false; 324 m_layerSurfacePropertyChanged = false;
320 325
321 m_updateRect = FloatRect(); 326 m_updateRect = FloatRect();
322 327
323 if (m_renderSurface) 328 if (m_renderSurface)
324 m_renderSurface->resetPropertyChangedFlag(); 329 m_renderSurface->resetPropertyChangedFlag();
325 330
326 if (m_maskLayer) 331 if (m_maskLayer)
327 m_maskLayer->resetAllChangeTrackingForSubtree(); 332 m_maskLayer->resetAllChangeTrackingForSubtree();
328 333
329 if (m_replicaLayer) 334 if (m_replicaLayer)
330 m_replicaLayer->resetAllChangeTrackingForSubtree(); // also resets the r eplica mask, if it exists. 335 m_replicaLayer->resetAllChangeTrackingForSubtree(); // also resets the r eplica mask, if it exists.
331 336
332 for (size_t i = 0; i < m_children.size(); ++i) 337 for (size_t i = 0; i < m_children.size(); ++i)
333 m_children[i]->resetAllChangeTrackingForSubtree(); 338 m_children[i]->resetAllChangeTrackingForSubtree();
334 } 339 }
335 340
341 bool CCLayerImpl::layerIsAlwaysDamaged() const
342 {
343 return false;
344 }
345
346 int CCLayerImpl::id() const
347 {
348 return m_layerId;
349 }
350
351 float CCLayerImpl::opacity() const
352 {
353 return m_opacity;
354 }
355
336 void CCLayerImpl::setOpacityFromAnimation(float opacity) 356 void CCLayerImpl::setOpacityFromAnimation(float opacity)
337 { 357 {
338 setOpacity(opacity); 358 setOpacity(opacity);
339 } 359 }
340 360
361 const WebKit::WebTransformationMatrix& CCLayerImpl::transform() const
362 {
363 return m_transform;
364 }
365
341 void CCLayerImpl::setTransformFromAnimation(const WebTransformationMatrix& trans form) 366 void CCLayerImpl::setTransformFromAnimation(const WebTransformationMatrix& trans form)
342 { 367 {
343 setTransform(transform); 368 setTransform(transform);
344 } 369 }
345 370
346 void CCLayerImpl::setBounds(const IntSize& bounds) 371 void CCLayerImpl::setBounds(const IntSize& bounds)
347 { 372 {
348 if (m_bounds == bounds) 373 if (m_bounds == bounds)
349 return; 374 return;
350 375
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 if (!m_scrollbarAnimationController) 644 if (!m_scrollbarAnimationController)
620 m_scrollbarAnimationController = CCScrollbarAnimationController::create( this); 645 m_scrollbarAnimationController = CCScrollbarAnimationController::create( this);
621 m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer); 646 m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer);
622 m_scrollbarAnimationController->updateScrollOffset(this); 647 m_scrollbarAnimationController->updateScrollOffset(this);
623 } 648 }
624 649
625 } 650 }
626 651
627 652
628 #endif // USE(ACCELERATED_COMPOSITING) 653 #endif // USE(ACCELERATED_COMPOSITING)
OLDNEW
« no previous file with comments | « cc/CCLayerImpl.h ('k') | cc/CCLayerQuad.h » ('j') | cc/CCTiledLayerImpl.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698