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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutTestHelper.cpp

Issue 1616183002: Don't composite layers with an invisible frameview. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add test expectation. Created 4 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/layout/LayoutTestHelper.h" 5 #include "core/layout/LayoutTestHelper.h"
6 6
7 #include "core/frame/FrameHost.h" 7 #include "core/frame/FrameHost.h"
8 #include "core/html/HTMLIFrameElement.h" 8 #include "core/html/HTMLIFrameElement.h"
9 #include "platform/graphics/test/FakeGraphicsLayerFactory.h" 9 #include "platform/graphics/test/FakeGraphicsLayerFactory.h"
10 #include "platform/scroll/ScrollbarTheme.h" 10 #include "platform/scroll/ScrollbarTheme.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 } 60 }
61 61
62 Document& RenderingTest::setupChildIframe(const AtomicString& iframeElementId, c onst String& htmlContentOfIframe) 62 Document& RenderingTest::setupChildIframe(const AtomicString& iframeElementId, c onst String& htmlContentOfIframe)
63 { 63 {
64 64
65 HTMLIFrameElement& iframe = *toHTMLIFrameElement(document().getElementById(i frameElementId)); 65 HTMLIFrameElement& iframe = *toHTMLIFrameElement(document().getElementById(i frameElementId));
66 m_frameLoaderClient = FrameLoaderClientWithParent::create(document().frame() ); 66 m_frameLoaderClient = FrameLoaderClientWithParent::create(document().frame() );
67 m_subframe = LocalFrame::create(m_frameLoaderClient.get(), document().frame( )->host(), &iframe); 67 m_subframe = LocalFrame::create(m_frameLoaderClient.get(), document().frame( )->host(), &iframe);
68 m_subframe->setView(FrameView::create(m_subframe.get(), IntSize(500, 500))); 68 m_subframe->setView(FrameView::create(m_subframe.get(), IntSize(500, 500)));
69 m_subframe->init(); 69 m_subframe->init();
70 m_subframe->view()->setParentVisible(true);
71 m_subframe->view()->setSelfVisible(true);
70 static_cast<SingleChildFrameLoaderClient*>(document().frame()->client())->se tChild(m_subframe.get()); 72 static_cast<SingleChildFrameLoaderClient*>(document().frame()->client())->se tChild(m_subframe.get());
71 document().frame()->host()->incrementSubframeCount(); 73 document().frame()->host()->incrementSubframeCount();
72 Document& frameDocument = *iframe.contentDocument(); 74 Document& frameDocument = *iframe.contentDocument();
73 75
74 frameDocument.setBaseURLOverride(KURL(ParsedURLString, "http://test.com")); 76 frameDocument.setBaseURLOverride(KURL(ParsedURLString, "http://test.com"));
75 frameDocument.body()->setInnerHTML(htmlContentOfIframe, ASSERT_NO_EXCEPTION) ; 77 frameDocument.body()->setInnerHTML(htmlContentOfIframe, ASSERT_NO_EXCEPTION) ;
76 return frameDocument; 78 return frameDocument;
77 } 79 }
78 80
79 } // namespace blink 81 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698