Diff
Modified: trunk/Source/WebCore/ChangeLog (287162 => 287163)
--- trunk/Source/WebCore/ChangeLog 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebCore/ChangeLog 2021-12-17 00:16:28 UTC (rev 287163)
@@ -1,3 +1,23 @@
+2021-12-16 Alex Christensen <achristen...@webkit.org>
+
+ Remove more NPAPI plugin code
+ https://bugs.webkit.org/show_bug.cgi?id=234379
+
+ Reviewed by Anders Carlsson.
+
+ * html/HTMLObjectElement.cpp:
+ (WebCore::HTMLObjectElement::appendFormData): Deleted.
+ * html/HTMLObjectElement.h:
+ * page/Page.cpp:
+ (WebCore::Page::setSessionID):
+ * plugins/PluginViewBase.h:
+ (WebCore::PluginViewBase::storageBlockingStateChanged):
+ (WebCore::PluginViewBase::privateBrowsingStateChanged): Deleted.
+ (WebCore::PluginViewBase::getFormValue): Deleted.
+ (WebCore::PluginViewBase::shouldNotAddLayer const): Deleted.
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateConfiguration):
+
2021-12-16 Jer Noble <jer.no...@apple.com>
Add an experimental VideoTrackConfiguration class and accessor on VideoTrack
Modified: trunk/Source/WebCore/html/HTMLObjectElement.cpp (287162 => 287163)
--- trunk/Source/WebCore/html/HTMLObjectElement.cpp 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebCore/html/HTMLObjectElement.cpp 2021-12-17 00:16:28 UTC (rev 287163)
@@ -462,23 +462,6 @@
HTMLPlugInImageElement::didMoveToNewDocument(oldDocument, newDocument);
}
-bool HTMLObjectElement::appendFormData(DOMFormData& formData)
-{
- if (name().isEmpty())
- return false;
-
- // Use PluginLoadingPolicy::DoNotLoad here or it would fire JS events synchronously
- // which would not be safe here.
- RefPtr widget = pluginWidget(PluginLoadingPolicy::DoNotLoad);
- if (!is<PluginViewBase>(widget))
- return false;
- String value;
- if (!downcast<PluginViewBase>(*widget).getFormValue(value))
- return false;
- formData.append(name(), value);
- return true;
-}
-
bool HTMLObjectElement::canContainRangeEndPoint() const
{
// Call through to HTMLElement because HTMLPlugInElement::canContainRangeEndPoint
Modified: trunk/Source/WebCore/html/HTMLObjectElement.h (287162 => 287163)
--- trunk/Source/WebCore/html/HTMLObjectElement.h 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebCore/html/HTMLObjectElement.h 2021-12-17 00:16:28 UTC (rev 287163)
@@ -99,7 +99,6 @@
bool isFormControlElement() const final { return false; }
bool isEnumeratable() const final { return true; }
- bool appendFormData(DOMFormData&) final;
bool canContainRangeEndPoint() const final;
Modified: trunk/Source/WebCore/page/Page.cpp (287162 => 287163)
--- trunk/Source/WebCore/page/Page.cpp 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebCore/page/Page.cpp 2021-12-17 00:16:28 UTC (rev 287163)
@@ -3047,12 +3047,6 @@
forEachDocument([&] (Document& document) {
document.privateBrowsingStateDidChange(m_sessionID);
});
-
- // Collect the PluginViews in to a vector to ensure that action the plug-in takes
- // from below privateBrowsingStateChanged does not affect their lifetime.
-
- for (auto& view : pluginViews())
- view->privateBrowsingStateChanged(sessionID.isEphemeral());
}
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
Modified: trunk/Source/WebCore/plugins/PluginViewBase.h (287162 => 287163)
--- trunk/Source/WebCore/plugins/PluginViewBase.h 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebCore/plugins/PluginViewBase.h 2021-12-17 00:16:28 UTC (rev 287163)
@@ -58,8 +58,6 @@
virtual JSC::JSObject* scriptObject(JSC::JSGlobalObject*) { return 0; }
virtual void storageBlockingStateChanged() { }
- virtual void privateBrowsingStateChanged(bool) { }
- virtual bool getFormValue(String&) { return false; }
virtual bool scroll(ScrollDirection, ScrollGranularity) { return false; }
// A plug-in can ask WebKit to handle scrollbars for it.
@@ -73,7 +71,6 @@
virtual bool shouldAllowNavigationFromDrags() const { return false; }
bool isPluginViewBase() const override { return true; }
- virtual bool shouldNotAddLayer() const { return false; }
virtual AudioHardwareActivityType audioHardwareActivity() const { return AudioHardwareActivityType::Unknown; }
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (287162 => 287163)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2021-12-17 00:16:28 UTC (rev 287163)
@@ -1074,8 +1074,7 @@
pluginViewBase->attachPluginLayer();
}
#else
- if (!pluginViewBase->shouldNotAddLayer())
- m_graphicsLayer->setContentsToPlatformLayer(pluginViewBase->platformLayer(), GraphicsLayer::ContentsLayerPurpose::Plugin);
+ m_graphicsLayer->setContentsToPlatformLayer(pluginViewBase->platformLayer(), GraphicsLayer::ContentsLayerPurpose::Plugin);
#endif
}
#if ENABLE(VIDEO)
Modified: trunk/Source/WebKit/ChangeLog (287162 => 287163)
--- trunk/Source/WebKit/ChangeLog 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebKit/ChangeLog 2021-12-17 00:16:28 UTC (rev 287163)
@@ -1,3 +1,53 @@
+2021-12-16 Alex Christensen <achristen...@webkit.org>
+
+ Remove more NPAPI plugin code
+ https://bugs.webkit.org/show_bug.cgi?id=234379
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/Cocoa/WebViewImpl.h:
+ (WebKit::WebViewImpl::pluginComplexTextInputIdentifier const): Deleted.
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::doneWithKeyEvent):
+ (WebKit::WebViewImpl::interpretKeyEvent):
+ (WebKit::WebViewImpl::inputContext):
+ (WebKit::WebViewImpl::performKeyEquivalent):
+ (WebKit::WebViewImpl::keyDown):
+ (WebKit::WebViewImpl::disableComplexTextInputIfNecessary): Deleted.
+ (WebKit::WebViewImpl::handlePluginComplexTextInputKeyDown): Deleted.
+ (WebKit::WebViewImpl::tryHandlePluginComplexTextInputKeyDown): Deleted.
+ (WebKit::WebViewImpl::pluginFocusOrWindowFocusChanged): Deleted.
+ (WebKit::WebViewImpl::tryPostProcessPluginComplexTextInputKeyDown): Deleted.
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::pluginFocusOrWindowFocusChanged): Deleted.
+ * UIProcess/mac/PageClientImplMac.h:
+ * UIProcess/mac/PageClientImplMac.mm:
+ (WebKit::PageClientImpl::pluginFocusOrWindowFocusChanged): Deleted.
+ * UIProcess/mac/WebPageProxyMac.mm:
+ (WebKit::WebPageProxy::sendComplexTextInputToPlugin): Deleted.
+ (WebKit::WebPageProxy::pluginFocusOrWindowFocusChanged): Deleted.
+ * WebProcess/Plugins/PDF/PDFPlugin.h:
+ * WebProcess/Plugins/Plugin.h:
+ (WebKit::Plugin::canCreateTransientPaintingSnapshot const): Deleted.
+ * WebProcess/Plugins/PluginController.h:
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::destroyPluginAndReset):
+ (WebKit::PluginView::shouldCreateTransientPaintingSnapshot const):
+ (WebKit::PluginView::sendComplexTextInput): Deleted.
+ (WebKit::PluginView::privateBrowsingStateChanged): Deleted.
+ (WebKit::PluginView::getFormValue): Deleted.
+ (WebKit::PluginView::shouldNotAddLayer const): Deleted.
+ (WebKit::PluginView::pluginFocusOrWindowFocusChanged): Deleted.
+ * WebProcess/Plugins/PluginView.h:
+ * WebProcess/WebPage/WebPage.h:
+ (WebKit::WebPage::accessibilityPosition const):
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::sendComplexTextInputToPlugin): Deleted.
+
2021-12-16 Chris Dumez <cdu...@apple.com>
Move WebIDBServers from NetworkProcess to NetworkSession class
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h (287162 => 287163)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h 2021-12-17 00:16:28 UTC (rev 287163)
@@ -338,12 +338,6 @@
void resetSecureInputState();
bool inSecureInputState() const { return m_inSecureInputState; }
void notifyInputContextAboutDiscardedComposition();
- void disableComplexTextInputIfNecessary();
- bool handlePluginComplexTextInputKeyDown(NSEvent *);
- bool tryHandlePluginComplexTextInputKeyDown(NSEvent *);
- void pluginFocusOrWindowFocusChanged(bool pluginHasFocusAndWindowHasFocus, uint64_t pluginComplexTextInputIdentifier);
- bool tryPostProcessPluginComplexTextInputKeyDown(NSEvent *);
- uint64_t pluginComplexTextInputIdentifier() const { return m_pluginComplexTextInputIdentifier; }
void handleAcceptedAlternativeText(const String&);
NSInteger spellCheckerDocumentTag();
@@ -784,9 +778,6 @@
ValidationMap m_validationMap;
- // The identifier of the plug-in we want to send complex text input to, or 0 if there is none.
- uint64_t m_pluginComplexTextInputIdentifier { 0 };
-
#if ENABLE(FULLSCREEN_API)
RetainPtr<WKFullScreenWindowController> m_fullScreenWindowController;
#endif
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm (287162 => 287163)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2021-12-17 00:16:28 UTC (rev 287163)
@@ -2768,54 +2768,6 @@
[[m_view _web_superInputContext] discardMarkedText]; // Inform the input method that we won't have an inline input area despite having been asked to.
}
-void WebViewImpl::disableComplexTextInputIfNecessary()
-{
-}
-
-bool WebViewImpl::handlePluginComplexTextInputKeyDown(NSEvent *)
-{
- return NO;
-}
-
-bool WebViewImpl::tryHandlePluginComplexTextInputKeyDown(NSEvent *)
-{
- return NO;
-}
-
-void WebViewImpl::pluginFocusOrWindowFocusChanged(bool pluginHasFocusAndWindowHasFocus, uint64_t pluginComplexTextInputIdentifier)
-{
- ASSERT(hasProcessPrivilege(ProcessPrivilege::CanCommunicateWithWindowServer));
- bool inputSourceChanged = !!m_pluginComplexTextInputIdentifier;
-
- if (pluginHasFocusAndWindowHasFocus) {
- // Check if we're already allowing text input for this plug-in.
- if (pluginComplexTextInputIdentifier == m_pluginComplexTextInputIdentifier)
- return;
-
- m_pluginComplexTextInputIdentifier = pluginComplexTextInputIdentifier;
-
- } else {
- // Check if we got a request to unfocus a plug-in that isn't focused.
- if (pluginComplexTextInputIdentifier != m_pluginComplexTextInputIdentifier)
- return;
-
- m_pluginComplexTextInputIdentifier = 0;
- }
-
- if (inputSourceChanged) {
- // The input source changed; discard any entered text.
- [[WKTextInputWindowController sharedTextInputWindowController] unmarkText];
- }
-
- // This will force the current input context to be updated to its correct value.
- [NSApp updateWindows];
-}
-
-bool WebViewImpl::tryPostProcessPluginComplexTextInputKeyDown(NSEvent *)
-{
- return NO;
-}
-
void WebViewImpl::handleAcceptedAlternativeText(const String& acceptedAlternative)
{
m_page->handleAlternativeTextUIResult(acceptedAlternative);
@@ -4940,9 +4892,6 @@
if ([event type] != NSEventTypeKeyDown)
return;
- if (tryPostProcessPluginComplexTextInputKeyDown(event))
- return;
-
if (eventWasHandled) {
[NSCursor setHiddenUntilMouseMoves:YES];
return;
@@ -5037,13 +4986,6 @@
void WebViewImpl::interpretKeyEvent(NSEvent *event, void(^completionHandler)(BOOL handled, const Vector<WebCore::KeypressCommand>& commands))
{
- // For regular Web content, input methods run before passing a keydown to DOM, but plug-ins get an opportunity to handle the event first.
- // There is no need to collect commands, as the plug-in cannot execute them.
- if (pluginComplexTextInputIdentifier()) {
- completionHandler(NO, { });
- return;
- }
-
if (!inputContext()) {
auto commands = collectKeyboardLayoutCommandsForEvent(event);
completionHandler(NO, commands);
@@ -5255,11 +5197,6 @@
NSTextInputContext *WebViewImpl::inputContext()
{
- if (pluginComplexTextInputIdentifier()) {
- ASSERT(!m_collectedKeypressCommands); // Should not get here from -_interpretKeyEvent:completionHandler:, we only use WKTextInputWindowController after giving the plug-in a chance to handle keydown natively.
- return [[WKTextInputWindowController sharedTextInputWindowController] inputContext];
- }
-
// Disable text input machinery when in non-editable content. An invisible inline input area affects performance, and can prevent Expose from working.
if (!m_page->editorState().isContentEditable)
return nil;
@@ -5370,8 +5307,6 @@
return [m_view _web_superPerformKeyEquivalent:event];
}
- disableComplexTextInputIfNecessary();
-
// Pass key combos through WebCore if there is a key binding available for
// this event. This lets webpages have a crack at intercepting key-modified keypresses.
// FIXME: Why is the firstResponder check needed?
@@ -5408,11 +5343,6 @@
LOG(TextInput, "keyDown:%p %@%s", event, event, (event == m_keyDownEventBeingResent) ? " (re-sent)" : "");
- if (tryHandlePluginComplexTextInputKeyDown(event)) {
- LOG(TextInput, "...handled by plug-in");
- return;
- }
-
// We could be receiving a key down from AppKit if we have re-sent an event
// that maps to an action that is currently unavailable (for example a copy when
// there is no range selection).
Modified: trunk/Source/WebKit/UIProcess/PageClient.h (287162 => 287163)
--- trunk/Source/WebKit/UIProcess/PageClient.h 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebKit/UIProcess/PageClient.h 2021-12-17 00:16:28 UTC (rev 287163)
@@ -422,7 +422,6 @@
#endif
#if PLATFORM(MAC)
- virtual void pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus) = 0;
virtual void showCorrectionPanel(WebCore::AlternativeTextType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings) = 0;
virtual void dismissCorrectionPanel(WebCore::ReasonForDismissingAlternativeText) = 0;
virtual String dismissCorrectionPanelSoon(WebCore::ReasonForDismissingAlternativeText) = 0;
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (287162 => 287163)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2021-12-17 00:16:28 UTC (rev 287163)
@@ -956,8 +956,6 @@
#if PLATFORM(COCOA)
void windowAndViewFramesChanged(const WebCore::FloatRect& viewFrameInWindowCoordinates, const WebCore::FloatPoint& accessibilityViewCoordinates);
void setMainFrameIsScrollable(bool);
-
- void sendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, const String& textInput);
bool shouldDelayWindowOrderingForEvent(const WebMouseEvent&);
void setRemoteLayerTreeRootNode(RemoteLayerTreeNode*);
@@ -2365,10 +2363,6 @@
void didFinishLoadingDataForCustomContentProvider(const String& suggestedFilename, const IPC::DataReference&);
-#if PLATFORM(COCOA)
- void pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus);
-#endif
-
#if USE(AUTOMATIC_TEXT_REPLACEMENT)
void toggleSmartInsertDelete();
void toggleAutomaticQuoteSubstitution();
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in (287162 => 287163)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2021-12-17 00:16:28 UTC (rev 287163)
@@ -327,9 +327,6 @@
# Remote accessibility messages
RegisterWebProcessAccessibilityToken(IPC::DataReference data)
- # Plug-in complex text input support messages
- PluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus)
-
# Speech messages
GetIsSpeaking() -> (bool isSpeaking) Synchronous
Speak(String string)
Modified: trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm (287162 => 287163)
--- trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2021-12-17 00:16:28 UTC (rev 287163)
@@ -729,12 +729,6 @@
completionHandler(pageClient().interpretKeyEvent(m_keyEventQueue.first(), isCharEvent));
}
-// Complex text input support for plug-ins.
-void WebPageProxy::sendComplexTextInputToPlugin(uint64_t, const String&)
-{
- notImplemented();
-}
-
void WebPageProxy::setSmartInsertDeleteEnabled(bool)
{
notImplemented();
@@ -763,11 +757,6 @@
send(Messages::WebPage::RegisterUIProcessAccessibilityTokens(elementToken, windowToken));
}
-void WebPageProxy::pluginFocusOrWindowFocusChanged(uint64_t, bool)
-{
- notImplemented();
-}
-
void WebPageProxy::executeSavedCommandBySelector(const String&, CompletionHandler<void(bool)>&& completionHandler)
{
notImplemented();
Modified: trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.h (287162 => 287163)
--- trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.h 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.h 2021-12-17 00:16:28 UTC (rev 287163)
@@ -173,8 +173,6 @@
void accessibilityWebProcessTokenReceived(const IPC::DataReference&) override;
- void pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus) override;
-
void makeFirstResponder() override;
void assistiveTechnologyMakeFirstResponder() override;
void setShouldSuppressFirstResponderChanges(bool shouldSuppress) override { m_shouldSuppressFirstResponderChanges = shouldSuppress; }
Modified: trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.mm (287162 => 287163)
--- trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.mm 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.mm 2021-12-17 00:16:28 UTC (rev 287163)
@@ -654,11 +654,6 @@
}
#endif
-void PageClientImpl::pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus)
-{
- m_impl->pluginFocusOrWindowFocusChanged(pluginHasFocusAndWindowHasFocus, pluginComplexTextInputIdentifier);
-}
-
void PageClientImpl::didPerformDictionaryLookup(const DictionaryPopupInfo& dictionaryPopupInfo)
{
m_impl->prepareForDictionaryLookup();
Modified: trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm (287162 => 287163)
--- trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm 2021-12-17 00:16:28 UTC (rev 287163)
@@ -289,15 +289,6 @@
#endif
-// Complex text input support for plug-ins.
-void WebPageProxy::sendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, const String& textInput)
-{
- if (!hasRunningProcess())
- return;
-
- send(Messages::WebPage::SendComplexTextInputToPlugin(pluginComplexTextInputIdentifier, textInput));
-}
-
void WebPageProxy::uppercaseWord()
{
send(Messages::WebPage::UppercaseWord());
@@ -359,11 +350,6 @@
send(Messages::WebPage::RegisterUIProcessAccessibilityTokens(elementToken, windowToken));
}
-void WebPageProxy::pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus)
-{
- pageClient().pluginFocusOrWindowFocusChanged(pluginComplexTextInputIdentifier, pluginHasFocusAndWindowHasFocus);
-}
-
void WebPageProxy::executeSavedCommandBySelector(const String& selector, CompletionHandler<void(bool)>&& completionHandler)
{
MESSAGE_CHECK(isValidKeypressCommandName(selector));
Modified: trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.h (287162 => 287163)
--- trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.h 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.h 2021-12-17 00:16:28 UTC (rev 287163)
@@ -197,14 +197,11 @@
void windowFocusChanged(bool) final { }
void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates) final { }
void windowVisibilityChanged(bool) final { }
- uint64_t pluginComplexTextInputIdentifier() const final { return 0; }
void sendComplexTextInput(const String& textInput) final { }
void setLayerHostingMode(LayerHostingMode) final { }
WebCore::Scrollbar* horizontalScrollbar() final { return m_horizontalScrollbar.get(); }
WebCore::Scrollbar* verticalScrollbar() final { return m_verticalScrollbar.get(); }
void storageBlockingStateChanged(bool) final { }
- void privateBrowsingStateChanged(bool) final { }
- bool getFormValue(String& formValue) final { return false; }
bool handleScroll(WebCore::ScrollDirection, WebCore::ScrollGranularity) final;
RefPtr<WebCore::FragmentedSharedBuffer> liveResourceData() const final;
void willDetachRenderer() final;
Modified: trunk/Source/WebKit/WebProcess/Plugins/Plugin.h (287162 => 287163)
--- trunk/Source/WebKit/WebProcess/Plugins/Plugin.h 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebKit/WebProcess/Plugins/Plugin.h 2021-12-17 00:16:28 UTC (rev 287163)
@@ -227,9 +227,6 @@
// Tells the plug-in about window and plug-in frame changes.
virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates) = 0;
- // Get the per complex text input identifier.
- virtual uint64_t pluginComplexTextInputIdentifier() const = 0;
-
// Send the complex text input to the plug-in.
virtual void sendComplexTextInput(const String& textInput) = 0;
@@ -243,12 +240,6 @@
// Called when the storage blocking policy for this plug-in changes.
virtual void storageBlockingStateChanged(bool) = 0;
- // Called when the private browsing state for this plug-in changes.
- virtual void privateBrowsingStateChanged(bool) = 0;
-
- // Gets the form value representation for the plug-in, letting plug-ins participate in form submission.
- virtual bool getFormValue(String& formValue) = 0;
-
// Tells the plug-in that it should scroll. The plug-in should return true if it did scroll.
virtual bool handleScroll(WebCore::ScrollDirection, WebCore::ScrollGranularity) = 0;
@@ -280,8 +271,6 @@
virtual void mutedStateChanged(bool) { }
- virtual bool canCreateTransientPaintingSnapshot() const { return true; }
-
virtual bool requiresUnifiedScaleFactor() const { return false; }
virtual void willDetachRenderer() { }
Modified: trunk/Source/WebKit/WebProcess/Plugins/PluginController.h (287162 => 287163)
--- trunk/Source/WebKit/WebProcess/Plugins/PluginController.h 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebKit/WebProcess/Plugins/PluginController.h 2021-12-17 00:16:28 UTC (rev 287163)
@@ -48,11 +48,6 @@
virtual void loadURL(uint64_t requestID, const String& method, const String& urlString, const String& target,
const WebCore::HTTPHeaderMap& headerFields, const Vector<uint8_t>& httpBody, bool allowPopups) = 0;
-#if PLATFORM(COCOA)
- // Tells the controller that the plug-in focus or window focus did change.
- virtual void pluginFocusOrWindowFocusChanged(bool) = 0;
-#endif
-
// Returns the contents scale factor.
virtual float contentsScaleFactor() = 0;
Modified: trunk/Source/WebKit/WebProcess/Plugins/PluginView.cpp (287162 => 287163)
--- trunk/Source/WebKit/WebProcess/Plugins/PluginView.cpp 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebKit/WebProcess/Plugins/PluginView.cpp 2021-12-17 00:16:28 UTC (rev 287163)
@@ -322,11 +322,6 @@
m_pendingURLRequests.clear();
m_pendingURLRequestsTimer.stop();
-
-#if PLATFORM(COCOA)
- if (m_webPage)
- pluginFocusOrWindowFocusChanged(false);
-#endif
}
cancelAllStreams();
@@ -497,18 +492,6 @@
m_plugin->windowAndViewFramesChanged(enclosingIntRect(windowFrameInScreenCoordinates), enclosingIntRect(viewFrameInWindowCoordinates));
}
-bool PluginView::sendComplexTextInput(uint64_t pluginComplexTextInputIdentifier, const String& textInput)
-{
- if (!m_plugin)
- return false;
-
- if (m_plugin->pluginComplexTextInputIdentifier() != pluginComplexTextInputIdentifier)
- return false;
-
- m_plugin->sendComplexTextInput(textInput);
- return true;
-}
-
id PluginView::accessibilityAssociatedPluginParentForElement(Element* element) const
{
if (!m_plugin)
@@ -635,24 +618,6 @@
m_plugin->storageBlockingStateChanged(storageBlockingPolicy);
}
-void PluginView::privateBrowsingStateChanged(bool privateBrowsingEnabled)
-{
- // The plug-in can be null here if it failed to initialize.
- if (!m_isInitialized || !m_plugin)
- return;
-
- m_plugin->privateBrowsingStateChanged(privateBrowsingEnabled);
-}
-
-bool PluginView::getFormValue(String& formValue)
-{
- // The plug-in can be null here if it failed to initialize.
- if (!m_isInitialized || !m_plugin)
- return false;
-
- return m_plugin->getFormValue(formValue);
-}
-
bool PluginView::scroll(ScrollDirection direction, ScrollGranularity granularity)
{
// The plug-in can be null here if it failed to initialize.
@@ -889,11 +854,6 @@
return m_plugin->shouldAllowNavigationFromDrags();
}
-bool PluginView::shouldNotAddLayer() const
-{
- return false;
-}
-
void PluginView::willDetachRenderer()
{
if (!m_isInitialized || !m_plugin)
@@ -1282,14 +1242,6 @@
m_pendingURLRequestsTimer.startOneShot(0_s);
}
-#if PLATFORM(COCOA)
-void PluginView::pluginFocusOrWindowFocusChanged(bool pluginHasFocusAndWindowHasFocus)
-{
- if (m_webPage)
- m_webPage->send(Messages::WebPageProxy::PluginFocusOrWindowFocusChanged(m_plugin->pluginComplexTextInputIdentifier(), pluginHasFocusAndWindowHasFocus));
-}
-#endif
-
float PluginView::contentsScaleFactor()
{
if (Page* page = frame() ? frame()->page() : 0)
@@ -1332,9 +1284,6 @@
}
}
- if (!m_plugin->canCreateTransientPaintingSnapshot())
- return false;
-
return true;
}
Modified: trunk/Source/WebKit/WebProcess/Plugins/PluginView.h (287162 => 287163)
--- trunk/Source/WebKit/WebProcess/Plugins/PluginView.h 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebKit/WebProcess/Plugins/PluginView.h 2021-12-17 00:16:28 UTC (rev 287163)
@@ -83,7 +83,6 @@
#if PLATFORM(COCOA)
void setDeviceScaleFactor(float);
void windowAndViewFramesChanged(const WebCore::FloatRect& windowFrameInScreenCoordinates, const WebCore::FloatRect& viewFrameInWindowCoordinates);
- bool sendComplexTextInput(uint64_t pluginComplexTextInputIdentifier, const String& textInput);
RetainPtr<PDFDocument> pdfDocumentForPrinting() const { return m_plugin->pdfDocumentForPrinting(); }
id accessibilityHitTest(const WebCore::IntPoint& point) const override { return m_plugin->accessibilityHitTest(point); }
id accessibilityObject() const override;
@@ -154,14 +153,11 @@
#endif
JSC::JSObject* scriptObject(JSC::JSGlobalObject*) override;
void storageBlockingStateChanged() override;
- void privateBrowsingStateChanged(bool) override;
- bool getFormValue(String&) override;
bool scroll(WebCore::ScrollDirection, WebCore::ScrollGranularity) override;
WebCore::Scrollbar* horizontalScrollbar() override;
WebCore::Scrollbar* verticalScrollbar() override;
bool wantsWheelEvents() override;
bool shouldAllowNavigationFromDrags() const override;
- bool shouldNotAddLayer() const override;
void willDetachRenderer() override;
// WebCore::Widget
@@ -188,9 +184,6 @@
// PluginController
void loadURL(uint64_t requestID, const String& method, const String& urlString, const String& target, const WebCore::HTTPHeaderMap& headerFields, const Vector<uint8_t>& httpBody, bool allowPopups) override;
-#if PLATFORM(COCOA)
- void pluginFocusOrWindowFocusChanged(bool pluginHasFocusAndWindowHasFocus) override;
-#endif
float contentsScaleFactor() override;
void didInitializePlugin() override;
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (287162 => 287163)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2021-12-17 00:16:28 UTC (rev 287163)
@@ -934,8 +934,6 @@
WKAccessibilityWebPageObject* accessibilityRemoteObject();
NSObject *accessibilityObjectForMainFramePlugin();
const WebCore::FloatPoint& accessibilityPosition() const { return m_accessibilityPosition; }
-
- void sendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, const String& textInput);
void setTextAsync(const String&);
void insertTextAsync(const String& text, const EditingRange& replacementRange, InsertTextOptions&&);
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in (287162 => 287163)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2021-12-17 00:16:28 UTC (rev 287163)
@@ -443,9 +443,6 @@
#endif
#if PLATFORM(COCOA)
- # Complex text input support for plug-ins.
- SendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, String textInput)
-
WindowAndViewFramesChanged(WebCore::FloatRect windowFrameInScreenCoordinates, WebCore::FloatRect windowFrameInUnflippedScreenCoordinates, WebCore::FloatRect viewFrameInWindowCoordinates, WebCore::FloatPoint accessibilityViewCoordinates)
SetMainFrameIsScrollable(bool isScrollable)
RegisterUIProcessAccessibilityTokens(IPC::DataReference elemenToken, IPC::DataReference windowToken)
Modified: trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (287162 => 287163)
--- trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2021-12-17 00:16:28 UTC (rev 287163)
@@ -557,11 +557,6 @@
completionHandler();
}
-void WebPage::sendComplexTextInputToPlugin(uint64_t, const String&)
-{
- notImplemented();
-}
-
bool WebPage::performNonEditingBehaviorForSelector(const String&, WebCore::KeyboardEvent*)
{
notImplemented();
Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm (287162 => 287163)
--- trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm 2021-12-17 00:02:09 UTC (rev 287162)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm 2021-12-17 00:16:28 UTC (rev 287163)
@@ -321,14 +321,6 @@
return eventWasHandled;
}
-void WebPage::sendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, const String& textInput)
-{
- for (auto* pluginView : m_pluginViews) {
- if (pluginView->sendComplexTextInput(pluginComplexTextInputIdentifier, textInput))
- break;
- }
-}
-
void WebPage::attributedSubstringForCharacterRangeAsync(const EditingRange& editingRange, CompletionHandler<void(const WebCore::AttributedString&, const EditingRange&)>&& completionHandler)
{
Frame& frame = m_page->focusController().focusedOrMainFrame();
