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

Side by Side Diff: cc/ScrollbarLayerChromium.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/ScrollbarLayerChromium.h ('k') | cc/UnthrottledTextureUploader.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 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 "ScrollbarLayerChromium.h" 9 #include "ScrollbarLayerChromium.h"
10 10
(...skipping 20 matching lines...) Expand all
31 31
32 ScrollbarLayerChromium::ScrollbarLayerChromium(PassOwnPtr<WebKit::WebScrollbar> scrollbar, WebKit::WebScrollbarThemePainter painter, PassOwnPtr<WebKit::WebScrol lbarThemeGeometry> geometry, int scrollLayerId) 32 ScrollbarLayerChromium::ScrollbarLayerChromium(PassOwnPtr<WebKit::WebScrollbar> scrollbar, WebKit::WebScrollbarThemePainter painter, PassOwnPtr<WebKit::WebScrol lbarThemeGeometry> geometry, int scrollLayerId)
33 : m_scrollbar(scrollbar) 33 : m_scrollbar(scrollbar)
34 , m_painter(painter) 34 , m_painter(painter)
35 , m_geometry(geometry) 35 , m_geometry(geometry)
36 , m_scrollLayerId(scrollLayerId) 36 , m_scrollLayerId(scrollLayerId)
37 , m_textureFormat(GraphicsContext3D::INVALID_ENUM) 37 , m_textureFormat(GraphicsContext3D::INVALID_ENUM)
38 { 38 {
39 } 39 }
40 40
41 ScrollbarLayerChromium::~ScrollbarLayerChromium()
42 {
43 }
44
41 void ScrollbarLayerChromium::pushPropertiesTo(CCLayerImpl* layer) 45 void ScrollbarLayerChromium::pushPropertiesTo(CCLayerImpl* layer)
42 { 46 {
43 LayerChromium::pushPropertiesTo(layer); 47 LayerChromium::pushPropertiesTo(layer);
44 48
45 CCScrollbarLayerImpl* scrollbarLayer = static_cast<CCScrollbarLayerImpl*>(la yer); 49 CCScrollbarLayerImpl* scrollbarLayer = static_cast<CCScrollbarLayerImpl*>(la yer);
46 50
47 if (!scrollbarLayer->scrollbarGeometry()) 51 if (!scrollbarLayer->scrollbarGeometry())
48 scrollbarLayer->setScrollbarGeometry(CCScrollbarGeometryFixedThumb::crea te(adoptPtr(m_geometry->clone()))); 52 scrollbarLayer->setScrollbarGeometry(CCScrollbarGeometryFixedThumb::crea te(adoptPtr(m_geometry->clone())));
49 53
50 scrollbarLayer->setScrollbarData(m_scrollbar.get()); 54 scrollbarLayer->setScrollbarData(m_scrollbar.get());
51 55
52 if (m_backTrack && m_backTrack->texture()->haveBackingTexture()) 56 if (m_backTrack && m_backTrack->texture()->haveBackingTexture())
53 scrollbarLayer->setBackTrackResourceId(m_backTrack->texture()->resourceI d()); 57 scrollbarLayer->setBackTrackResourceId(m_backTrack->texture()->resourceI d());
54 else 58 else
55 scrollbarLayer->setBackTrackResourceId(0); 59 scrollbarLayer->setBackTrackResourceId(0);
56 60
57 if (m_foreTrack && m_foreTrack->texture()->haveBackingTexture()) 61 if (m_foreTrack && m_foreTrack->texture()->haveBackingTexture())
58 scrollbarLayer->setForeTrackResourceId(m_foreTrack->texture()->resourceI d()); 62 scrollbarLayer->setForeTrackResourceId(m_foreTrack->texture()->resourceI d());
59 else 63 else
60 scrollbarLayer->setForeTrackResourceId(0); 64 scrollbarLayer->setForeTrackResourceId(0);
61 65
62 if (m_thumb && m_thumb->texture()->haveBackingTexture()) 66 if (m_thumb && m_thumb->texture()->haveBackingTexture())
63 scrollbarLayer->setThumbResourceId(m_thumb->texture()->resourceId()); 67 scrollbarLayer->setThumbResourceId(m_thumb->texture()->resourceId());
64 else 68 else
65 scrollbarLayer->setThumbResourceId(0); 69 scrollbarLayer->setThumbResourceId(0);
66 } 70 }
67 71
72 ScrollbarLayerChromium* ScrollbarLayerChromium::toScrollbarLayerChromium()
73 {
74 return this;
75 }
76
68 class ScrollbarBackgroundPainter : public LayerPainterChromium { 77 class ScrollbarBackgroundPainter : public LayerPainterChromium {
69 WTF_MAKE_NONCOPYABLE(ScrollbarBackgroundPainter); 78 WTF_MAKE_NONCOPYABLE(ScrollbarBackgroundPainter);
70 public: 79 public:
71 static PassOwnPtr<ScrollbarBackgroundPainter> create(WebKit::WebScrollbar* s crollbar, WebKit::WebScrollbarThemePainter painter, WebKit::WebScrollbarThemeGeo metry* geometry, WebKit::WebScrollbar::ScrollbarPart trackPart) 80 static PassOwnPtr<ScrollbarBackgroundPainter> create(WebKit::WebScrollbar* s crollbar, WebKit::WebScrollbarThemePainter painter, WebKit::WebScrollbarThemeGeo metry* geometry, WebKit::WebScrollbar::ScrollbarPart trackPart)
72 { 81 {
73 return adoptPtr(new ScrollbarBackgroundPainter(scrollbar, painter, geome try, trackPart)); 82 return adoptPtr(new ScrollbarBackgroundPainter(scrollbar, painter, geome try, trackPart));
74 } 83 }
75 84
76 virtual void paint(SkCanvas* skCanvas, const IntRect& contentRect, FloatRect &) OVERRIDE 85 virtual void paint(SkCanvas* skCanvas, const IntRect& contentRect, FloatRect &) OVERRIDE
77 { 86 {
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 261
253 // Consider the thumb to be at the origin when painting. 262 // Consider the thumb to be at the origin when painting.
254 WebKit::WebRect thumbRect = m_geometry->thumbRect(m_scrollbar.get()); 263 WebKit::WebRect thumbRect = m_geometry->thumbRect(m_scrollbar.get());
255 IntRect originThumbRect = IntRect(0, 0, thumbRect.width, thumbRect.height); 264 IntRect originThumbRect = IntRect(0, 0, thumbRect.width, thumbRect.height);
256 if (!originThumbRect.isEmpty()) 265 if (!originThumbRect.isEmpty())
257 updatePart(m_thumbUpdater.get(), m_thumb.get(), originThumbRect, queue, stats); 266 updatePart(m_thumbUpdater.get(), m_thumb.get(), originThumbRect, queue, stats);
258 } 267 }
259 268
260 } 269 }
261 #endif // USE(ACCELERATED_COMPOSITING) 270 #endif // USE(ACCELERATED_COMPOSITING)
OLDNEW
« no previous file with comments | « cc/ScrollbarLayerChromium.h ('k') | cc/UnthrottledTextureUploader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698