Merge in WebKit r47029.

5 files changed, 33 insertions, 6 deletions

diff --git a/WebCore/platform/wx/ClipboardWx.cpp b/WebCore/platform/wx/ClipboardWx.cpp
index 461cc66..0b02009 100644
--- a/WebCore/platform/wx/ClipboardWx.cpp
+++ b/WebCore/platform/wx/ClipboardWx.cpp
@@ -25,6 +25,8 @@
 
 #include "config.h"
 #include "ClipboardWx.h"
+
+#include "FileList.h"
 #include "HashTable.h"
 #include "IntPoint.h"
 #include "NotImplemented.h"
@@ -70,6 +72,12 @@ HashSet<String> ClipboardWx::types() const
     return result;
 }
 
+PassRefPtr<FileList> ClipboardWx::files() const
+{
+    notImplemented();
+    return 0;
+}
+
 IntPoint ClipboardWx::dragLocation() const 
 { 
     notImplemented();
diff --git a/WebCore/platform/wx/ClipboardWx.h b/WebCore/platform/wx/ClipboardWx.h
index db5f7a8..5e3ba86 100644
--- a/WebCore/platform/wx/ClipboardWx.h
+++ b/WebCore/platform/wx/ClipboardWx.h
@@ -46,7 +46,8 @@ namespace WebCore {
         bool setData(const String& type, const String& data);
     
         // extensions beyond IE's API
-        HashSet<String> types() const;
+        virtual HashSet<String> types() const;
+        virtual PassRefPtr<FileList> files() const;
     
         IntPoint dragLocation() const;
         CachedImage* dragImage() const;
diff --git a/WebCore/platform/wx/RenderThemeWx.cpp b/WebCore/platform/wx/RenderThemeWx.cpp
index a26416f..f2ced9e 100644
--- a/WebCore/platform/wx/RenderThemeWx.cpp
+++ b/WebCore/platform/wx/RenderThemeWx.cpp
@@ -44,8 +44,12 @@
 namespace WebCore {
 
 class RenderThemeWx : public RenderTheme {
-public:
+private:
     RenderThemeWx() : RenderTheme() { }
+    virtual ~RenderThemeWx();
+
+public:
+    static PassRefPtr<RenderTheme> create();
 
     // A method asking if the theme's controls actually care about redrawing when hovered.
     virtual bool supportsHover(const RenderStyle*) const { return true; }
@@ -119,10 +123,19 @@ private:
 #define POPUP_INTERNAL_PADDING_RIGHT 20
 #endif
 
-RenderTheme* theme()
+RenderThemeWx::~RenderThemeWx()
+{
+}
+
+PassRefPtr<RenderTheme> RenderThemeWx::create()
+{
+    return adoptRef(new RenderThemeWx());
+}
+
+PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page* page)
 {
-    static RenderThemeWx rt;
-    return &rt;
+    static RenderTheme* rt = RenderThemeWx::create().releaseRef();
+    return rt;
 }
 
 bool RenderThemeWx::isControlStyled(const RenderStyle* style, const BorderData& border,
diff --git a/WebCore/platform/wx/SharedTimerWx.cpp b/WebCore/platform/wx/SharedTimerWx.cpp
index b2b22e4..d6d6bb4 100644
--- a/WebCore/platform/wx/SharedTimerWx.cpp
+++ b/WebCore/platform/wx/SharedTimerWx.cpp
@@ -77,7 +77,7 @@ void setSharedTimerFireTime(double fireTime)
     if (!wkTimer)
         wkTimer = new WebKitTimer();
         
-    unsigned int intervalInMS = interval * 1000;
+    int intervalInMS = interval * 1000;
 
     // sanity check
     if (intervalInMS < 1)
diff --git a/WebCore/platform/wx/TemporaryLinkStubs.cpp b/WebCore/platform/wx/TemporaryLinkStubs.cpp
index dfd2ad5..9f2cd91 100644
--- a/WebCore/platform/wx/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/wx/TemporaryLinkStubs.cpp
@@ -118,9 +118,13 @@ void GraphicsContext::setLineJoin(LineJoin) { notImplemented(); }
 void GraphicsContext::setMiterLimit(float) { notImplemented(); }
 void GraphicsContext::setAlpha(float) { notImplemented(); }
 
+#ifdef MANUAL_MERGE_REQUIRED
 Color WebCore::focusRingColor() { return 0xFF0000FF; }
 
 void Image::drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, CompositeOperator, const FloatRect& destRect) { notImplemented(); } 
+#else // MANUAL_MERGE_REQUIRED
+void Image::drawPattern(GraphicsContext*, const FloatRect& srcRect, const TransformationMatrix& patternTransform, const FloatPoint& phase, CompositeOperator, const FloatRect& destRect) { notImplemented(); } 
+#endif // MANUAL_MERGE_REQUIRED
 
 ScrollbarTheme* ScrollbarTheme::nativeTheme() { notImplemented(); static ScrollbarTheme theme; return &theme; }
 
@@ -170,6 +174,7 @@ namespace WebCore {
 float userIdleTime() { notImplemented(); return FLT_MAX; } // return an arbitrarily high userIdleTime so that releasing pages from the page cache isn't postponed
 void getSupportedKeySizes(Vector<String>&) { notImplemented(); }
 String signedPublicKeyAndChallengeString(unsigned keySizeIndex, const String &challengeString, const KURL &url) { return String(); }
+const char* currentSearchLocaleID() { notImplemented(); return ""; }
 const char* currentTextBreakLocaleID() { notImplemented(); return "en_us"; }
 
 String KURL::fileSystemPath() const { notImplemented(); return String(); }