diff options
Diffstat (limited to 'Source/WebCore/page/MainFrame.cpp')
| -rw-r--r-- | Source/WebCore/page/MainFrame.cpp | 143 |
1 files changed, 28 insertions, 115 deletions
diff --git a/Source/WebCore/page/MainFrame.cpp b/Source/WebCore/page/MainFrame.cpp index 48ab95de6..054a0625c 100644 --- a/Source/WebCore/page/MainFrame.cpp +++ b/Source/WebCore/page/MainFrame.cpp @@ -1,82 +1,43 @@ /* - * Copyright (C) 2013-2016 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ + +Copyright (C) 2013 Apple Inc. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include "config.h" #include "MainFrame.h" -#include "Element.h" -#include "EmptyClients.h" -#include "EventHandler.h" -#include "PageConfiguration.h" -#include "PageOverlayController.h" -#include "ScrollLatchingState.h" -#include "Settings.h" -#include "WheelEventDeltaFilter.h" -#include <wtf/NeverDestroyed.h> - -#if PLATFORM(MAC) -#include "ServicesOverlayController.h" -#endif /* PLATFORM(MAC) */ - -#if USE(APPLE_INTERNAL_SDK) -#include <WebKitAdditions/MainFrameIncludes.h> -#endif - namespace WebCore { -inline MainFrame::MainFrame(Page& page, PageConfiguration& configuration) - : Frame(page, nullptr, *configuration.loaderClientForMainFrame) +inline MainFrame::MainFrame(Page& page, FrameLoaderClient& client) + : Frame(page, nullptr, client) , m_selfOnlyRefCount(0) -#if PLATFORM(MAC) -#if ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION) - , m_servicesOverlayController(std::make_unique<ServicesOverlayController>(*this)) -#endif -#endif - , m_recentWheelEventDeltaFilter(WheelEventDeltaFilter::create()) - , m_pageOverlayController(std::make_unique<PageOverlayController>(*this)) - , m_diagnosticLoggingClient(configuration.diagnosticLoggingClient) { -#if USE(APPLE_INTERNAL_SDK) -#include <WebKitAdditions/MainFrameInitialization.cpp> -#endif -} - -MainFrame::~MainFrame() -{ - if (m_diagnosticLoggingClient) - m_diagnosticLoggingClient->mainFrameDestroyed(); - - m_recentWheelEventDeltaFilter = nullptr; - m_eventHandler = nullptr; - - setMainFrameWasDestroyed(); } -Ref<MainFrame> MainFrame::create(Page& page, PageConfiguration& configuration) +RefPtr<MainFrame> MainFrame::create(Page& page, FrameLoaderClient& client) { - return adoptRef(*new MainFrame(page, configuration)); + return adoptRef(new MainFrame(page, client)); } void MainFrame::selfOnlyRef() @@ -99,58 +60,10 @@ void MainFrame::selfOnlyDeref() deref(); } -DiagnosticLoggingClient& MainFrame::diagnosticLoggingClient() const -{ - static NeverDestroyed<EmptyDiagnosticLoggingClient> dummyClient; - if (!settings().diagnosticLoggingEnabled() || !m_diagnosticLoggingClient) - return dummyClient; - - return *m_diagnosticLoggingClient; -} - void MainFrame::dropChildren() { while (Frame* child = tree().firstChild()) tree().removeChild(child); } -#if PLATFORM(MAC) -ScrollLatchingState* MainFrame::latchingState() -{ - if (m_latchingState.isEmpty()) - return nullptr; - - return &m_latchingState.last(); -} - -void MainFrame::pushNewLatchingState() -{ - m_latchingState.append(ScrollLatchingState()); -} - -void MainFrame::resetLatchingState() -{ - m_latchingState.clear(); -} - -void MainFrame::popLatchingState() -{ - m_latchingState.removeLast(); -} - -void MainFrame::removeLatchingStateForTarget(Element& targetNode) -{ - if (m_latchingState.isEmpty()) - return; - - m_latchingState.removeAllMatching([&targetNode] (ScrollLatchingState& state) { - auto* wheelElement = state.wheelEventElement(); - if (!wheelElement) - return false; - - return targetNode.isEqualNode(wheelElement); - }); -} -#endif - } |