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.cc | |
| 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.cc')
| -rw-r--r-- | cc/test/fake_picture_layer.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cc/test/fake_picture_layer.cc b/cc/test/fake_picture_layer.cc index 69292c3..997197c 100644 --- a/cc/test/fake_picture_layer.cc +++ b/cc/test/fake_picture_layer.cc @@ -11,8 +11,7 @@ namespace cc { FakePictureLayer::FakePictureLayer(ContentLayerClient* client) : PictureLayer(client), update_count_(0), - push_properties_count_(0), - always_update_resources_(false) { + push_properties_count_(0) { SetAnchorPoint(gfx::PointF(0.f, 0.f)); SetBounds(gfx::Size(1, 1)); SetIsDrawable(true); @@ -29,7 +28,7 @@ bool FakePictureLayer::Update(ResourceUpdateQueue* queue, const OcclusionTracker* occlusion) { bool updated = PictureLayer::Update(queue, occlusion); update_count_++; - return updated || always_update_resources_; + return updated; } void FakePictureLayer::PushPropertiesTo(LayerImpl* layer) { |