| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 #include "core/rendering/RenderBox.h" | 143 #include "core/rendering/RenderBox.h" |
| 144 #include "core/rendering/RenderFrame.h" | 144 #include "core/rendering/RenderFrame.h" |
| 145 #include "core/rendering/RenderLayer.h" | 145 #include "core/rendering/RenderLayer.h" |
| 146 #include "core/rendering/RenderObject.h" | 146 #include "core/rendering/RenderObject.h" |
| 147 #include "core/rendering/RenderTreeAsText.h" | 147 #include "core/rendering/RenderTreeAsText.h" |
| 148 #include "core/rendering/RenderView.h" | 148 #include "core/rendering/RenderView.h" |
| 149 #include "core/rendering/style/StyleInheritedData.h" | 149 #include "core/rendering/style/StyleInheritedData.h" |
| 150 #include "core/timing/Performance.h" | 150 #include "core/timing/Performance.h" |
| 151 #include "modules/geolocation/GeolocationController.h" | 151 #include "modules/geolocation/GeolocationController.h" |
| 152 #include "modules/notifications/NotificationPermissionClient.h" | 152 #include "modules/notifications/NotificationPermissionClient.h" |
| 153 #include "modules/presentation/PresentationController.h" |
| 153 #include "modules/push_messaging/PushController.h" | 154 #include "modules/push_messaging/PushController.h" |
| 154 #include "modules/screen_orientation/ScreenOrientationController.h" | 155 #include "modules/screen_orientation/ScreenOrientationController.h" |
| 155 #include "modules/speech/SpeechRecognitionController.h" | 156 #include "modules/speech/SpeechRecognitionController.h" |
| 156 #include "platform/ScriptForbiddenScope.h" | 157 #include "platform/ScriptForbiddenScope.h" |
| 157 #include "platform/TraceEvent.h" | 158 #include "platform/TraceEvent.h" |
| 158 #include "platform/UserGestureIndicator.h" | 159 #include "platform/UserGestureIndicator.h" |
| 159 #include "platform/clipboard/ClipboardUtilities.h" | 160 #include "platform/clipboard/ClipboardUtilities.h" |
| 160 #include "platform/fonts/FontCache.h" | 161 #include "platform/fonts/FontCache.h" |
| 161 #include "platform/graphics/GraphicsContext.h" | 162 #include "platform/graphics/GraphicsContext.h" |
| 162 #include "platform/graphics/GraphicsLayerClient.h" | 163 #include "platform/graphics/GraphicsLayerClient.h" |
| (...skipping 1448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1611 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->web
MIDIClient() : nullptr)); | 1612 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->web
MIDIClient() : nullptr)); |
| 1612 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create()); | 1613 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create()); |
| 1613 // FIXME: using WebViewClient as a temporary measure if there is no clie
nt on the WebFrame. | 1614 // FIXME: using WebViewClient as a temporary measure if there is no clie
nt on the WebFrame. |
| 1614 if (m_client && m_client->speechRecognizer()) | 1615 if (m_client && m_client->speechRecognizer()) |
| 1615 SpeechRecognitionController::provideTo(*m_frame, SpeechRecognitionCl
ientProxy::create(m_client->speechRecognizer())); | 1616 SpeechRecognitionController::provideTo(*m_frame, SpeechRecognitionCl
ientProxy::create(m_client->speechRecognizer())); |
| 1616 else | 1617 else |
| 1617 SpeechRecognitionController::provideTo(*m_frame, SpeechRecognitionCl
ientProxy::create(viewImpl()->client() ? viewImpl()->client()->speechRecognizer(
) : nullptr)); | 1618 SpeechRecognitionController::provideTo(*m_frame, SpeechRecognitionCl
ientProxy::create(viewImpl()->client() ? viewImpl()->client()->speechRecognizer(
) : nullptr)); |
| 1618 | 1619 |
| 1619 if (RuntimeEnabledFeatures::screenOrientationEnabled()) | 1620 if (RuntimeEnabledFeatures::screenOrientationEnabled()) |
| 1620 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client
->webScreenOrientationClient() : nullptr); | 1621 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client
->webScreenOrientationClient() : nullptr); |
| 1622 if (RuntimeEnabledFeatures::presentationEnabled()) |
| 1623 PresentationController::provideTo(*m_frame, m_client ? m_client->pre
sentationClient() : nullptr); |
| 1621 } | 1624 } |
| 1622 } | 1625 } |
| 1623 | 1626 |
| 1624 PassRefPtrWillBeRawPtr<LocalFrame> WebLocalFrameImpl::initializeCoreFrame(FrameH
ost* host, FrameOwner* owner, const AtomicString& name, const AtomicString& fall
backName) | 1627 PassRefPtrWillBeRawPtr<LocalFrame> WebLocalFrameImpl::initializeCoreFrame(FrameH
ost* host, FrameOwner* owner, const AtomicString& name, const AtomicString& fall
backName) |
| 1625 { | 1628 { |
| 1626 RefPtrWillBeRawPtr<LocalFrame> frame = LocalFrame::create(&m_frameLoaderClie
ntImpl, host, owner); | 1629 RefPtrWillBeRawPtr<LocalFrame> frame = LocalFrame::create(&m_frameLoaderClie
ntImpl, host, owner); |
| 1627 setCoreFrame(frame); | 1630 setCoreFrame(frame); |
| 1628 frame->tree().setName(name, fallbackName); | 1631 frame->tree().setName(name, fallbackName); |
| 1629 // We must call init() after m_frame is assigned because it is referenced | 1632 // We must call init() after m_frame is assigned because it is referenced |
| 1630 // during init(). Note that this may dispatch JS events; the frame may be | 1633 // during init(). Note that this may dispatch JS events; the frame may be |
| (...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2013 { | 2016 { |
| 2014 m_frameWidget = frameWidget; | 2017 m_frameWidget = frameWidget; |
| 2015 } | 2018 } |
| 2016 | 2019 |
| 2017 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const | 2020 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const |
| 2018 { | 2021 { |
| 2019 return m_frameWidget; | 2022 return m_frameWidget; |
| 2020 } | 2023 } |
| 2021 | 2024 |
| 2022 } // namespace blink | 2025 } // namespace blink |
| OLD | NEW |