Source/web/tests/DocumentLoadingRenderingTest.cpp - Issue 1316673009: Revert of Add a FOUC painting test.

Unified Diff: Source/web/tests/DocumentLoadingRenderingTest.cpp

Issue 1316673009: Revert of Add a FOUC painting test. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 5 years, 3 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

Index: Source/web/tests/DocumentLoadingRenderingTest.cpp

diff --git a/Source/web/tests/DocumentLoadingRenderingTest.cpp b/Source/web/tests/DocumentLoadingRenderingTest.cpp

index 739986e136e86236e39d0cd3d3cbf2b0ad96de8b..fae191b38175c3994175cb935eb665b993c74fff 100644

--- a/Source/web/tests/DocumentLoadingRenderingTest.cpp

+++ b/Source/web/tests/DocumentLoadingRenderingTest.cpp

@@ -5,10 +5,9 @@

#include "config.h"

#include "core/dom/Document.h"

-#include "core/frame/FrameView.h"

+#include "core/page/Page.h"

#include "web/WebLocalFrameImpl.h"

#include "web/tests/FrameTestHelpers.h"

-#include "web/tests/sim/SimCompositor.h"

#include "web/tests/sim/SimLayerTreeView.h"

#include "web/tests/sim/SimNetwork.h"

#include "web/tests/sim/SimRequest.h"

@@ -21,16 +20,14 @@

protected:

DocumentLoadingRenderingTest()

: m_webViewClient(m_layerTreeView)

- , m_compositor(m_layerTreeView)

{

m_webViewHelper.initialize(true, nullptr, &m_webViewClient);

- m_compositor.setWebViewImpl(webView());

- Document::setThreadedParsingEnabledForTesting(false);

+ Document::setThreadedParsingEnabledForUnitTestsOnly(false);

}

virtual ~DocumentLoadingRenderingTest()

{

- Document::setThreadedParsingEnabledForTesting(true);

+ Document::setThreadedParsingEnabledForUnitTestsOnly(true);

}

void loadURL(const String& url)

@@ -38,23 +35,14 @@

WebURLRequest request;

request.initialize();

request.setURL(KURL(ParsedURLString, url));

- webView().mainFrameImpl()->loadRequest(request);

+ m_webViewHelper.webViewImpl()->mainFrameImpl()->loadRequest(request);

}

- Document& document()

- {

- return *webView().mainFrameImpl()->frame()->document();

- }

- WebViewImpl& webView()

- {

- return *m_webViewHelper.webViewImpl();

- }

+ Document& document() { return *toLocalFrame(m_webViewHelper.webViewImpl()->page()->mainFrame())->document(); }

SimNetwork m_network;

SimLayerTreeView m_layerTreeView;

SimWebViewClient m_webViewClient;

- SimCompositor m_compositor;

FrameTestHelpers::WebViewHelper m_webViewHelper;

};

@@ -212,71 +200,4 @@

EXPECT_TRUE(m_layerTreeView.needsAnimate());

}

-TEST_F(DocumentLoadingRenderingTest, ShouldNotPaintIframeContentWithPendingSheets)

- SimRequest mainResource("https://example.com/test.html", "text/html");

- SimRequest frameResource("https://example.com/frame.html", "text/html");

- SimRequest cssResource("https://example.com/test.css", "text/css");

- loadURL("https://example.com/test.html");

- webView().resize(WebSize(800, 600));

- mainResource.start();

- mainResource.write(

- "<!DOCTYPE html>"

- "<iframe src=frame.html></iframe>"

- "<p style='transform: translateZ(0)'>Hello World</p>"

- );

- mainResource.finish();

- // Main page is ready to begin painting as there's no pending sheets.

- // The frame is not yet loaded, so we only paint the top level page.

- auto frame1 = m_compositor.beginFrame();

- EXPECT_TRUE(frame1.didDrawText);

- frameResource.start();

- frameResource.write(

- "<!DOCTYPE html>"

- "<style>html { background: pink }</style>"

- "<link rel=stylesheet href=test.css>"

- "<p style='background: yellow'>Hello World</p>"

- "<div style='transform: translateZ(0); background: green;'>"

- " <p style='background: blue'>Hello Layer</p>"

- " <div style='position: relative; background: red;'>Hello World</div>"

- "</div>"

- );

- frameResource.finish();

- // Trigger a layout with pending sheets. For example a page could trigger

- // this by doing offsetTop in a setTimeout, or by a parent frame executing

- // script that touched offsetTop in the child frame.

- LocalFrame* childFrame = toLocalFrame(document().frame()->tree().firstChild());

- childFrame->document()->updateLayoutIgnorePendingStylesheets();

- auto frame2 = m_compositor.beginFrame();

- // The child frame still has pending sheets, and the parent frame has no

- // invalid paint so we shouldn't draw any text.

- EXPECT_FALSE(frame2.didDrawText);

- // One per DeprecatedPaintLayer, 2 in the main frame and 3 in the iframe = 5.

- // 1 for the background of the iframe.

- // 1 for the background of the composited transform layer.

- // TODO(esprehn): Why FOUC the background (borders, etc.) of iframes and

- // composited layers? Seems like a bug.

- EXPECT_EQ(7, frame2.drawCount);

- // Finish loading the sheets in the child frame. After it should issue a

- // paint invalidation for every layer since frame2 painted them but skipped

- // painting the real content to avoid FOUC.

- cssResource.start();

- cssResource.finish();

- // First frame where all frames are loaded, should paint the text in the

- // child frame.

- auto frame3 = m_compositor.beginFrame();

- EXPECT_TRUE(frame3.didDrawText);

} // namespace blink

« no previous file with comments | « Source/platform/graphics/GraphicsLayer.cpp ('k') | Source/web/tests/sim/SimCompositor.h » ('j') | no next file with comments »