diff options
| author | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-25 23:51:41 +0000 |
|---|---|---|
| committer | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-25 23:51:41 +0000 |
| commit | 11a3256248f424b9ec9c38029980e2c85b94841d (patch) | |
| tree | 34eccd36cbdfd47f857b1ad611f68ab3dbd3221b | |
| parent | 73b2d1e7a4295fcb920f54a55895f914882ef02f (diff) | |
| download | chromium_src-11a3256248f424b9ec9c38029980e2c85b94841d.zip chromium_src-11a3256248f424b9ec9c38029980e2c85b94841d.tar.gz chromium_src-11a3256248f424b9ec9c38029980e2c85b94841d.tar.bz2 | |
3d side of a 3-sided patch
Remove the ifdef's introduced in https://crrev.com/347053005/
R=piman@chromium.org
BUG=None
Review URL: https://codereview.chromium.org/339523010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279862 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/renderer/pepper/pepper_plugin_instance_impl.cc | 4 | ||||
| -rw-r--r-- | content/renderer/render_widget_fullscreen_pepper.cc | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc index c12c99f..400fb1e 100644 --- a/content/renderer/pepper/pepper_plugin_instance_impl.cc +++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc @@ -756,11 +756,7 @@ void PepperPluginInstanceImpl::ScrollRect(int dx, fullscreen_container_->ScrollRect(dx, dy, rect); } else { if (full_frame_ && !IsViewAccelerated()) { -#ifdef SCROLL_RECT_REQUIRES_NO_DELTA container_->scrollRect(rect); -#else - container_->scrollRect(dx, dy, rect); -#endif } else { // Can't do optimized scrolling since there could be other elements on top // of us or the view renders via the accelerated compositor which is diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc index 258775d..572a261 100644 --- a/content/renderer/render_widget_fullscreen_pepper.cc +++ b/content/renderer/render_widget_fullscreen_pepper.cc @@ -300,10 +300,6 @@ void RenderWidgetFullscreenPepper::InvalidateRect(const blink::WebRect& rect) { void RenderWidgetFullscreenPepper::ScrollRect( int dx, int dy, const blink::WebRect& rect) { -#ifdef DID_SCROLL_RECT_DOES_NOT_EXIST -#else - didScrollRect(dx, dy, rect); -#endif } void RenderWidgetFullscreenPepper::Destroy() { |