diff options
Diffstat (limited to 'WebKit/haiku/WebCoreSupport')
6 files changed, 35 insertions, 14 deletions
diff --git a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp index 4820d78..24f0b52 100644 --- a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp +++ b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp @@ -98,6 +98,10 @@ void ChromeClientHaiku::takeFocus(FocusDirection) notImplemented(); } +void ChromeClientHaiku::focusedNodeChanged(Node*) +{ +} + Page* ChromeClientHaiku::createWindow(Frame*, const FrameLoadRequest&, const WebCore::WindowFeatures&) { notImplemented(); diff --git a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h index a6f57eb..ecd66de 100644 --- a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h +++ b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h @@ -57,6 +57,8 @@ namespace WebCore { bool canTakeFocus(FocusDirection); void takeFocus(FocusDirection); + void focusedNodeChanged(Node*); + Page* createWindow(Frame*, const FrameLoadRequest&, const WebCore::WindowFeatures&); Page* createModalDialog(Frame*, const FrameLoadRequest&); void show(); diff --git a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp index 9ade67b..3a84c4f 100644 --- a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp +++ b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp @@ -42,6 +42,7 @@ #include "Page.h" #include "PlatformString.h" #include "ResourceRequest.h" +#include "ScriptController.h" #include "WebView.h" #include <Message.h> @@ -207,6 +208,21 @@ void FrameLoaderClientHaiku::dispatchDidChangeLocationWithinPage() notImplemented(); } +void FrameLoaderClientHaiku::dispatchDidPushStateWithinPage() +{ + notImplemented(); +} + +void FrameLoaderClientHaiku::dispatchDidReplaceStateWithinPage() +{ + notImplemented(); +} + +void FrameLoaderClientHaiku::dispatchDidPopStateWithinPage() +{ + notImplemented(); +} + void FrameLoaderClientHaiku::dispatchWillClose() { notImplemented(); @@ -771,8 +787,11 @@ String FrameLoaderClientHaiku::overrideMediaType() const return String(); } -void FrameLoaderClientHaiku::windowObjectCleared() +void FrameLoaderClientHaiku::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld* world) { + if (world != mainThreadNormalWorld()) + return; + if (m_webView) { BMessage message(JAVASCRIPT_WINDOW_OBJECT_CLEARED); m_messenger->SendMessage(&message); diff --git a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h index d91320c..2ffde8f 100644 --- a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h +++ b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h @@ -94,9 +94,11 @@ namespace WebCore { virtual void dispatchDidHandleOnloadEvents(); virtual void dispatchDidReceiveServerRedirectForProvisionalLoad(); virtual void dispatchDidCancelClientRedirect(); - virtual void dispatchWillPerformClientRedirect(const KURL&, double interval, - double fireDate); + virtual void dispatchWillPerformClientRedirect(const KURL&, double interval, double fireDate); virtual void dispatchDidChangeLocationWithinPage(); + virtual void dispatchDidPushStateWithinPage(); + virtual void dispatchDidReplaceStateWithinPage(); + virtual void dispatchDidPopStateWithinPage(); virtual void dispatchWillClose(); virtual void dispatchDidReceiveIcon(); virtual void dispatchDidStartProvisionalLoad(); @@ -231,7 +233,7 @@ namespace WebCore { virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType); virtual String overrideMediaType() const; - virtual void windowObjectCleared(); + virtual void dispatchDidClearWindowObjectInWorld(DOMWrapperWorld*); virtual void documentElementAvailable(); virtual void didPerformFirstNavigation() const; diff --git a/WebKit/haiku/WebCoreSupport/InspectorClientHaiku.cpp b/WebKit/haiku/WebCoreSupport/InspectorClientHaiku.cpp index 4064c51..f06e96b 100644 --- a/WebKit/haiku/WebCoreSupport/InspectorClientHaiku.cpp +++ b/WebKit/haiku/WebCoreSupport/InspectorClientHaiku.cpp @@ -105,17 +105,12 @@ void InspectorClientHaiku::inspectorWindowObjectCleared() notImplemented(); } -void InspectorClientHaiku::populateSetting(const String& key, InspectorController::Setting&) +void InspectorClientHaiku::populateSetting(const String& key, String* value) { notImplemented(); } -void InspectorClientHaiku::storeSetting(const String& key, const InspectorController::Setting&) -{ - notImplemented(); -} - -void InspectorClientHaiku::removeSetting(const String& key) +void InspectorClientHaiku::storeSetting(const String& key, const String& value) { notImplemented(); } diff --git a/WebKit/haiku/WebCoreSupport/InspectorClientHaiku.h b/WebKit/haiku/WebCoreSupport/InspectorClientHaiku.h index 792ef40..8788a5f 100644 --- a/WebKit/haiku/WebCoreSupport/InspectorClientHaiku.h +++ b/WebKit/haiku/WebCoreSupport/InspectorClientHaiku.h @@ -61,9 +61,8 @@ namespace WebCore { virtual void inspectedURLChanged(const String& newURL); - virtual void populateSetting(const String& key, InspectorController::Setting&); - virtual void storeSetting(const String& key, const InspectorController::Setting&); - virtual void removeSetting(const String& key); + virtual void populateSetting(const WebCore::String& key, WebCore::String* value); + virtual void storeSetting(const WebCore::String& key, const WebCore::String& value); virtual void inspectorWindowObjectCleared(); }; |