| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Simon Hausmann <hausmann@kde.org> | 5 * 2000 Simon Hausmann <hausmann@kde.org> |
| 6 * 2000 Stefan Schimanski <1Stein@gmx.de> | 6 * 2000 Stefan Schimanski <1Stein@gmx.de> |
| 7 * 2001 George Staikos <staikos@kde.org> | 7 * 2001 George Staikos <staikos@kde.org> |
| 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ights reserved. | 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ights reserved. |
| 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> | 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> |
| 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 inline float parentTextZoomFactor(LocalFrame* frame) | 157 inline float parentTextZoomFactor(LocalFrame* frame) |
| 158 { | 158 { |
| 159 Frame* parent = frame->tree().parent(); | 159 Frame* parent = frame->tree().parent(); |
| 160 if (!parent || !parent->isLocalFrame()) | 160 if (!parent || !parent->isLocalFrame()) |
| 161 return 1; | 161 return 1; |
| 162 return toLocalFrame(parent)->textZoomFactor(); | 162 return toLocalFrame(parent)->textZoomFactor(); |
| 163 } | 163 } |
| 164 | 164 |
| 165 } // namespace | 165 } // namespace |
| 166 | 166 |
| 167 PassRefPtrWillBeRawPtr<LocalFrame> LocalFrame::create(FrameLoaderClient* client,
FrameHost* host, FrameOwner* owner) | 167 PassRefPtrWillBeRawPtr<LocalFrame> LocalFrame::create(FrameLoaderClient* client,
FrameHost* host, FrameOwner* owner, ServiceRegistry* serviceRegistry) |
| 168 { | 168 { |
| 169 RefPtrWillBeRawPtr<LocalFrame> frame = adoptRefWillBeNoop(new LocalFrame(cli
ent, host, owner)); | 169 RefPtrWillBeRawPtr<LocalFrame> frame = adoptRefWillBeNoop(new LocalFrame(cli
ent, host, owner, serviceRegistry)); |
| 170 InspectorInstrumentation::frameAttachedToParent(frame.get()); | 170 InspectorInstrumentation::frameAttachedToParent(frame.get()); |
| 171 return frame.release(); | 171 return frame.release(); |
| 172 } | 172 } |
| 173 | 173 |
| 174 void LocalFrame::setView(PassRefPtrWillBeRawPtr<FrameView> view) | 174 void LocalFrame::setView(PassRefPtrWillBeRawPtr<FrameView> view) |
| 175 { | 175 { |
| 176 ASSERT(!m_view || m_view != view); | 176 ASSERT(!m_view || m_view != view); |
| 177 ASSERT(!document() || !document()->isActive()); | 177 ASSERT(!document() || !document()->isActive()); |
| 178 | 178 |
| 179 eventHandler().clear(); | 179 eventHandler().clear(); |
| (...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 811 return String(); | 811 return String(); |
| 812 | 812 |
| 813 return contentLayoutObject()->compositor()->layerTreeAsText(static_cast<Laye
rTreeFlags>(flags)); | 813 return contentLayoutObject()->compositor()->layerTreeAsText(static_cast<Laye
rTreeFlags>(flags)); |
| 814 } | 814 } |
| 815 | 815 |
| 816 bool LocalFrame::shouldThrottleRendering() const | 816 bool LocalFrame::shouldThrottleRendering() const |
| 817 { | 817 { |
| 818 return view() && view()->shouldThrottleRendering(); | 818 return view() && view()->shouldThrottleRendering(); |
| 819 } | 819 } |
| 820 | 820 |
| 821 inline LocalFrame::LocalFrame(FrameLoaderClient* client, FrameHost* host, FrameO
wner* owner) | 821 inline LocalFrame::LocalFrame(FrameLoaderClient* client, FrameHost* host, FrameO
wner* owner, ServiceRegistry* serviceRegistry) |
| 822 : Frame(client, host, owner) | 822 : Frame(client, host, owner) |
| 823 , m_loader(this) | 823 , m_loader(this) |
| 824 , m_navigationScheduler(NavigationScheduler::create(this)) | 824 , m_navigationScheduler(NavigationScheduler::create(this)) |
| 825 , m_script(ScriptController::create(this)) | 825 , m_script(ScriptController::create(this)) |
| 826 , m_editor(Editor::create(*this)) | 826 , m_editor(Editor::create(*this)) |
| 827 , m_spellChecker(SpellChecker::create(*this)) | 827 , m_spellChecker(SpellChecker::create(*this)) |
| 828 , m_selection(FrameSelection::create(this)) | 828 , m_selection(FrameSelection::create(this)) |
| 829 , m_eventHandler(adoptPtrWillBeNoop(new EventHandler(this))) | 829 , m_eventHandler(adoptPtrWillBeNoop(new EventHandler(this))) |
| 830 , m_console(FrameConsole::create(*this)) | 830 , m_console(FrameConsole::create(*this)) |
| 831 , m_inputMethodController(InputMethodController::create(*this)) | 831 , m_inputMethodController(InputMethodController::create(*this)) |
| 832 , m_navigationDisableCount(0) | 832 , m_navigationDisableCount(0) |
| 833 , m_pageZoomFactor(parentPageZoomFactor(this)) | 833 , m_pageZoomFactor(parentPageZoomFactor(this)) |
| 834 , m_textZoomFactor(parentTextZoomFactor(this)) | 834 , m_textZoomFactor(parentTextZoomFactor(this)) |
| 835 , m_inViewSourceMode(false) | 835 , m_inViewSourceMode(false) |
| 836 , m_serviceRegistry(serviceRegistry) |
| 836 { | 837 { |
| 837 if (isLocalRoot()) | 838 if (isLocalRoot()) |
| 838 m_instrumentingAgents = InstrumentingAgents::create(); | 839 m_instrumentingAgents = InstrumentingAgents::create(); |
| 839 else | 840 else |
| 840 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; | 841 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; |
| 841 } | 842 } |
| 842 | 843 |
| 843 WebFrameScheduler* LocalFrame::frameScheduler() | 844 WebFrameScheduler* LocalFrame::frameScheduler() |
| 844 { | 845 { |
| 845 if (!m_frameScheduler.get()) | 846 if (!m_frameScheduler.get()) |
| (...skipping 23 matching lines...) Expand all Loading... |
| 869 { | 870 { |
| 870 m_frame->disableNavigation(); | 871 m_frame->disableNavigation(); |
| 871 } | 872 } |
| 872 | 873 |
| 873 FrameNavigationDisabler::~FrameNavigationDisabler() | 874 FrameNavigationDisabler::~FrameNavigationDisabler() |
| 874 { | 875 { |
| 875 m_frame->enableNavigation(); | 876 m_frame->enableNavigation(); |
| 876 } | 877 } |
| 877 | 878 |
| 878 } // namespace blink | 879 } // namespace blink |
| OLD | NEW |