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

Side by Side Diff: cc/CCScrollbarLayerImpl.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 "CCScrollbarLayerImpl.h" 9 #include "CCScrollbarLayerImpl.h"
10 10
(...skipping 23 matching lines...) Expand all
34 , m_pressedPart(WebScrollbar::NoPart) 34 , m_pressedPart(WebScrollbar::NoPart)
35 , m_hoveredPart(WebScrollbar::NoPart) 35 , m_hoveredPart(WebScrollbar::NoPart)
36 , m_isScrollableAreaActive(false) 36 , m_isScrollableAreaActive(false)
37 , m_isScrollViewScrollbar(false) 37 , m_isScrollViewScrollbar(false)
38 , m_enabled(false) 38 , m_enabled(false)
39 , m_isCustomScrollbar(false) 39 , m_isCustomScrollbar(false)
40 , m_isOverlayScrollbar(false) 40 , m_isOverlayScrollbar(false)
41 { 41 {
42 } 42 }
43 43
44 CCScrollbarLayerImpl::~CCScrollbarLayerImpl()
45 {
46 }
47
44 void CCScrollbarLayerImpl::setScrollbarGeometry(PassOwnPtr<CCScrollbarGeometryFi xedThumb> geometry) 48 void CCScrollbarLayerImpl::setScrollbarGeometry(PassOwnPtr<CCScrollbarGeometryFi xedThumb> geometry)
45 { 49 {
46 m_geometry = geometry; 50 m_geometry = geometry;
47 } 51 }
48 52
49 void CCScrollbarLayerImpl::setScrollbarData(WebScrollbar* scrollbar) 53 void CCScrollbarLayerImpl::setScrollbarData(WebScrollbar* scrollbar)
50 { 54 {
51 m_scrollbarOverlayStyle = scrollbar->scrollbarOverlayStyle(); 55 m_scrollbarOverlayStyle = scrollbar->scrollbarOverlayStyle();
52 m_orientation = scrollbar->orientation(); 56 m_orientation = scrollbar->orientation();
53 m_controlSize = scrollbar->controlSize(); 57 m_controlSize = scrollbar->controlSize();
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 WebScrollbar::Orientation CCScrollbarLayerImpl::CCScrollbar::orientation() const 188 WebScrollbar::Orientation CCScrollbarLayerImpl::CCScrollbar::orientation() const
185 { 189 {
186 return m_owner->m_orientation; 190 return m_owner->m_orientation;
187 } 191 }
188 192
189 bool CCScrollbarLayerImpl::CCScrollbar::isCustomScrollbar() const 193 bool CCScrollbarLayerImpl::CCScrollbar::isCustomScrollbar() const
190 { 194 {
191 return m_owner->m_isCustomScrollbar; 195 return m_owner->m_isCustomScrollbar;
192 } 196 }
193 197
198 const char* CCScrollbarLayerImpl::layerTypeAsString() const
199 {
200 return "ScrollbarLayer";
194 } 201 }
202
203 }
204
195 #endif // USE(ACCELERATED_COMPOSITING) 205 #endif // USE(ACCELERATED_COMPOSITING)
OLDNEW
« no previous file with comments | « cc/CCScrollbarLayerImpl.h ('k') | cc/CCSingleThreadProxy.h » ('j') | cc/CCTiledLayerImpl.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698