Diff
Modified: trunk/Source/WebCore/ChangeLog (153091 => 153092)
--- trunk/Source/WebCore/ChangeLog 2013-07-24 18:28:40 UTC (rev 153091)
+++ trunk/Source/WebCore/ChangeLog 2013-07-24 18:33:16 UTC (rev 153092)
@@ -1,3 +1,15 @@
+2013-07-24 Jessie Berlin <[email protected]>
+
+ Remove WKPageGetPlugInInformation - it is not used anymore
+ https://bugs.webkit.org/show_bug.cgi?id=119047
+
+ Rubber-stamped by Alexey Proskuryakov.
+
+ Revert r152328, which added a key used only in the callback info for
+ WKPageGetPlugInInformation.
+
+ * WebCore.exp.in:
+
2013-07-24 Robert Hogan <[email protected]>
Border drawing incorrect when using both border-collapse: collapse and overflow: hidden on a table
Modified: trunk/Source/WebCore/WebCore.exp.in (153091 => 153092)
--- trunk/Source/WebCore/WebCore.exp.in 2013-07-24 18:28:40 UTC (rev 153091)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-07-24 18:33:16 UTC (rev 153092)
@@ -852,7 +852,6 @@
__ZN7WebCore4Node17stopIgnoringLeaksEv
__ZN7WebCore4Node18startIgnoringLeaksEv
__ZN7WebCore4Node19setNeedsStyleRecalcENS_15StyleChangeTypeE
-__ZN7WebCore4Node20getElementsByTagNameERKN3WTF12AtomicStringE
__ZN7WebCore4Page10findStringERKN3WTF6StringEj
__ZN7WebCore4Page11PageClientsC1Ev
__ZN7WebCore4Page11PageClientsD1Ev
Modified: trunk/Source/WebKit2/ChangeLog (153091 => 153092)
--- trunk/Source/WebKit2/ChangeLog 2013-07-24 18:28:40 UTC (rev 153091)
+++ trunk/Source/WebKit2/ChangeLog 2013-07-24 18:33:16 UTC (rev 153092)
@@ -1,3 +1,24 @@
+2013-07-24 Jessie Berlin <[email protected]>
+
+ Remove WKPageGetPlugInInformation - it is not used anymore
+ https://bugs.webkit.org/show_bug.cgi?id=119047
+
+ Rubber-stamped by Alexey Proskuryakov.
+
+ Revert r152328, which added a key used only in the callback info for
+ WKPageGetPlugInInformation.
+
+ * Shared/API/c/WKPluginInformation.cpp:
+ * Shared/API/c/WKPluginInformation.h:
+ * Shared/Plugins/Netscape/PluginInformation.cpp:
+ * Shared/Plugins/Netscape/PluginInformation.h:
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/mac/WebPageProxyMac.mm:
+ (WebKit::WebPageProxy::containsPlugInCallback):
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::containsPluginViewsWithPluginProcessToken):
+
2013-07-24 Anton Obzhirov <[email protected]>
[GTK] TestInspectorServer unit test is timing out
Modified: trunk/Source/WebKit2/Shared/API/c/WKPluginInformation.cpp (153091 => 153092)
--- trunk/Source/WebKit2/Shared/API/c/WKPluginInformation.cpp 2013-07-24 18:28:40 UTC (rev 153091)
+++ trunk/Source/WebKit2/Shared/API/c/WKPluginInformation.cpp 2013-07-24 18:33:16 UTC (rev 153092)
@@ -110,12 +110,6 @@
return toAPI(key);
}
-WKStringRef WKPlugInInformationPageContainsNonPlayingInstanceOfPlugInKey()
-{
- static WebString* key = WebString::create(plugInInformationPageContainsNonPlayingInstanceOfPlugInKey()).leakRef();
- return toAPI(key);
-}
-
WKStringRef WKPlugInInformationReplacementObscuredKey()
{
static WebString* key = WebString::create(plugInInformationReplacementObscuredKey()).leakRef();
Modified: trunk/Source/WebKit2/Shared/API/c/WKPluginInformation.h (153091 => 153092)
--- trunk/Source/WebKit2/Shared/API/c/WKPluginInformation.h 2013-07-24 18:28:40 UTC (rev 153091)
+++ trunk/Source/WebKit2/Shared/API/c/WKPluginInformation.h 2013-07-24 18:33:16 UTC (rev 153092)
@@ -77,9 +77,6 @@
WK_EXPORT WKStringRef WKPluginInformationPluginURLKey();
/* Value type: WKBooleanRef */
-WK_EXPORT WKStringRef WKPlugInInformationPageContainsNonPlayingInstanceOfPlugInKey();
-
-/* Value type: WKBooleanRef */
WK_EXPORT WKStringRef WKPlugInInformationReplacementObscuredKey();
#ifdef __cplusplus
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp (153091 => 153092)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp 2013-07-24 18:28:40 UTC (rev 153091)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp 2013-07-24 18:33:16 UTC (rev 153092)
@@ -101,11 +101,6 @@
return ASCIILiteral("PluginInformationPluginURL");
}
-String plugInInformationPageContainsNonPlayingInstanceOfPlugInKey()
-{
- return ASCIILiteral("PlugInInformationPageContainsNonPlayingInstanceOfPlugIn");
-}
-
String plugInInformationReplacementObscuredKey()
{
return ASCIILiteral("PlugInInformationReplacementObscured");
@@ -130,16 +125,6 @@
return ImmutableDictionary::adopt(map);
}
-PassRefPtr<ImmutableDictionary> createPlugInInformationDictionary(const PluginModuleInfo& plugInModuleInfo, bool pageContainsNonPlayingInstanceOfPlugIn)
-{
- ImmutableDictionary::MapType map;
- getPluginModuleInformation(plugInModuleInfo, map);
-
- map.set(plugInInformationPageContainsNonPlayingInstanceOfPlugInKey(), WebBoolean::create(pageContainsNonPlayingInstanceOfPlugIn));
-
- return ImmutableDictionary::adopt(map);
-}
-
PassRefPtr<ImmutableDictionary> createPluginInformationDictionary(const PluginModuleInfo& plugin, const String& frameURLString, const String& mimeType, const String& pageURLString, const String& pluginspageAttributeURLString, const String& pluginURLString, bool replacementObscured)
{
ImmutableDictionary::MapType map;
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.h (153091 => 153092)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.h 2013-07-24 18:28:40 UTC (rev 153091)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.h 2013-07-24 18:33:16 UTC (rev 153092)
@@ -49,13 +49,11 @@
String pluginInformationPageURLKey();
String pluginInformationPluginspageAttributeURLKey();
String pluginInformationPluginURLKey();
-String plugInInformationPageContainsNonPlayingInstanceOfPlugInKey();
String plugInInformationReplacementObscuredKey();
PassRefPtr<ImmutableDictionary> createPluginInformationDictionary(const PluginModuleInfo&);
PassRefPtr<ImmutableDictionary> createPluginInformationDictionary(const PluginModuleInfo&, const String& frameURLString, const String& mimeType, const String& pageURLString, const String& pluginspageAttributeURLString, const String& pluginURLString, bool replacementObscured = false);
PassRefPtr<ImmutableDictionary> createPluginInformationDictionary(const String& mimeType, const String& frameURLString, const String& pageURLString);
-PassRefPtr<ImmutableDictionary> createPlugInInformationDictionary(const PluginModuleInfo&, bool pageContainsNonPlayingInstanceOfPlugIn);
void getPluginModuleInformation(const PluginModuleInfo&, ImmutableDictionary::MapType&);
void getPlatformPluginModuleInformation(const PluginModuleInfo&, ImmutableDictionary::MapType&);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (153091 => 153092)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-07-24 18:28:40 UTC (rev 153091)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-07-24 18:33:16 UTC (rev 153092)
@@ -539,7 +539,7 @@
ColorSpaceData colorSpace();
void getPlugInInformation(pid_t plugInProcessID, PassRefPtr<DictionaryCallback>);
- void containsPlugInCallback(bool containsPlugIn, const Vector<String>& nonPlayingPlugInInstanceMimeTypes, uint64_t plugInToken, uint64_t callbackID);
+ void containsPlugInCallback(bool containsPlugIn, uint64_t plugInToken, uint64_t callbackID);
#endif
void pageScaleFactorDidChange(double);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (153091 => 153092)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2013-07-24 18:28:40 UTC (rev 153091)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2013-07-24 18:33:16 UTC (rev 153092)
@@ -263,7 +263,7 @@
# Plug-in complex text input support messages
PluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus)
SetPluginComplexTextInputState(uint64_t pluginComplexTextInputIdentifier, uint64_t complexTextInputState)
- ContainsPlugInCallback(bool containsPlugIn, Vector<String> nonPlayingPlugInInstanceMimeTypes, uint64_t plugInProcessToken, uint64_t callbackID)
+ ContainsPlugInCallback(bool containsPlugIn, uint64_t plugInProcessToken, uint64_t callbackID)
# Speech messages
GetIsSpeaking() -> (bool isSpeaking)
Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (153091 => 153092)
--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2013-07-24 18:28:40 UTC (rev 153091)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2013-07-24 18:33:16 UTC (rev 153092)
@@ -40,7 +40,6 @@
#import "PluginProcessProxy.h"
#import "StringUtilities.h"
#import "TextChecker.h"
-#import "WebContext.h"
#import "WebPageMessages.h"
#import "WebProcessProxy.h"
#import <WebCore/DictationAlternative.h>
@@ -483,7 +482,7 @@
m_process->send(Messages::WebPage::ContainsPluginViewsWithPluginProcessToken(plugInProcessProxy->pluginProcessToken(), callbackID), m_pageID);
}
-void WebPageProxy::containsPlugInCallback(bool containsPlugIn, const Vector<String>& nonPlayingPlugInInstanceMimeTypes, uint64_t plugInToken, uint64_t callbackID)
+void WebPageProxy::containsPlugInCallback(bool containsPlugIn, uint64_t plugInToken, uint64_t callbackID)
{
RefPtr<DictionaryCallback> callback = m_plugInInformationCallbacks.take(callbackID);
if (!callback) {
@@ -499,20 +498,10 @@
PluginProcessProxy* plugInProcessProxy = PluginProcessManager::shared().findPlugInProcessByToken(plugInToken);
ASSERT(plugInProcessProxy);
- String plugInBundleIdentifier = plugInProcessProxy->pluginProcessAttributes().moduleInfo.bundleIdentifier;
- bool containsNonPlayingInstanceOfPlugIn = false;
+ ImmutableDictionary::MapType map;
+ getPluginModuleInformation(plugInProcessProxy->pluginProcessAttributes().moduleInfo, map);
+ RefPtr<ImmutableDictionary> plugInInformation = ImmutableDictionary::adopt(map);
- for (const String& plugInMimeType: nonPlayingPlugInInstanceMimeTypes) {
- String mimeType = plugInMimeType;
- PluginModuleInfo plugInInfo = m_process->context()->pluginInfoStore().findPlugin(mimeType, KURL());
- if (plugInInfo.bundleIdentifier == plugInBundleIdentifier) {
- containsNonPlayingInstanceOfPlugIn = true;
- break;
- }
- }
-
- RefPtr<ImmutableDictionary> plugInInformation = createPlugInInformationDictionary(plugInProcessProxy->pluginProcessAttributes().moduleInfo, containsNonPlayingInstanceOfPlugIn);
-
callback->performCallbackWithReturnValue(plugInInformation.get());
}
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (153091 => 153092)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2013-07-24 18:28:40 UTC (rev 153091)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2013-07-24 18:33:16 UTC (rev 153092)
@@ -52,11 +52,9 @@
#import <WebCore/FrameLoader.h>
#import <WebCore/FrameView.h>
#import <WebCore/HTMLConverter.h>
-#import <WebCore/HTMLPlugInImageElement.h>
#import <WebCore/HitTestResult.h>
#import <WebCore/KeyboardEvent.h>
#import <WebCore/MIMETypeRegistry.h>
-#import <WebCore/NodeList.h>
#import <WebCore/NetworkingContext.h>
#import <WebCore/Page.h>
#import <WebCore/PlatformKeyboardEvent.h>
@@ -974,31 +972,6 @@
}
}
-static void addPlugInMimeTypesFromNodeListForNonPlayingPlugIns(PassRefPtr<NodeList> plugIns, HashSet<String>& mimeTypes)
-{
- if (!plugIns)
- return;
-
- for (unsigned i = 0, length = plugIns->length(); i < length; i++) {
- Node* node = plugIns->item(i);
- if (!node->isPluginElement())
- continue;
-
- HTMLPlugInElement* plugInElement = toHTMLPlugInElement(node);
-
- ASSERT(!plugInElement->hasTagName(WebCore::HTMLNames::appletTag));
-
- if (plugInElement->displayState() == HTMLPlugInElement::DisplayState::Playing)
- continue;
-
- if (!plugInElement->isPlugInImageElement())
- continue;
-
- HTMLPlugInImageElement* plugInImageElement = toHTMLPlugInImageElement(node);
- mimeTypes.add(plugInImageElement->loadedMimeType());
- }
-}
-
void WebPage::containsPluginViewsWithPluginProcessToken(uint64_t plugInProcessToken, uint64_t callbackID)
{
bool containsPlugIn = false;
@@ -1009,22 +982,7 @@
}
}
- HashSet<String> nonPlayingPlugInMimeTypes;
- for (Frame* frame = corePage()->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
- if (!frame->loader()->subframeLoader()->containsPlugins())
- continue;
-
- if (!frame->document())
- continue;
-
- addPlugInMimeTypesFromNodeListForNonPlayingPlugIns(frame->document()->getElementsByTagName(WebCore::HTMLNames::embedTag.localName()), nonPlayingPlugInMimeTypes);
- addPlugInMimeTypesFromNodeListForNonPlayingPlugIns(frame->document()->getElementsByTagName(WebCore::HTMLNames::objectTag.localName()), nonPlayingPlugInMimeTypes);
- }
-
- Vector<String> nonPlayingPlugInMimeTypesVector;
- copyToVector(nonPlayingPlugInMimeTypes, nonPlayingPlugInMimeTypesVector);
-
- send(Messages::WebPageProxy::ContainsPlugInCallback(containsPlugIn, nonPlayingPlugInMimeTypesVector, plugInProcessToken, callbackID));
+ send(Messages::WebPageProxy::ContainsPlugInCallback(containsPlugIn, plugInProcessToken, callbackID));
}
} // namespace WebKit
