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

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

Issue 2762423003: Made Frame constructors (and subclasses) take Page& instead of Page* (Closed)
Patch Set: Rebase Created 3 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 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 "bindings/core/v8/StringOrArrayBufferOrArrayBufferView.h" 7 #include "bindings/core/v8/StringOrArrayBufferOrArrayBufferView.h"
8 #include "core/css/FontFaceDescriptors.h" 8 #include "core/css/FontFaceDescriptors.h"
9 #include "core/css/FontFaceSet.h" 9 #include "core/css/FontFaceSet.h"
10 #include "core/dom/DOMArrayBuffer.h" 10 #include "core/dom/DOMArrayBuffer.h"
11 #include "core/frame/FrameHost.h" 11 #include "core/frame/FrameHost.h"
12 #include "core/html/HTMLIFrameElement.h" 12 #include "core/html/HTMLIFrameElement.h"
13 #include "platform/loader/fetch/MemoryCache.h" 13 #include "platform/loader/fetch/MemoryCache.h"
14 #include "platform/scroll/ScrollbarTheme.h" 14 #include "platform/scroll/ScrollbarTheme.h"
15 #include "platform/testing/UnitTestHelpers.h" 15 #include "platform/testing/UnitTestHelpers.h"
16 16
17 namespace blink { 17 namespace blink {
18 18
19 LocalFrame* SingleChildLocalFrameClient::createFrame( 19 LocalFrame* SingleChildLocalFrameClient::createFrame(
20 const FrameLoadRequest&, 20 const FrameLoadRequest&,
21 const AtomicString& name, 21 const AtomicString& name,
22 HTMLFrameOwnerElement* ownerElement) { 22 HTMLFrameOwnerElement* ownerElement) {
23 DCHECK(!m_child) << "This test helper only supports one child frame."; 23 DCHECK(!m_child) << "This test helper only supports one child frame.";
24 24
25 LocalFrame* parentFrame = ownerElement->document().frame(); 25 LocalFrame* parentFrame = ownerElement->document().frame();
26 auto* childClient = LocalFrameClientWithParent::create(parentFrame); 26 auto* childClient = LocalFrameClientWithParent::create(parentFrame);
27 m_child = LocalFrame::create(childClient, parentFrame->page(), ownerElement); 27 m_child = LocalFrame::create(childClient, *parentFrame->page(), ownerElement);
28 m_child->createView(IntSize(500, 500), Color(), true /* transparent */); 28 m_child->createView(IntSize(500, 500), Color(), true /* transparent */);
29 m_child->init(); 29 m_child->init();
30 30
31 return m_child.get(); 31 return m_child.get();
32 } 32 }
33 33
34 void LocalFrameClientWithParent::detached(FrameDetachType) { 34 void LocalFrameClientWithParent::detached(FrameDetachType) {
35 static_cast<SingleChildLocalFrameClient*>(parent()->client()) 35 static_cast<SingleChildLocalFrameClient*>(parent()->client())
36 ->didDetachChild(); 36 ->didDetachChild();
37 } 37 }
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 FontFace* ahem = 85 FontFace* ahem =
86 FontFace::create(&document(), "Ahem", buffer, FontFaceDescriptors()); 86 FontFace::create(&document(), "Ahem", buffer, FontFaceDescriptors());
87 87
88 ScriptState* scriptState = ScriptState::forMainWorld(&m_pageHolder->frame()); 88 ScriptState* scriptState = ScriptState::forMainWorld(&m_pageHolder->frame());
89 DummyExceptionStateForTesting exceptionState; 89 DummyExceptionStateForTesting exceptionState;
90 FontFaceSet::from(document()) 90 FontFaceSet::from(document())
91 ->addForBinding(scriptState, ahem, exceptionState); 91 ->addForBinding(scriptState, ahem, exceptionState);
92 } 92 }
93 93
94 } // namespace blink 94 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/RemoteFrame.cpp ('k') | third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698