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

Side by Side Diff: cc/layer_impl.cc

Issue 11145033: cc: Get rid of CC*.h temporary header files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased - fixed the conflicts hopefuly Created 8 years, 2 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/layer_impl.h ('k') | cc/layer_sorter.cc » ('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 #include "CCLayerImpl.h" 7 #include "CCLayerImpl.h"
8 8
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "CCDebugBorderDrawQuad.h" 10 #include "CCDebugBorderDrawQuad.h"
11 #include "CCLayerSorter.h" 11 #include "CCLayerSorter.h"
12 #include "CCMathUtil.h" 12 #include "cc/math_util.h"
13 #include "CCProxy.h" 13 #include "cc/proxy.h"
14 #include "CCQuadSink.h" 14 #include "CCQuadSink.h"
15 #include "CCScrollbarAnimationController.h" 15 #include "cc/scrollbar_animation_controller.h"
16 #include "CCSettings.h" 16 #include "CCSettings.h"
17 #include "TraceEvent.h" 17 #include "TraceEvent.h"
18 18
19 using WebKit::WebTransformationMatrix; 19 using WebKit::WebTransformationMatrix;
20 20
21 namespace cc { 21 namespace cc {
22 22
23 CCLayerImpl::CCLayerImpl(int id) 23 CCLayerImpl::CCLayerImpl(int id)
24 : m_parent(0) 24 : m_parent(0)
25 , m_maskLayerId(-1) 25 , m_maskLayerId(-1)
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 671
672 void CCLayerImpl::setVerticalScrollbarLayer(CCScrollbarLayerImpl* scrollbarLayer ) 672 void CCLayerImpl::setVerticalScrollbarLayer(CCScrollbarLayerImpl* scrollbarLayer )
673 { 673 {
674 if (!m_scrollbarAnimationController) 674 if (!m_scrollbarAnimationController)
675 m_scrollbarAnimationController = CCScrollbarAnimationController::create( this); 675 m_scrollbarAnimationController = CCScrollbarAnimationController::create( this);
676 m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer); 676 m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer);
677 m_scrollbarAnimationController->updateScrollOffset(this); 677 m_scrollbarAnimationController->updateScrollOffset(this);
678 } 678 }
679 679
680 } 680 }
OLDNEW
« no previous file with comments | « cc/layer_impl.h ('k') | cc/layer_sorter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698