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

Unified Diff: cc/CCScrollbarLayerImpl.h

Issue 10879109: Update libcc / bindings snapshot to WebKit r126830 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/CCScrollbarGeometryStub.cpp ('k') | cc/CCScrollbarLayerImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCScrollbarLayerImpl.h
diff --git a/cc/CCScrollbarLayerImpl.h b/cc/CCScrollbarLayerImpl.h
index ebe3faa84e08e509309bf9e70a4b7af58f468534..4a4425ac0cd7a178c7210b44d681e6dd44f5a67a 100644
--- a/cc/CCScrollbarLayerImpl.h
+++ b/cc/CCScrollbarLayerImpl.h
@@ -8,9 +8,9 @@
#if USE(ACCELERATED_COMPOSITING)
#include "CCLayerImpl.h"
+#include "CCScrollbarGeometryFixedThumb.h"
#include <public/WebRect.h>
#include <public/WebScrollbar.h>
-#include <public/WebScrollbarThemeGeometry.h>
#include <public/WebVector.h>
namespace WebCore {
@@ -21,9 +21,9 @@ class CCScrollbarLayerImpl : public CCLayerImpl {
public:
static PassOwnPtr<CCScrollbarLayerImpl> create(int id);
- WebKit::WebScrollbarThemeGeometry* scrollbarGeometry() const { return m_geometry.get(); }
- void setScrollbarGeometry(PassOwnPtr<WebKit::WebScrollbarThemeGeometry>);
- void setScrollbarData(const WebKit::WebScrollbar*);
+ CCScrollbarGeometryFixedThumb* scrollbarGeometry() const { return m_geometry.get(); }
+ void setScrollbarGeometry(PassOwnPtr<CCScrollbarGeometryFixedThumb>);
+ void setScrollbarData(WebKit::WebScrollbar*);
void setBackTrackResourceId(CCResourceProvider::ResourceId id) { m_backTrackResourceId = id; }
void setForeTrackResourceId(CCResourceProvider::ResourceId id) { m_foreTrackResourceId = id; }
@@ -82,7 +82,7 @@ private:
CCResourceProvider::ResourceId m_foreTrackResourceId;
CCResourceProvider::ResourceId m_thumbResourceId;
- OwnPtr<WebKit::WebScrollbarThemeGeometry> m_geometry;
+ OwnPtr<CCScrollbarGeometryFixedThumb> m_geometry;
// Data to implement CCScrollbar
WebKit::WebScrollbar::ScrollbarOverlayStyle m_scrollbarOverlayStyle;
« no previous file with comments | « cc/CCScrollbarGeometryStub.cpp ('k') | cc/CCScrollbarLayerImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698