Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1741)

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

Issue 1058403002: Revert of Refactor frame navigation/detach state cleanup to be more sane. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 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
Download patch
« no previous file with comments | « Source/web/tests/WebFrameTest.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/tests/WebViewTest.cpp
diff --git a/Source/web/tests/WebViewTest.cpp b/Source/web/tests/WebViewTest.cpp
index c23261df002ea70ffe947c29c9e1f2a04e12d169..6fdc756c6e15722f85ae5053fd9ed6cc1b749837 100644
--- a/Source/web/tests/WebViewTest.cpp
+++ b/Source/web/tests/WebViewTest.cpp
@@ -304,20 +304,14 @@
EXPECT_EQ(kTransparent, webView->backgroundColor());
LocalFrame* frame = webView->mainFrameImpl()->frame();
- // The prepareForDestruction() and prepareForDetach() calls are a hack to
- // prevent createView() from violating invariants about frame state during
- // navigation/detach.
- frame->document()->prepareForDestruction();
// Creating a new frame view with the background color having 0 alpha.
frame->createView(IntSize(1024, 768), Color::transparent, true);
EXPECT_EQ(kTransparent, frame->view()->baseBackgroundColor());
- frame->view()->prepareForDetach();
Color kTransparentRed(100, 0, 0, 0);
frame->createView(IntSize(1024, 768), kTransparentRed, true);
EXPECT_EQ(kTransparentRed, frame->view()->baseBackgroundColor());
- frame->view()->prepareForDetach();
}
TEST_F(WebViewTest, SetBaseBackgroundColorBeforeMainFrame)
« no previous file with comments | « Source/web/tests/WebFrameTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698