diff options
author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-24 07:07:14 +0000 |
---|---|---|
committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-24 07:07:14 +0000 |
commit | 1fc9e80dab903b1dddf3b219c9f4fb45568e090b (patch) | |
tree | d52bbd48661fcd7b0ad2b6a3c08974443fe050cb /cc/test/fake_picture_layer.h | |
parent | f3d2b866af7d3fdebdfbe32ede60b8d1e2419625 (diff) | |
download | chromium_src-1fc9e80dab903b1dddf3b219c9f4fb45568e090b.zip chromium_src-1fc9e80dab903b1dddf3b219c9f4fb45568e090b.tar.gz chromium_src-1fc9e80dab903b1dddf3b219c9f4fb45568e090b.tar.bz2 |
Revert 213338 "cc: Allow the main thread to cancel commits"
Broke WebViewInteractiveTest.EditCommandsNoMenu on Mac
[1288:27139:0723/221703:FATAL:layer_impl.cc(286)] Check failed: TotalScrollOffset().y() <= max_scroll_offset_.y() (62 vs. 47)
> cc: Allow the main thread to cancel commits
>
> Add a new SetNeedsUpdateLayers that triggers the commit flow, but is
> abortable if update layers doesn't actually make any changes. This
> allows the main thread to abort a begin frame. This happens in the case
> of scroll updates from the compositor thread or invalidations.
>
> There was previously an abort begin frame call for when a visibility
> message and a begin frame message were posted simultaneously, but it
> incorrectly applied the scrolls and scales without informing the
> compositor thread that these had already been consumed. To fix this,
> the abort message passes back a boolean about whether or not the
> commit was aborted (and needed to be sent again) or was handled
> (and the scrolls and scales processed).
>
> To avoid a deluge of begin frames (in the commit sense) from the
> scheduler, the scheduler has been adjusted to wait until the next begin
> frame (in the vsync signal sense) so that these calls can be throttled.
> Otherwise, the scheduler will just keep trying to begin frame.
>
> R=brianderson@chromium.org, danakj@chromium.org
> BUG=256381
>
> Review URL: https://chromiumcodereview.appspot.com/19106007
TBR=enne@chromium.org
Review URL: https://codereview.chromium.org/19519019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/fake_picture_layer.h')
-rw-r--r-- | cc/test/fake_picture_layer.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/cc/test/fake_picture_layer.h b/cc/test/fake_picture_layer.h index 824ac6c..b5b81de 100644 --- a/cc/test/fake_picture_layer.h +++ b/cc/test/fake_picture_layer.h @@ -26,12 +26,9 @@ class FakePictureLayer : public PictureLayer { size_t push_properties_count() const { return push_properties_count_; } void reset_push_properties_count() { push_properties_count_ = 0; } - void set_always_update_resources(bool always_update_resources) { - always_update_resources_ = always_update_resources; - } - - virtual bool Update(ResourceUpdateQueue* queue, - const OcclusionTracker* occlusion) OVERRIDE; + virtual bool Update( + ResourceUpdateQueue* queue, + const OcclusionTracker* occlusion) OVERRIDE; virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE; @@ -41,7 +38,6 @@ class FakePictureLayer : public PictureLayer { size_t update_count_; size_t push_properties_count_; - bool always_update_resources_; }; } // namespace cc |