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

Unified Diff: cc/scrollbar_layer.h

Issue 11609002: cc: Create a cc::ScrollbarThemePainter and an adapter class in compositor bindings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: notry Created 8 years 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/layer_unittest.cc ('k') | cc/scrollbar_layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/scrollbar_layer.h
diff --git a/cc/scrollbar_layer.h b/cc/scrollbar_layer.h
index 47de62eaf054c62e294aa50ff3adf4727e0a0a84..2ddbad7b41eb78af13e354c7c23dc3f6032a17cb 100644
--- a/cc/scrollbar_layer.h
+++ b/cc/scrollbar_layer.h
@@ -9,9 +9,9 @@
#include "cc/caching_bitmap_content_layer_updater.h"
#include "cc/cc_export.h"
#include "cc/contents_scaling_layer.h"
-#include <public/WebScrollbar.h>
-#include <public/WebScrollbarThemeGeometry.h>
-#include <public/WebScrollbarThemePainter.h>
+#include "cc/scrollbar_theme_painter.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbar.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbarThemeGeometry.h"
namespace cc {
@@ -23,7 +23,11 @@ class CC_EXPORT ScrollbarLayer : public ContentsScalingLayer {
public:
virtual scoped_ptr<LayerImpl> createLayerImpl(LayerTreeImpl* treeImpl) OVERRIDE;
- static scoped_refptr<ScrollbarLayer> create(scoped_ptr<WebKit::WebScrollbar>, WebKit::WebScrollbarThemePainter, scoped_ptr<WebKit::WebScrollbarThemeGeometry>, int scrollLayerId);
+ static scoped_refptr<ScrollbarLayer> create(
+ scoped_ptr<WebKit::WebScrollbar>,
+ scoped_ptr<ScrollbarThemePainter>,
+ scoped_ptr<WebKit::WebScrollbarThemeGeometry>,
+ int scrollLayerId);
int scrollLayerId() const { return m_scrollLayerId; }
void setScrollLayerId(int id);
@@ -42,7 +46,11 @@ public:
virtual ScrollbarLayer* toScrollbarLayer() OVERRIDE;
protected:
- ScrollbarLayer(scoped_ptr<WebKit::WebScrollbar>, WebKit::WebScrollbarThemePainter, scoped_ptr<WebKit::WebScrollbarThemeGeometry>, int scrollLayerId);
+ ScrollbarLayer(
+ scoped_ptr<WebKit::WebScrollbar>,
+ scoped_ptr<ScrollbarThemePainter>,
+ scoped_ptr<WebKit::WebScrollbarThemeGeometry>,
+ int scrollLayerId);
virtual ~ScrollbarLayer();
private:
@@ -54,7 +62,7 @@ private:
float clampScaleToMaxTextureSize(float scale);
scoped_ptr<WebKit::WebScrollbar> m_scrollbar;
- WebKit::WebScrollbarThemePainter m_painter;
+ scoped_ptr<ScrollbarThemePainter> m_painter;
scoped_ptr<WebKit::WebScrollbarThemeGeometry> m_geometry;
int m_scrollLayerId;
« no previous file with comments | « cc/layer_unittest.cc ('k') | cc/scrollbar_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698