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

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

Issue 23506013: Make the embedder responsible for creating the WebFrame (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix lifetime on frame detach Created 7 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
Download patch
« no previous file with comments | « Source/web/tests/ProgrammaticScrollTest.cpp ('k') | Source/web/tests/RenderTableCellTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/tests/RenderLayerBackingTest.cpp
diff --git a/Source/web/tests/RenderLayerBackingTest.cpp b/Source/web/tests/RenderLayerBackingTest.cpp
index f2e59f83b5f39780819b963569d93d04e630eaa6..ecbf186770b1ef42b91f1036ad19c83c9ba9d047 100644
--- a/Source/web/tests/RenderLayerBackingTest.cpp
+++ b/Source/web/tests/RenderLayerBackingTest.cpp
@@ -75,6 +75,7 @@ public:
{
// We cannot reuse FrameTestHelpers::createWebViewAndLoad here because the compositing
// settings need to be set before the page is loaded.
+ m_mainFrame = WebFrame::create(&m_mockWebFrameClient);
m_webViewImpl = toWebViewImpl(WebView::create(&m_mockWebViewClient));
m_webViewImpl->settings()->setForceCompositingMode(true);
m_webViewImpl->settings()->setAcceleratedCompositingEnabled(true);
@@ -83,7 +84,7 @@ public:
m_webViewImpl->settings()->setAcceleratedCompositingForScrollableFramesEnabled(true);
m_webViewImpl->settings()->setCompositedScrollingForFramesEnabled(true);
m_webViewImpl->settings()->setFixedPositionCreatesStackingContext(true);
- m_webViewImpl->initializeMainFrame(&m_mockWebFrameClient);
+ m_webViewImpl->setMainFrame(m_mainFrame);
m_webViewImpl->resize(IntSize(320, 240));
}
@@ -91,6 +92,7 @@ public:
{
Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
m_webViewImpl->close();
+ m_mainFrame->close();
}
void navigateTo(const std::string& url)
@@ -109,6 +111,7 @@ protected:
MockWebFrameClient m_mockWebFrameClient;
MockWebViewClient m_mockWebViewClient;
WebViewImpl* m_webViewImpl;
+ WebFrame* m_mainFrame;
};
TEST_F(RenderLayerBackingTest, DISABLED_GraphicsLayerBackgroundColor)
« no previous file with comments | « Source/web/tests/ProgrammaticScrollTest.cpp ('k') | Source/web/tests/RenderTableCellTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698