Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)"

This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78.

Caused OOM issues on some CI machines :(

6 files changed, 7 insertions, 55 deletions

diff --git a/Source/WebKit/wince/ChangeLog b/Source/WebKit/wince/ChangeLog
index dbecfc31f..aa6bae9c6 100644
--- a/Source/WebKit/wince/ChangeLog
+++ b/Source/WebKit/wince/ChangeLog
@@ -1,52 +1,3 @@
-2012-10-10  Jon Lee  <jonlee@apple.com>
-
-        [WK2] Activate plugins when user clicks on snapshot
-        https://bugs.webkit.org/show_bug.cgi?id=98328
-        <rdar://problem/12426681>
-
-        Reviewed by Brady Eidson.
-
-        * WebCoreSupport/FrameLoaderClientWinCE.h:
-        (WebKit::FrameLoaderClientWinCE::recreatePlugin): Stub implementation of recreatePlugin().
-
-2012-10-07  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
-
-        Rename first/second to key/value in HashMap iterators
-        https://bugs.webkit.org/show_bug.cgi?id=82784
-
-        Reviewed by Eric Seidel.
-
-        * WebCoreSupport/PlatformStrategiesWinCE.cpp:
-        (PlatformStrategiesWinCE::getPluginInfo):
-
-2012-10-04  Simon Fraser  <simon.fraser@apple.com>
-
-        Standardize on "flush" terminology for compositing layer flushing/syncing
-        https://bugs.webkit.org/show_bug.cgi?id=98321
-
-        Reviewed by Simon Fraser.
-
-        Rename compositing-related methods that refer to "syncing" to instead
-        refer to "flushing".
-
-        * WebCoreSupport/ChromeClientWinCE.cpp:
-        (WebKit::ChromeClientWinCE::scheduleCompositingLayerFlush):
-        * WebCoreSupport/ChromeClientWinCE.h:
-        (ChromeClientWinCE):
-
-2012-09-28  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
-
-        Code inside FrameLoaderClient::canShowMIMEType() implementations can be shared among different WK ports
-        https://bugs.webkit.org/show_bug.cgi?id=97547
-
-        Reviewed by Adam Barth.
-
-        Newly added WebCore::MIMETypeRegistry::canShowMIMEType() function is used
-        inside WebKit::FrameLoaderClientWinCE::canShowMIMEType().
-
-        * WebCoreSupport/FrameLoaderClientWinCE.cpp:
-        (WebKit::FrameLoaderClientWinCE::canShowMIMEType):
-
 2012-09-25  Beth Dakin  <bdakin@apple.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=95397
diff --git a/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp b/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp
index de6bf7190..ac0b26da7 100644
--- a/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp
+++ b/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp
@@ -333,7 +333,7 @@ void ChromeClientWinCE::setNeedsOneShotDrawingSynchronization()
     notImplemented();
 }
 
-void ChromeClientWinCE::scheduleCompositingLayerFlush()
+void ChromeClientWinCE::scheduleCompositingLayerSync()
 {
     notImplemented();
 }
diff --git a/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h b/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h
index 96cea1a62..00226d0c8 100644
--- a/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h
+++ b/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h
@@ -151,7 +151,7 @@ public:
     virtual void setNeedsOneShotDrawingSynchronization();
     // Sets a flag to specify that the view needs to be updated, so we need
     // to do an eager layout before the drawing.
-    virtual void scheduleCompositingLayerFlush();
+    virtual void scheduleCompositingLayerSync();
 #endif
 
     virtual void setLastSetCursorToCurrentCursor();
diff --git a/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp b/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp
index acbd8e031..63fff82db 100644
--- a/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp
+++ b/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp
@@ -414,7 +414,9 @@ bool FrameLoaderClientWinCE::canHandleRequest(const WebCore::ResourceRequest&) c
 
 bool FrameLoaderClientWinCE::canShowMIMEType(const String& type) const
 {
-    return (MIMETypeRegistry::canShowMIMEType(type)
+    return (MIMETypeRegistry::isSupportedImageMIMEType(type)
+            || MIMETypeRegistry::isSupportedNonImageMIMEType(type)
+            || MIMETypeRegistry::isSupportedMediaMIMEType(type)
             || PluginDatabase::installedPlugins()->isMIMETypeRegistered(type));
 }
 
diff --git a/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.h b/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.h
index c2748cf46..90ee494a4 100644
--- a/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.h
+++ b/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.h
@@ -108,7 +108,6 @@ public:
     virtual PassRefPtr<WebCore::Frame> createFrame(const WebCore::KURL& url, const WTF::String& name, WebCore::HTMLFrameOwnerElement* ownerElement,
                                const WTF::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight);
     virtual PassRefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::KURL&, const WTF::Vector<WTF::String>&, const WTF::Vector<WTF::String>&, const WTF::String&, bool);
-    virtual void recreatePlugin(WebCore::Widget*) { }
     virtual void redirectDataToPlugin(WebCore::Widget* pluginWidget);
     virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::KURL& baseURL, const WTF::Vector<WTF::String>& paramNames, const WTF::Vector<WTF::String>& paramValues);
     virtual WTF::String overrideMediaType() const;
diff --git a/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp b/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp
index d55797231..3f8c907c7 100644
--- a/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp
+++ b/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp
@@ -94,8 +94,8 @@ void PlatformStrategiesWinCE::getPluginInfo(const Page*, Vector<PluginInfo>& out
         for (MIMEToDescriptionsMap::const_iterator it = mimeToDescriptions.begin(); it != end; ++it) {
             MimeClassInfo mime;
 
-            mime.type = it->key;
-            mime.desc = it->value;
+            mime.type = it->first;
+            mime.desc = it->second;
             mime.extensions = package->mimeToExtensions().get(mime.type);
 
             info.mimes.append(mime);