summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-21 05:51:52 +0000
committerboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-21 05:51:52 +0000
commitdb7fdea746abd745646ec4bd5b90fff0ce9c6888 (patch)
tree8f03e2fd9c85d160d86909160f05d29388e5395c /content
parent4ff653775e0ac6d004c5fd7271506c822256f822 (diff)
downloadchromium_src-db7fdea746abd745646ec4bd5b90fff0ce9c6888.zip
chromium_src-db7fdea746abd745646ec4bd5b90fff0ce9c6888.tar.gz
chromium_src-db7fdea746abd745646ec4bd5b90fff0ce9c6888.tar.bz2
Disable retroactive begin frame for synchronous compositor
Android WebView can only draw when the system asks us to draw. So it is incorrect to perform retroactive begin frames. BUG= NOTRY=true Review URL: https://chromiumcodereview.appspot.com/17520002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207723 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/android/in_process/synchronous_compositor_output_surface.cc5
-rw-r--r--content/browser/android/in_process/synchronous_compositor_output_surface.h3
2 files changed, 8 insertions, 0 deletions
diff --git a/content/browser/android/in_process/synchronous_compositor_output_surface.cc b/content/browser/android/in_process/synchronous_compositor_output_surface.cc
index ec8e6a3..38bf88b3 100644
--- a/content/browser/android/in_process/synchronous_compositor_output_surface.cc
+++ b/content/browser/android/in_process/synchronous_compositor_output_surface.cc
@@ -227,6 +227,11 @@ void SynchronousCompositorOutputSurface::InvokeComposite(
OnSwapBuffersComplete(NULL);
}
+void SynchronousCompositorOutputSurface::PostCheckForRetroactiveBeginFrame() {
+ // Synchronous compositor cannot perform retroactive begin frames, so
+ // intentionally no-op here.
+}
+
// Not using base::NonThreadSafe as we want to enforce a more exacting threading
// requirement: SynchronousCompositorOutputSurface() must only be used on the UI
// thread.
diff --git a/content/browser/android/in_process/synchronous_compositor_output_surface.h b/content/browser/android/in_process/synchronous_compositor_output_surface.h
index dabed4b..91ebca5 100644
--- a/content/browser/android/in_process/synchronous_compositor_output_surface.h
+++ b/content/browser/android/in_process/synchronous_compositor_output_surface.h
@@ -68,6 +68,9 @@ class SynchronousCompositorOutputSurface
class SoftwareDevice;
friend class SoftwareDevice;
+ // Private OutputSurface overrides.
+ virtual void PostCheckForRetroactiveBeginFrame() OVERRIDE;
+
void InvokeComposite(gfx::Size damage_size);
void UpdateCompositorClientSettings();
void NotifyCompositorSettingsChanged();