| commit | e819b6203c5314f65c08af6636eda45cf27b7441 | [log] [tgz] |
|---|---|---|
| author | danakj <[email protected]> | Tue May 01 20:27:14 2018 |
| committer | Commit Bot <[email protected]> | Tue May 01 20:27:14 2018 |
| tree | 7c37ad43ced318ff4beadd086af04abfceaa90bf | |
| parent | 29b2191d64f527e3e43193b5a43ee0777894ddf9 [diff] [blame] |
Remove WebColor and WebOverscrollBehavior Use the SkColor and cc::OverscrollBehavior types directly. One more step toward making WebLayer useless so it can go away. [email protected], [email protected], [email protected] [email protected] Bug: 738465 Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2 Change-Id: I78883c407cc42df815eecdf98d5804fc6cf16c5a Reviewed-on: https://chromium-review.googlesource.com/1033436 Reviewed-by: danakj <[email protected]> Reviewed-by: Luke Halliwell <[email protected]> Reviewed-by: Antoine Labour <[email protected]> Reviewed-by: Jeremy Roman <[email protected]> Reviewed-by: Philip Rogers <[email protected]> Commit-Queue: danakj <[email protected]> Cr-Commit-Position: refs/heads/master@{#555169}
diff --git a/content/renderer/gpu/render_widget_compositor.h b/content/renderer/gpu/render_widget_compositor.h index f71d4f2..38936b8d 100644 --- a/content/renderer/gpu/render_widget_compositor.h +++ b/content/renderer/gpu/render_widget_compositor.h
@@ -135,7 +135,7 @@ blink::WebSize GetViewportSize() const override; virtual blink::WebFloatPoint adjustEventPointForPinchZoom( const blink::WebFloatPoint& point) const; - void SetBackgroundColor(blink::WebColor color) override; + void SetBackgroundColor(SkColor color) override; void SetVisible(bool visible) override; void SetPageScaleFactorAndLimits(float page_scale_factor, float minimum, @@ -185,7 +185,7 @@ void RequestDecode(const PaintImage& image, base::OnceCallback<void(bool)> callback) override; - void SetOverscrollBehavior(const blink::WebOverscrollBehavior&) override; + void SetOverscrollBehavior(const cc::OverscrollBehavior&) override; // cc::LayerTreeHostClient implementation. void WillBeginMainFrame() override;