| OLD | NEW |
| 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 #include "cc/scrollbar_layer.h" | 7 #include "cc/scrollbar_layer.h" |
| 8 | 8 |
| 9 #include "CCLayerTreeHost.h" | 9 #include "CCLayerTreeHost.h" |
| 10 #include "CCScrollbarLayerImpl.h" | 10 #include "CCScrollbarLayerImpl.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 scoped_refptr<ScrollbarLayerChromium> ScrollbarLayerChromium::create(scoped_ptr<
WebKit::WebScrollbar> scrollbar, WebKit::WebScrollbarThemePainter painter, scope
d_ptr<WebKit::WebScrollbarThemeGeometry> geometry, int scrollLayerId) | 26 scoped_refptr<ScrollbarLayerChromium> ScrollbarLayerChromium::create(scoped_ptr<
WebKit::WebScrollbar> scrollbar, WebKit::WebScrollbarThemePainter painter, scope
d_ptr<WebKit::WebScrollbarThemeGeometry> geometry, int scrollLayerId) |
| 27 { | 27 { |
| 28 return make_scoped_refptr(new ScrollbarLayerChromium(scrollbar.Pass(), paint
er, geometry.Pass(), scrollLayerId)); | 28 return make_scoped_refptr(new ScrollbarLayerChromium(scrollbar.Pass(), paint
er, geometry.Pass(), scrollLayerId)); |
| 29 } | 29 } |
| 30 | 30 |
| 31 ScrollbarLayerChromium::ScrollbarLayerChromium(scoped_ptr<WebKit::WebScrollbar>
scrollbar, WebKit::WebScrollbarThemePainter painter, scoped_ptr<WebKit::WebScrol
lbarThemeGeometry> geometry, int scrollLayerId) | 31 ScrollbarLayerChromium::ScrollbarLayerChromium(scoped_ptr<WebKit::WebScrollbar>
scrollbar, WebKit::WebScrollbarThemePainter painter, scoped_ptr<WebKit::WebScrol
lbarThemeGeometry> geometry, int scrollLayerId) |
| 32 : m_scrollbar(scrollbar.Pass()) | 32 : m_scrollbar(scrollbar.Pass()) |
| 33 , m_painter(painter) | 33 , m_painter(painter) |
| 34 , m_geometry(geometry.Pass()) | 34 , m_geometry(geometry.Pass()) |
| 35 , m_scrollLayerId(scrollLayerId) | 35 , m_scrollLayerId(scrollLayerId) |
| 36 , m_textureFormat(GraphicsContext3D::INVALID_ENUM) | 36 , m_textureFormat(GL_INVALID_ENUM) |
| 37 { | 37 { |
| 38 } | 38 } |
| 39 | 39 |
| 40 ScrollbarLayerChromium::~ScrollbarLayerChromium() | 40 ScrollbarLayerChromium::~ScrollbarLayerChromium() |
| 41 { | 41 { |
| 42 } | 42 } |
| 43 | 43 |
| 44 void ScrollbarLayerChromium::pushPropertiesTo(CCLayerImpl* layer) | 44 void ScrollbarLayerChromium::pushPropertiesTo(CCLayerImpl* layer) |
| 45 { | 45 { |
| 46 LayerChromium::pushPropertiesTo(layer); | 46 LayerChromium::pushPropertiesTo(layer); |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 updatePart(m_foreTrackUpdater.get(), m_foreTrack.get(), contentRect, que
ue, stats); | 275 updatePart(m_foreTrackUpdater.get(), m_foreTrack.get(), contentRect, que
ue, stats); |
| 276 | 276 |
| 277 // Consider the thumb to be at the origin when painting. | 277 // Consider the thumb to be at the origin when painting. |
| 278 WebKit::WebRect thumbRect = m_geometry->thumbRect(m_scrollbar.get()); | 278 WebKit::WebRect thumbRect = m_geometry->thumbRect(m_scrollbar.get()); |
| 279 IntRect originThumbRect = layerRectToContentRect(WebKit::WebRect(0, 0, thumb
Rect.width, thumbRect.height)); | 279 IntRect originThumbRect = layerRectToContentRect(WebKit::WebRect(0, 0, thumb
Rect.width, thumbRect.height)); |
| 280 if (!originThumbRect.isEmpty()) | 280 if (!originThumbRect.isEmpty()) |
| 281 updatePart(m_thumbUpdater.get(), m_thumb.get(), originThumbRect, queue,
stats); | 281 updatePart(m_thumbUpdater.get(), m_thumb.get(), originThumbRect, queue,
stats); |
| 282 } | 282 } |
| 283 | 283 |
| 284 } | 284 } |
| OLD | NEW |