Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)

New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.

3 files changed, 44 insertions, 5 deletions

diff --git a/Source/WebKit/wince/ChangeLog b/Source/WebKit/wince/ChangeLog
index dbecfc31f..2fa3f132d 100644
--- a/Source/WebKit/wince/ChangeLog
+++ b/Source/WebKit/wince/ChangeLog
@@ -1,3 +1,28 @@
+2012-10-24  Brady Eidson  <beidson@apple.com>
+
+        Add a strategy for loader customization.
+        https://bugs.webkit.org/show_bug.cgi?id=100278
+
+        Reviewed by Alexey Proskuryakov.
+
+        * WebCoreSupport/PlatformStrategiesWinCE.cpp:
+        (PlatformStrategiesWinCE::createLoaderStrategy):
+        * WebCoreSupport/PlatformStrategiesWinCE.h:
+        (PlatformStrategiesWinCE):
+
+2012-10-23  Alexey Proskuryakov  <ap@apple.com>
+
+        Add a strategy for shared workers
+        https://bugs.webkit.org/show_bug.cgi?id=100165
+
+        Reviewed by Brady Eidson.
+
+        * WebCoreSupport/PlatformStrategiesWinCE.cpp:
+        (PlatformStrategiesWinCE::createPasteboardStrategy):
+        (PlatformStrategiesWinCE::createSharedWorkerStrategy):
+        (PlatformStrategiesWinCE::createVisitedLinkStrategy):
+        * WebCoreSupport/PlatformStrategiesWinCE.h:
+
 2012-10-10  Jon Lee  <jonlee@apple.com>
 
         [WK2] Activate plugins when user clicks on snapshot
diff --git a/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp b/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp
index d55797231..425b0f3a8 100644
--- a/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp
+++ b/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp
@@ -48,19 +48,29 @@ CookiesStrategy* PlatformStrategiesWinCE::createCookiesStrategy()
     return this;
 }
 
+LoaderStrategy* PlatformStrategiesWinCE::createLoaderStrategy()
+{
+    return this;
+}
+
+PasteboardStrategy* PlatformStrategiesWinCE::createPasteboardStrategy()
+{
+    return 0;
+}
+
 PluginStrategy* PlatformStrategiesWinCE::createPluginStrategy()
 {
     return this;
 }
 
-VisitedLinkStrategy* PlatformStrategiesWinCE::createVisitedLinkStrategy()
+SharedWorkerStrategy* PlatformStrategiesWinCE::createSharedWorkerStrategy()
 {
     return this;
 }
 
-PasteboardStrategy* PlatformStrategiesWinCE::createPasteboardStrategy()
+VisitedLinkStrategy* PlatformStrategiesWinCE::createVisitedLinkStrategy()
 {
-    return 0;
+    return this;
 }
 
 void PlatformStrategiesWinCE::notifyCookiesChanged()
diff --git a/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.h b/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.h
index 344635690..2ce48203c 100644
--- a/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.h
+++ b/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.h
@@ -26,11 +26,13 @@
 #define PlatformStrategiesWinCE_h
 
 #include "CookiesStrategy.h"
+#include "LoaderStrategy.h"
 #include "PlatformStrategies.h"
 #include "PluginStrategy.h"
+#include "SharedWorkerStrategy.h"
 #include "VisitedLinkStrategy.h"
 
-class PlatformStrategiesWinCE : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::PluginStrategy, private WebCore::VisitedLinkStrategy {
+class PlatformStrategiesWinCE : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::LoaderStrategy, private WebCore::PluginStrategy, private WebCore::SharedWorkerStrategy, private WebCore::VisitedLinkStrategy {
 public:
     static void initialize();
 
@@ -39,9 +41,11 @@ private:
 
     // WebCore::PlatformStrategies
     virtual WebCore::CookiesStrategy* createCookiesStrategy();
+    virtual WebCore::LoaderStrategy* createLoaderStrategy();
+    virtual WebCore::PasteboardStrategy* createPasteboardStrategy();
     virtual WebCore::PluginStrategy* createPluginStrategy();
+    virtual WebCore::SharedWorkerStrategy* createSharedWorkerStrategy();
     virtual WebCore::VisitedLinkStrategy* createVisitedLinkStrategy();
-    virtual WebCore::PasteboardStrategy* createPasteboardStrategy();
 
     // WebCore::CookiesStrategy
     virtual void notifyCookiesChanged();