diff options
author | ccameron <ccameron@chromium.org> | 2015-01-21 18:20:20 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-22 02:21:02 +0000 |
commit | cbcd8ee26310f2e9a3be4395362a9be1c490c897 (patch) | |
tree | 2490e42426e8091ae7d58bd52cda2b37e0c87b91 /content | |
parent | 17363ead10ac73d2a2fee92480a65b58962471b9 (diff) | |
download | chromium_src-cbcd8ee26310f2e9a3be4395362a9be1c490c897.zip chromium_src-cbcd8ee26310f2e9a3be4395362a9be1c490c897.tar.gz chromium_src-cbcd8ee26310f2e9a3be4395362a9be1c490c897.tar.bz2 |
Remove support for custom overscroll background
Mac was the only platform to do this, and more recent versions
of the OS do not support it anymore. Callers to these functions
have been removed from the Blink side.
BUG=248742
Review URL: https://codereview.chromium.org/838603002
Cr-Commit-Position: refs/heads/master@{#312529}
Diffstat (limited to 'content')
-rw-r--r-- | content/app/resources/content_resources.grd | 2 | ||||
-rw-r--r-- | content/app/resources/default_100_percent/overhang_pattern.png | bin | 20057 -> 0 bytes | |||
-rw-r--r-- | content/app/resources/default_100_percent/overhang_shadow.png | bin | 151 -> 0 bytes | |||
-rw-r--r-- | content/child/blink_platform_impl.cc | 4 | ||||
-rw-r--r-- | content/renderer/gpu/render_widget_compositor.cc | 4 | ||||
-rw-r--r-- | content/renderer/gpu/render_widget_compositor.h | 1 |
6 files changed, 0 insertions, 11 deletions
diff --git a/content/app/resources/content_resources.grd b/content/app/resources/content_resources.grd index 9c4373b..d451858 100644 --- a/content/app/resources/content_resources.grd +++ b/content/app/resources/content_resources.grd @@ -50,8 +50,6 @@ <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF" file="mediaplayer_overlay_cast_off.png" /> <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON" file="mediaplayer_overlay_play.png" /> <if expr="is_macosx"> - <structure type="chrome_scaled_image" name="IDR_OVERHANG_PATTERN" file="overhang_pattern.png" /> - <structure type="chrome_scaled_image" name="IDR_OVERHANG_SHADOW" file="overhang_shadow.png" /> <structure type="chrome_scaled_image" name="IDR_ALIAS_CURSOR" file="alias_cursor.png" /> <structure type="chrome_scaled_image" name="IDR_CELL_CURSOR" file="cell_cursor.png" /> <structure type="chrome_scaled_image" name="IDR_EAST_RESIZE_CURSOR" file="east_resize_cursor.png" /> diff --git a/content/app/resources/default_100_percent/overhang_pattern.png b/content/app/resources/default_100_percent/overhang_pattern.png Binary files differdeleted file mode 100644 index 838e87c..0000000 --- a/content/app/resources/default_100_percent/overhang_pattern.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/overhang_shadow.png b/content/app/resources/default_100_percent/overhang_shadow.png Binary files differdeleted file mode 100644 index 4e0fc4b..0000000 --- a/content/app/resources/default_100_percent/overhang_shadow.png +++ /dev/null diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc index e0f565e..e0ef4c9 100644 --- a/content/child/blink_platform_impl.cc +++ b/content/child/blink_platform_impl.cc @@ -808,10 +808,6 @@ const DataResource kDataResources[] = { IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF, ui::SCALE_FACTOR_100P }, { "mediaplayerOverlayPlay", IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, ui::SCALE_FACTOR_100P }, -#if defined(OS_MACOSX) - { "overhangPattern", IDR_OVERHANG_PATTERN, ui::SCALE_FACTOR_100P }, - { "overhangShadow", IDR_OVERHANG_SHADOW, ui::SCALE_FACTOR_100P }, -#endif { "panIcon", IDR_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P }, { "searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P }, { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P }, diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc index 51cf48e..2b645e8 100644 --- a/content/renderer/gpu/render_widget_compositor.cc +++ b/content/renderer/gpu/render_widget_compositor.cc @@ -583,10 +583,6 @@ void RenderWidgetCompositor::setHasTransparentBackground(bool transparent) { layer_tree_host_->set_has_transparent_background(transparent); } -void RenderWidgetCompositor::setOverhangBitmap(const SkBitmap& bitmap) { - layer_tree_host_->SetOverhangBitmap(bitmap); -} - void RenderWidgetCompositor::setVisible(bool visible) { layer_tree_host_->SetVisible(visible); } diff --git a/content/renderer/gpu/render_widget_compositor.h b/content/renderer/gpu/render_widget_compositor.h index c36a945..d877e2b 100644 --- a/content/renderer/gpu/render_widget_compositor.h +++ b/content/renderer/gpu/render_widget_compositor.h @@ -98,7 +98,6 @@ class CONTENT_EXPORT RenderWidgetCompositor virtual float deviceScaleFactor() const; virtual void setBackgroundColor(blink::WebColor color); virtual void setHasTransparentBackground(bool transparent); - virtual void setOverhangBitmap(const SkBitmap& bitmap); virtual void setVisible(bool visible); virtual void setPageScaleFactorAndLimits(float page_scale_factor, float minimum, |