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

Side by Side Diff: cc/CCLayerImpl.cpp

Issue 10947047: Fix remaining cc files to compile with Clang (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix FakeCCDelayBasedTimeSource 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/CCLayerImpl.h ('k') | cc/CCLayerTilingData.h » ('j') | 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 6
7 #if USE(ACCELERATED_COMPOSITING) 7 #if USE(ACCELERATED_COMPOSITING)
8 8
9 #include "CCLayerImpl.h" 9 #include "CCLayerImpl.h"
10 10
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 146
147 void CCLayerImpl::appendDebugBorderQuad(CCQuadSink& quadList, const CCSharedQuad State* sharedQuadState, CCAppendQuadsData& appendQuadsData) const 147 void CCLayerImpl::appendDebugBorderQuad(CCQuadSink& quadList, const CCSharedQuad State* sharedQuadState, CCAppendQuadsData& appendQuadsData) const
148 { 148 {
149 if (!hasDebugBorders()) 149 if (!hasDebugBorders())
150 return; 150 return;
151 151
152 IntRect contentRect(IntPoint(), contentBounds()); 152 IntRect contentRect(IntPoint(), contentBounds());
153 quadList.append(CCDebugBorderDrawQuad::create(sharedQuadState, contentRect, debugBorderColor(), debugBorderWidth()), appendQuadsData); 153 quadList.append(CCDebugBorderDrawQuad::create(sharedQuadState, contentRect, debugBorderColor(), debugBorderWidth()), appendQuadsData);
154 } 154 }
155 155
156 bool CCLayerImpl::hasContributingDelegatedRenderPasses() const
157 {
158 return false;
159 }
160
161 CCRenderPass::Id CCLayerImpl::firstContributingRenderPassId() const
162 {
163 return CCRenderPass::Id(0, 0);
164 }
165
166 CCRenderPass::Id CCLayerImpl::nextContributingRenderPassId(CCRenderPass::Id) con st
167 {
168 return CCRenderPass::Id(0, 0);
169 }
170
156 CCResourceProvider::ResourceId CCLayerImpl::contentsResourceId() const 171 CCResourceProvider::ResourceId CCLayerImpl::contentsResourceId() const
157 { 172 {
158 ASSERT_NOT_REACHED(); 173 ASSERT_NOT_REACHED();
159 return 0; 174 return 0;
160 } 175 }
161 176
162 void CCLayerImpl::scrollBy(const FloatSize& scroll) 177 void CCLayerImpl::scrollBy(const FloatSize& scroll)
163 { 178 {
164 IntSize minDelta = -toSize(m_scrollPosition); 179 IntSize minDelta = -toSize(m_scrollPosition);
165 IntSize maxDelta = m_maxScrollPosition - toSize(m_scrollPosition); 180 IntSize maxDelta = m_maxScrollPosition - toSize(m_scrollPosition);
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 if (!m_scrollbarAnimationController) 659 if (!m_scrollbarAnimationController)
645 m_scrollbarAnimationController = CCScrollbarAnimationController::create( this); 660 m_scrollbarAnimationController = CCScrollbarAnimationController::create( this);
646 m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer); 661 m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer);
647 m_scrollbarAnimationController->updateScrollOffset(this); 662 m_scrollbarAnimationController->updateScrollOffset(this);
648 } 663 }
649 664
650 } 665 }
651 666
652 667
653 #endif // USE(ACCELERATED_COMPOSITING) 668 #endif // USE(ACCELERATED_COMPOSITING)
OLDNEW
« no previous file with comments | « cc/CCLayerImpl.h ('k') | cc/CCLayerTilingData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698