| Index: third_party/WebKit/Source/core/frame/LocalFrame.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
|
| index 23de22884b5d4fd69431b5135807a84e7165f8f9..85253d6194ea469424de2f044c85ec3a687c0d9e 100644
|
| --- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
|
| @@ -168,9 +168,9 @@ inline float parentTextZoomFactor(LocalFrame* frame)
|
|
|
| } // namespace
|
|
|
| -PassRefPtrWillBeRawPtr<LocalFrame> LocalFrame::create(FrameLoaderClient* client, FrameHost* host, FrameOwner* owner)
|
| +PassRefPtrWillBeRawPtr<LocalFrame> LocalFrame::create(FrameLoaderClient* client, FrameHost* host, FrameOwner* owner, ServiceRegistry* serviceRegistry)
|
| {
|
| - RefPtrWillBeRawPtr<LocalFrame> frame = adoptRefWillBeNoop(new LocalFrame(client, host, owner));
|
| + RefPtrWillBeRawPtr<LocalFrame> frame = adoptRefWillBeNoop(new LocalFrame(client, host, owner, serviceRegistry));
|
| InspectorInstrumentation::frameAttachedToParent(frame.get());
|
| return frame.release();
|
| }
|
| @@ -827,7 +827,7 @@ bool LocalFrame::shouldThrottleRendering() const
|
| return view() && view()->shouldThrottleRendering();
|
| }
|
|
|
| -inline LocalFrame::LocalFrame(FrameLoaderClient* client, FrameHost* host, FrameOwner* owner)
|
| +inline LocalFrame::LocalFrame(FrameLoaderClient* client, FrameHost* host, FrameOwner* owner, ServiceRegistry* serviceRegistry)
|
| : Frame(client, host, owner)
|
| , m_loader(this)
|
| , m_navigationScheduler(NavigationScheduler::create(this))
|
| @@ -842,6 +842,7 @@ inline LocalFrame::LocalFrame(FrameLoaderClient* client, FrameHost* host, FrameO
|
| , m_pageZoomFactor(parentPageZoomFactor(this))
|
| , m_textZoomFactor(parentTextZoomFactor(this))
|
| , m_inViewSourceMode(false)
|
| + , m_serviceRegistry(serviceRegistry)
|
| {
|
| if (isLocalRoot())
|
| m_instrumentingAgents = InstrumentingAgents::create();
|
|
|