Merge webkit.org at r58033 : Initial merge by git

Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1

7 files changed, 25 insertions, 80 deletions

diff --git a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp
index a7f1145..2cf5c31 100644
--- a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp
+++ b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp
@@ -32,6 +32,7 @@
 #include "FrameLoadRequest.h"
 #include "FrameView.h"
 #include "HitTestResult.h"
+#include "Icon.h"
 #include "NotImplemented.h"
 #include "PlatformString.h"
 
@@ -253,7 +254,17 @@ IntRect ChromeClientHaiku::windowResizerRect() const
     return IntRect();
 }
 
-void ChromeClientHaiku::repaint(const IntRect&, bool contentChanged, bool immediate, bool repaintContentOnly)
+void ChromeClientHaiku::invalidateWindow(const IntRect&, bool)
+{
+    notImplemented();
+}
+
+void ChromeClientHaiku::invalidateContentsAndWindow(const IntRect&, bool)
+{
+    notImplemented();
+}
+
+void ChromeClientHaiku::invalidateContentsForSlowScroll(const IntRect&, bool)
 {
     notImplemented();
 }
@@ -346,9 +357,9 @@ void ChromeClientHaiku::runOpenPanel(Frame*, PassRefPtr<FileChooser>)
     notImplemented();
 }
 
-void ChromeClientHaiku::iconForFiles(const Vector<String>&, PassRefPtr<FileChooser>)
+void ChromeClientHaiku::chooseIconForFiles(const Vector<String>& filenames, FileChooser* chooser)
 {
-    notImplemented();
+    chooser->iconLoaded(Icon::createIconForFiles(filenames));
 }
 
 bool ChromeClientHaiku::setCursor(PlatformCursorHandle)
diff --git a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
index 3b0841b..d5a372b 100644
--- a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
+++ b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
@@ -102,8 +102,11 @@ namespace WebCore {
         bool tabsToLinks() const;
         IntRect windowResizerRect() const;
 
-        void repaint(const IntRect&, bool contentChanged, bool immediate = false, bool repaintContentOnly = false);
+        void invalidateWindow(const IntRect&, bool);
+        void invalidateContentsAndWindow(const IntRect&, bool);
+        void invalidateContentsForSlowScroll(const IntRect&, bool);
         void scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect);
+
         IntPoint screenToWindow(const IntPoint&) const;
         IntRect windowToScreen(const IntRect&) const;
         PlatformPageClient platformPageClient() const;
@@ -130,11 +133,12 @@ namespace WebCore {
 #endif
 
         // This is an asynchronous call. The ChromeClient can display UI asking the user for permission
-        // to use Geolococation. The ChromeClient must call Geolocation::setShouldClearCache() appropriately.
+        // to use Geolococation.
         void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
+        void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) { }
 
         void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
-        void iconForFiles(const Vector<String>&, PassRefPtr<FileChooser>);
+        void chooseIconForFiles(const Vector<String>&, FileChooser*);
 
         bool setCursor(PlatformCursorHandle);
 
diff --git a/WebKit/haiku/WebCoreSupport/EditorClientHaiku.cpp b/WebKit/haiku/WebCoreSupport/EditorClientHaiku.cpp
index a51e361..48957a0 100644
--- a/WebKit/haiku/WebCoreSupport/EditorClientHaiku.cpp
+++ b/WebKit/haiku/WebCoreSupport/EditorClientHaiku.cpp
@@ -36,10 +36,10 @@
 #include "Editor.h"
 #include "FocusController.h"
 #include "Frame.h"
-#include "KeyboardCodes.h"
 #include "KeyboardEvent.h"
 #include "Page.h"
 #include "PlatformKeyboardEvent.h"
+#include "WindowsKeyboardCodes.h"
 
 #include "NotImplemented.h"
 
diff --git a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp
index 77c7cfc..430194a 100644
--- a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp
+++ b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp
@@ -510,7 +510,7 @@ void FrameLoaderClientHaiku::committedLoad(WebCore::DocumentLoader* loader, cons
         return;
 
     FrameLoader* frameLoader = loader->frameLoader();
-    frameLoader->setEncoding(m_response.textEncodingName(), false);
+    frameLoader->writer()->setEncoding(m_response.textEncodingName(), false);
     frameLoader->addData(data, length);
 }
 
@@ -634,11 +634,6 @@ bool FrameLoaderClientHaiku::dispatchDidLoadResourceFromMemoryCache(DocumentLoad
     return false;
 }
 
-void FrameLoaderClientHaiku::dispatchDidLoadResourceByXMLHttpRequest(unsigned long, const ScriptString&)
-{
-    notImplemented();
-}
-
 void FrameLoaderClientHaiku::dispatchDidFailProvisionalLoad(const ResourceError&)
 {
     notImplemented();
diff --git a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h
index dadda19..cf2fb06 100644
--- a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h
+++ b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h
@@ -194,7 +194,6 @@ namespace WebCore {
         virtual bool dispatchDidLoadResourceFromMemoryCache(DocumentLoader*,
                                                             const ResourceRequest&,
                                                             const ResourceResponse&, int);
-        virtual void dispatchDidLoadResourceByXMLHttpRequest(unsigned long, const ScriptString&);
 
         virtual void dispatchDidFailProvisionalLoad(const ResourceError&);
         virtual void dispatchDidFailLoad(const ResourceError&);
diff --git a/WebKit/haiku/WebCoreSupport/InspectorClientHaiku.cpp b/WebKit/haiku/WebCoreSupport/InspectorClientHaiku.cpp
index f06e96b..59232e9 100644
--- a/WebKit/haiku/WebCoreSupport/InspectorClientHaiku.cpp
+++ b/WebKit/haiku/WebCoreSupport/InspectorClientHaiku.cpp
@@ -42,45 +42,7 @@ void InspectorClientHaiku::inspectorDestroyed()
     notImplemented();
 }
 
-Page* InspectorClientHaiku::createPage()
-{
-    notImplemented();
-    return 0;
-}
-
-String InspectorClientHaiku::localizedStringsURL()
-{
-    notImplemented();
-    return String();
-}
-
-String InspectorClientHaiku::hiddenPanels()
-{
-    notImplemented();
-    return String();
-}
-
-void InspectorClientHaiku::showWindow()
-{
-    notImplemented();
-}
-
-void InspectorClientHaiku::closeWindow()
-{
-    notImplemented();
-}
-
-void InspectorClientHaiku::attachWindow()
-{
-    notImplemented();
-}
-
-void InspectorClientHaiku::detachWindow()
-{
-    notImplemented();
-}
-
-void InspectorClientHaiku::setAttachedWindowHeight(unsigned height)
+void InspectorClientHaiku::openInspectorFrontend(WebCore::InspectorController*)
 {
     notImplemented();
 }
@@ -95,16 +57,6 @@ void InspectorClientHaiku::hideHighlight()
     notImplemented();
 }
 
-void InspectorClientHaiku::inspectedURLChanged(const String&)
-{
-    notImplemented();
-}
-
-void InspectorClientHaiku::inspectorWindowObjectCleared()
-{
-    notImplemented();
-}
-
 void InspectorClientHaiku::populateSetting(const String& key, String* value)
 {
     notImplemented();
diff --git a/WebKit/haiku/WebCoreSupport/InspectorClientHaiku.h b/WebKit/haiku/WebCoreSupport/InspectorClientHaiku.h
index 8788a5f..d427670 100644
--- a/WebKit/haiku/WebCoreSupport/InspectorClientHaiku.h
+++ b/WebKit/haiku/WebCoreSupport/InspectorClientHaiku.h
@@ -42,29 +42,13 @@ namespace WebCore {
     public:
         virtual void inspectorDestroyed();
 
-        virtual Page* createPage();
-
-        virtual String localizedStringsURL();
-
-        virtual String hiddenPanels();
-
-        virtual void showWindow();
-        virtual void closeWindow();
-
-        virtual void attachWindow();
-        virtual void detachWindow();
-
-        virtual void setAttachedWindowHeight(unsigned height);
+        virtual void openInspectorFrontend(WebCore::InspectorController*);
 
         virtual void highlight(Node*);
         virtual void hideHighlight();
 
-        virtual void inspectedURLChanged(const String& newURL);
-
         virtual void populateSetting(const WebCore::String& key, WebCore::String* value);
         virtual void storeSetting(const WebCore::String& key, const WebCore::String& value);
-
-        virtual void inspectorWindowObjectCleared();
     };
 } // namespace WebCore