third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp - Issue 2808493002: [blink] Request compositing update when canvas hibernates/wakes up.

Unified Diff: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp

Issue 2808493002: [blink] Request compositing update when canvas hibernates/wakes up. (Closed)

Patch Set: trigger compositing update from Canvas2DLayerBridge instead Created 3 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp ('k') | third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp

diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp

index e7e93bf62585fa242e13541dbda58cf166b0f275..968c801725a0a02ee127ee596277dd15b7fe21ae 100644

--- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp

+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp

@@ -10,10 +10,13 @@

#include "core/dom/Document.h"

#include "core/frame/FrameView.h"

#include "core/frame/ImageBitmap.h"

+#include "core/frame/Settings.h"

#include "core/html/HTMLCanvasElement.h"

#include "core/html/ImageData.h"

#include "core/imagebitmap/ImageBitmapOptions.h"

+#include "core/layout/LayoutBoxModelObject.h"

#include "core/loader/EmptyClients.h"

+#include "core/paint/PaintLayer.h"

#include "core/testing/DummyPageHolder.h"

#include "modules/canvas2d/CanvasGradient.h"

#include "modules/canvas2d/CanvasPattern.h"

@@ -26,6 +29,8 @@

#include "platform/graphics/test/FakeGLES2Interface.h"

#include "platform/graphics/test/FakeWebGraphicsContext3DProvider.h"

#include "platform/loader/fetch/MemoryCache.h"

+#include "platform/testing/TestingPlatformSupport.h"

+#include "public/platform/scheduler/test/renderer_scheduler_test_support.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "third_party/skia/include/core/SkColorSpaceXform.h"

@@ -166,6 +171,9 @@ class CanvasRenderingContext2DTest : public ::testing::Test {

FakeImageSource opaque_bitmap_;

FakeImageSource alpha_bitmap_;

+ // Set this to override frame settings.

+ FrameSettingOverrideFunction override_settings_function_ = nullptr;

StringOrCanvasGradientOrCanvasPattern& OpaqueGradient() {

return wrap_gradients_->opaque_gradient_;

}

@@ -200,7 +208,8 @@ void CanvasRenderingContext2DTest::SetUp() {

Page::PageClients page_clients;

FillWithEmptyClients(page_clients);

dummy_page_holder_ =

- DummyPageHolder::Create(IntSize(800, 600), &page_clients);

+ DummyPageHolder::Create(IntSize(800, 600), &page_clients, nullptr,

+ override_settings_function_, nullptr);

document_ = &dummy_page_holder_->GetDocument();

document_->documentElement()->setInnerHTML(

"<body><canvas id='c'></canvas></body>");

@@ -1385,4 +1394,68 @@ TEST_F(CanvasRenderingContext2DTest, ImageBitmapColorSpaceConversion) {

color_correct_rendering_default_mode_runtime_flag);

}

+void OverrideScriptEnabled(Settings& settings) {

+ // Simulate that we allow scripts, so that HTMLCanvasElement uses

+ // LayoutHTMLCanvas.

+ settings.SetScriptEnabled(true);

+class CanvasRenderingContext2DTestWithTestingPlatform

+ : public CanvasRenderingContext2DTest {

+ protected:

+ void SetUp() override {

+ override_settings_function_ = &OverrideScriptEnabled;

+ platform_->AdvanceClockSeconds(1.); // For non-zero DocumentParserTimings.

+ CanvasRenderingContext2DTest::SetUp();

+ GetDocument().View()->GetLayout();

+ }

+ void RunUntilIdle() { platform_->RunUntilIdle(); }

+ ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>

+ platform_;

+};

+// https://crbug.com/708445: When the Canvas2DLayerBridge hibernates or wakes up

+// from hibernation, the compositing reasons for the canvas element may change.

+// In these cases, the element should request a compositing update.

+TEST_F(CanvasRenderingContext2DTestWithTestingPlatform,

+ ElementRequestsCompositingUpdateOnHibernateAndWakeUp) {

Eric Seckler 2017/04/11 07:32:59 The test seems to be failing on mac - is mac using

Eric Seckler 2017/04/11 07:40:32 Ah, there's CANVAS2D_HIBERNATION_ENABLED :) Test s

+ CreateContext(kNonOpaque);

+ FakeGLES2Interface gl;

+ std::unique_ptr<FakeWebGraphicsContext3DProvider> context_provider(

+ new FakeWebGraphicsContext3DProvider(&gl));

+ IntSize size(300, 300);

+ RefPtr<Canvas2DLayerBridge> bridge =

+ MakeBridge(std::move(context_provider), size,

+ Canvas2DLayerBridge::kEnableAcceleration);

+ // Force hibernatation to occur in an immediate task.

+ bridge->DontUseIdleSchedulingForTesting();

+ std::unique_ptr<Canvas2DImageBufferSurface> surface(

+ new Canvas2DImageBufferSurface(bridge, size));

+ CanvasElement().CreateImageBufferUsingSurfaceForTesting(std::move(surface));

+ EXPECT_TRUE(CanvasElement().Buffer()->IsAccelerated());

+ EXPECT_TRUE(CanvasElement().GetLayoutBoxModelObject());

+ PaintLayer* layer = CanvasElement().GetLayoutBoxModelObject()->Layer();

+ EXPECT_TRUE(layer);

+ GetDocument().View()->UpdateAllLifecyclePhases();

+ // Hide element to trigger hibernation.

+ GetDocument().GetPage()->SetVisibilityState(kPageVisibilityStateHidden,

+ false);

+ RunUntilIdle(); // Run hibernation task.

+ // Hibernation should cause compositing update.

+ EXPECT_TRUE(layer->NeedsCompositingInputsUpdate());

+ GetDocument().View()->UpdateAllLifecyclePhases();

+ EXPECT_FALSE(layer->NeedsCompositingInputsUpdate());

+ // Wake up again, which should request a compositing update synchronously.

+ GetDocument().GetPage()->SetVisibilityState(kPageVisibilityStateVisible,

+ false);

+ EXPECT_TRUE(layer->NeedsCompositingInputsUpdate());

} // namespace blink