summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cc/input/pinch_zoom_scrollbar_painter.cc38
-rw-r--r--cc/input/pinch_zoom_scrollbar_painter.h31
-rw-r--r--cc/layers/scrollbar_theme_painter.h20
-rw-r--r--cc/test/fake_scrollbar_theme_painter.cc20
-rw-r--r--cc/test/fake_scrollbar_theme_painter.h32
-rw-r--r--webkit/compositor_bindings/web_to_ccscrollbar_theme_painter_adapter.cc20
-rw-r--r--webkit/compositor_bindings/web_to_ccscrollbar_theme_painter_adapter.h30
7 files changed, 85 insertions, 106 deletions
diff --git a/cc/input/pinch_zoom_scrollbar_painter.cc b/cc/input/pinch_zoom_scrollbar_painter.cc
index 8fc5278..147c867 100644
--- a/cc/input/pinch_zoom_scrollbar_painter.cc
+++ b/cc/input/pinch_zoom_scrollbar_painter.cc
@@ -12,53 +12,53 @@ namespace cc {
PinchZoomScrollbarPainter::~PinchZoomScrollbarPainter() {}
void PinchZoomScrollbarPainter::PaintScrollbarBackground(
- SkCanvas*,
- const gfx::Rect&) {
+ SkCanvas* canvas,
+ gfx::Rect rect) {
}
void PinchZoomScrollbarPainter::PaintTrackBackground(
- SkCanvas*,
- const gfx::Rect&) {
+ SkCanvas* canvas,
+ gfx::Rect rect) {
}
void PinchZoomScrollbarPainter::PaintBackTrackPart(
- SkCanvas*,
- const gfx::Rect&) {
+ SkCanvas* canvas,
+ gfx::Rect rect) {
}
void PinchZoomScrollbarPainter::PaintForwardTrackPart(
- SkCanvas*,
- const gfx::Rect&) {
+ SkCanvas* canvas,
+ gfx::Rect rect) {
}
void PinchZoomScrollbarPainter::PaintBackButtonStart(
- SkCanvas*,
- const gfx::Rect&) {
+ SkCanvas* canvas,
+ gfx::Rect rect) {
}
void PinchZoomScrollbarPainter::PaintBackButtonEnd(
- SkCanvas*,
- const gfx::Rect&) {
+ SkCanvas* canvas,
+ gfx::Rect rect) {
}
void PinchZoomScrollbarPainter::PaintForwardButtonStart(
- SkCanvas*,
- const gfx::Rect&) {
+ SkCanvas* canvas,
+ gfx::Rect rect) {
}
void PinchZoomScrollbarPainter::PaintForwardButtonEnd(
- SkCanvas*,
- const gfx::Rect&) {
+ SkCanvas* canvas,
+ gfx::Rect rect) {
}
void PinchZoomScrollbarPainter::PaintTickmarks(
- SkCanvas*,
- const gfx::Rect&) {
+ SkCanvas* canvas,
+ gfx::Rect rect) {
}
void PinchZoomScrollbarPainter::PaintThumb(
SkCanvas* canvas,
- const gfx::Rect& thumb_rect) {
+ gfx::Rect thumb_rect) {
canvas->clear(SkColorSetARGB(0, 0, 0, 0));
SkPaint paint;
diff --git a/cc/input/pinch_zoom_scrollbar_painter.h b/cc/input/pinch_zoom_scrollbar_painter.h
index 1a45678..1a70a748 100644
--- a/cc/input/pinch_zoom_scrollbar_painter.h
+++ b/cc/input/pinch_zoom_scrollbar_painter.h
@@ -15,25 +15,18 @@ class PinchZoomScrollbarPainter : public ScrollbarThemePainter {
PinchZoomScrollbarPainter() {}
virtual ~PinchZoomScrollbarPainter();
- virtual void PaintScrollbarBackground(
- SkCanvas* canvas, const gfx::Rect& rect) OVERRIDE;
- virtual void PaintTrackBackground(
- SkCanvas* canvas, const gfx::Rect& rect) OVERRIDE;
- virtual void PaintBackTrackPart(
- SkCanvas* canvas, const gfx::Rect& rect) OVERRIDE;
- virtual void PaintForwardTrackPart(
- SkCanvas* canvas, const gfx::Rect& rect) OVERRIDE;
- virtual void PaintBackButtonStart(
- SkCanvas* canvas, const gfx::Rect& rect) OVERRIDE;
- virtual void PaintBackButtonEnd(
- SkCanvas* canvas, const gfx::Rect& rect) OVERRIDE;
- virtual void PaintForwardButtonStart(
- SkCanvas* canvas, const gfx::Rect& rect) OVERRIDE;
- virtual void PaintForwardButtonEnd(
- SkCanvas* canvas, const gfx::Rect& rect) OVERRIDE;
- virtual void PaintTickmarks(
- SkCanvas* canvas, const gfx::Rect& rect) OVERRIDE;
- virtual void PaintThumb(SkCanvas* canvas, const gfx::Rect& rect) OVERRIDE;
+ virtual void PaintScrollbarBackground(SkCanvas* canvas,
+ gfx::Rect rect) OVERRIDE;
+ virtual void PaintTrackBackground(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
+ virtual void PaintBackTrackPart(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
+ virtual void PaintForwardTrackPart(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
+ virtual void PaintBackButtonStart(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
+ virtual void PaintBackButtonEnd(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
+ virtual void PaintForwardButtonStart(SkCanvas* canvas,
+ gfx::Rect rect) OVERRIDE;
+ virtual void PaintForwardButtonEnd(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
+ virtual void PaintTickmarks(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
+ virtual void PaintThumb(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
};
} // namespace cc
diff --git a/cc/layers/scrollbar_theme_painter.h b/cc/layers/scrollbar_theme_painter.h
index 50fec7e..f7553ac 100644
--- a/cc/layers/scrollbar_theme_painter.h
+++ b/cc/layers/scrollbar_theme_painter.h
@@ -19,16 +19,16 @@ class CC_EXPORT ScrollbarThemePainter {
public:
virtual ~ScrollbarThemePainter() {}
- virtual void PaintScrollbarBackground(SkCanvas*, const gfx::Rect&) = 0;
- virtual void PaintTrackBackground(SkCanvas*, const gfx::Rect&) = 0;
- virtual void PaintBackTrackPart(SkCanvas*, const gfx::Rect&) = 0;
- virtual void PaintForwardTrackPart(SkCanvas*, const gfx::Rect&) = 0;
- virtual void PaintBackButtonStart(SkCanvas*, const gfx::Rect&) = 0;
- virtual void PaintBackButtonEnd(SkCanvas*, const gfx::Rect&) = 0;
- virtual void PaintForwardButtonStart(SkCanvas*, const gfx::Rect&) = 0;
- virtual void PaintForwardButtonEnd(SkCanvas*, const gfx::Rect&) = 0;
- virtual void PaintTickmarks(SkCanvas*, const gfx::Rect&) = 0;
- virtual void PaintThumb(SkCanvas*, const gfx::Rect&) = 0;
+ virtual void PaintScrollbarBackground(SkCanvas* canvas, gfx::Rect rect) = 0;
+ virtual void PaintTrackBackground(SkCanvas* canvas, gfx::Rect rect) = 0;
+ virtual void PaintBackTrackPart(SkCanvas* canvas, gfx::Rect rect) = 0;
+ virtual void PaintForwardTrackPart(SkCanvas* canvas, gfx::Rect rect) = 0;
+ virtual void PaintBackButtonStart(SkCanvas* canvas, gfx::Rect rect) = 0;
+ virtual void PaintBackButtonEnd(SkCanvas* canvas, gfx::Rect rect) = 0;
+ virtual void PaintForwardButtonStart(SkCanvas* canvas, gfx::Rect rect) = 0;
+ virtual void PaintForwardButtonEnd(SkCanvas* canvas, gfx::Rect rect) = 0;
+ virtual void PaintTickmarks(SkCanvas* canvas, gfx::Rect rect) = 0;
+ virtual void PaintThumb(SkCanvas* canvas, gfx::Rect rect) = 0;
};
} // namespace cc
diff --git a/cc/test/fake_scrollbar_theme_painter.cc b/cc/test/fake_scrollbar_theme_painter.cc
index 19f97f8..b93cb2a 100644
--- a/cc/test/fake_scrollbar_theme_painter.cc
+++ b/cc/test/fake_scrollbar_theme_painter.cc
@@ -9,52 +9,52 @@
namespace cc {
void FakeScrollbarThemePainter::PaintScrollbarBackground(
- SkCanvas* canvas, const gfx::Rect& rect) {
+ SkCanvas* canvas, gfx::Rect rect) {
Paint(canvas, rect);
}
void FakeScrollbarThemePainter::PaintTrackBackground(
- SkCanvas* canvas, const gfx::Rect& rect) {
+ SkCanvas* canvas, gfx::Rect rect) {
Paint(canvas, rect);
}
void FakeScrollbarThemePainter::PaintBackTrackPart(
- SkCanvas* canvas, const gfx::Rect& rect) {
+ SkCanvas* canvas, gfx::Rect rect) {
Paint(canvas, rect);
}
void FakeScrollbarThemePainter::PaintForwardTrackPart(
- SkCanvas* canvas, const gfx::Rect& rect) {
+ SkCanvas* canvas, gfx::Rect rect) {
Paint(canvas, rect);
}
void FakeScrollbarThemePainter::PaintBackButtonStart(
- SkCanvas* canvas, const gfx::Rect& rect) {
+ SkCanvas* canvas, gfx::Rect rect) {
Paint(canvas, rect);
}
void FakeScrollbarThemePainter::PaintBackButtonEnd(
- SkCanvas* canvas, const gfx::Rect& rect) {
+ SkCanvas* canvas, gfx::Rect rect) {
Paint(canvas, rect);
}
void FakeScrollbarThemePainter::PaintForwardButtonStart(
- SkCanvas* canvas, const gfx::Rect& rect) {
+ SkCanvas* canvas, gfx::Rect rect) {
Paint(canvas, rect);
}
void FakeScrollbarThemePainter::PaintForwardButtonEnd(
- SkCanvas* canvas, const gfx::Rect& rect) {
+ SkCanvas* canvas, gfx::Rect rect) {
Paint(canvas, rect);
}
void FakeScrollbarThemePainter::PaintTickmarks(
- SkCanvas* canvas, const gfx::Rect& rect) {
+ SkCanvas* canvas, gfx::Rect rect) {
Paint(canvas, rect);
}
void FakeScrollbarThemePainter::PaintThumb(
- SkCanvas* canvas, const gfx::Rect& rect) {
+ SkCanvas* canvas, gfx::Rect rect) {
Paint(canvas, rect);
}
diff --git a/cc/test/fake_scrollbar_theme_painter.h b/cc/test/fake_scrollbar_theme_painter.h
index cb66fb4..9c44a38 100644
--- a/cc/test/fake_scrollbar_theme_painter.h
+++ b/cc/test/fake_scrollbar_theme_painter.h
@@ -18,26 +18,18 @@ class FakeScrollbarThemePainter : public ScrollbarThemePainter {
}
virtual ~FakeScrollbarThemePainter() {}
- virtual void PaintScrollbarBackground(SkCanvas* canvas, const gfx::Rect& rect)
- OVERRIDE;
- virtual void PaintTrackBackground(SkCanvas* canvas, const gfx::Rect& rect)
- OVERRIDE;
- virtual void PaintBackTrackPart(SkCanvas* canvas, const gfx::Rect& rect)
- OVERRIDE;
- virtual void PaintForwardTrackPart(SkCanvas* canvas, const gfx::Rect& rect)
- OVERRIDE;
- virtual void PaintBackButtonStart(SkCanvas* canvas, const gfx::Rect& rect)
- OVERRIDE;
- virtual void PaintBackButtonEnd(SkCanvas* canvas, const gfx::Rect& rect)
- OVERRIDE;
- virtual void PaintForwardButtonStart(SkCanvas* canvas, const gfx::Rect& rect)
- OVERRIDE;
- virtual void PaintForwardButtonEnd(SkCanvas* canvas, const gfx::Rect& rect)
- OVERRIDE;
- virtual void PaintTickmarks(SkCanvas* canvas, const gfx::Rect& rect)
- OVERRIDE;
- virtual void PaintThumb(SkCanvas* canvas, const gfx::Rect& rect)
- OVERRIDE;
+ virtual void PaintScrollbarBackground(SkCanvas* canvas,
+ gfx::Rect rect) OVERRIDE;
+ virtual void PaintTrackBackground(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
+ virtual void PaintBackTrackPart(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
+ virtual void PaintForwardTrackPart(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
+ virtual void PaintBackButtonStart(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
+ virtual void PaintBackButtonEnd(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
+ virtual void PaintForwardButtonStart(SkCanvas* canvas,
+ gfx::Rect rect) OVERRIDE;
+ virtual void PaintForwardButtonEnd(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
+ virtual void PaintTickmarks(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
+ virtual void PaintThumb(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
void set_paint(bool paint) { paint_ = paint; }
diff --git a/webkit/compositor_bindings/web_to_ccscrollbar_theme_painter_adapter.cc b/webkit/compositor_bindings/web_to_ccscrollbar_theme_painter_adapter.cc
index 38f267c..f9527d4 100644
--- a/webkit/compositor_bindings/web_to_ccscrollbar_theme_painter_adapter.cc
+++ b/webkit/compositor_bindings/web_to_ccscrollbar_theme_painter_adapter.cc
@@ -20,60 +20,60 @@ WebToCCScrollbarThemePainterAdapter::~WebToCCScrollbarThemePainterAdapter() {}
void WebToCCScrollbarThemePainterAdapter::PaintScrollbarBackground(
SkCanvas* canvas,
- const gfx::Rect& rect) {
+ gfx::Rect rect) {
painter_->paintScrollbarBackground(canvas, rect);
}
void WebToCCScrollbarThemePainterAdapter::PaintTrackBackground(
SkCanvas* canvas,
- const gfx::Rect& rect) {
+ gfx::Rect rect) {
painter_->paintTrackBackground(canvas, rect);
}
void WebToCCScrollbarThemePainterAdapter::PaintBackTrackPart(
SkCanvas* canvas,
- const gfx::Rect& rect) {
+ gfx::Rect rect) {
painter_->paintBackTrackPart(canvas, rect);
}
void WebToCCScrollbarThemePainterAdapter::PaintForwardTrackPart(
SkCanvas* canvas,
- const gfx::Rect& rect) {
+ gfx::Rect rect) {
painter_->paintForwardTrackPart(canvas, rect);
}
void WebToCCScrollbarThemePainterAdapter::PaintBackButtonStart(
SkCanvas* canvas,
- const gfx::Rect& rect) {
+ gfx::Rect rect) {
painter_->paintBackButtonStart(canvas, rect);
}
void WebToCCScrollbarThemePainterAdapter::PaintBackButtonEnd(
SkCanvas* canvas,
- const gfx::Rect& rect) {
+ gfx::Rect rect) {
painter_->paintBackButtonEnd(canvas, rect);
}
void WebToCCScrollbarThemePainterAdapter::PaintForwardButtonStart(
SkCanvas* canvas,
- const gfx::Rect& rect) {
+ gfx::Rect rect) {
painter_->paintForwardButtonStart(canvas, rect);
}
void WebToCCScrollbarThemePainterAdapter::PaintForwardButtonEnd(
SkCanvas* canvas,
- const gfx::Rect& rect) {
+ gfx::Rect rect) {
painter_->paintForwardButtonEnd(canvas, rect);
}
void WebToCCScrollbarThemePainterAdapter::PaintTickmarks(
SkCanvas* canvas,
- const gfx::Rect& rect) {
+ gfx::Rect rect) {
painter_->paintTickmarks(canvas, rect);
}
void WebToCCScrollbarThemePainterAdapter::PaintThumb(SkCanvas* canvas,
- const gfx::Rect& rect) {
+ gfx::Rect rect) {
painter_->paintThumb(canvas, rect);
}
diff --git a/webkit/compositor_bindings/web_to_ccscrollbar_theme_painter_adapter.h b/webkit/compositor_bindings/web_to_ccscrollbar_theme_painter_adapter.h
index c763464..bfbfc20 100644
--- a/webkit/compositor_bindings/web_to_ccscrollbar_theme_painter_adapter.h
+++ b/webkit/compositor_bindings/web_to_ccscrollbar_theme_painter_adapter.h
@@ -21,24 +21,18 @@ class WebToCCScrollbarThemePainterAdapter : public cc::ScrollbarThemePainter {
}
virtual ~WebToCCScrollbarThemePainterAdapter();
- virtual void PaintScrollbarBackground(SkCanvas* canvas, const gfx::Rect& rect)
- OVERRIDE;
- virtual void PaintTrackBackground(SkCanvas* canvas, const gfx::Rect& rect)
- OVERRIDE;
- virtual void PaintBackTrackPart(SkCanvas* canvas, const gfx::Rect& rect)
- OVERRIDE;
- virtual void PaintForwardTrackPart(SkCanvas* canvas, const gfx::Rect& rect)
- OVERRIDE;
- virtual void PaintBackButtonStart(SkCanvas* canvas, const gfx::Rect& rect)
- OVERRIDE;
- virtual void PaintBackButtonEnd(SkCanvas* canvas, const gfx::Rect& rect)
- OVERRIDE;
- virtual void PaintForwardButtonStart(SkCanvas* canvas, const gfx::Rect& rect)
- OVERRIDE;
- virtual void PaintForwardButtonEnd(SkCanvas* canvas, const gfx::Rect& rect)
- OVERRIDE;
- virtual void PaintTickmarks(SkCanvas* canvas, const gfx::Rect& rect) OVERRIDE;
- virtual void PaintThumb(SkCanvas* canvas, const gfx::Rect& rect) OVERRIDE;
+ virtual void PaintScrollbarBackground(SkCanvas* canvas,
+ gfx::Rect rect) OVERRIDE;
+ virtual void PaintTrackBackground(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
+ virtual void PaintBackTrackPart(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
+ virtual void PaintForwardTrackPart(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
+ virtual void PaintBackButtonStart(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
+ virtual void PaintBackButtonEnd(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
+ virtual void PaintForwardButtonStart(SkCanvas* canvas, gfx::Rect rect)
+ OVERRIDE;
+ virtual void PaintForwardButtonEnd(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
+ virtual void PaintTickmarks(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
+ virtual void PaintThumb(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
private:
explicit WebToCCScrollbarThemePainterAdapter(
generated by cgit v1.1 at 2025-02-11 00:38:38 +0000