summaryrefslogtreecommitdiffstats
path: root/WebKit/wx/WebKitSupport
diff options
context:
space:
mode:
Diffstat (limited to 'WebKit/wx/WebKitSupport')
-rw-r--r--WebKit/wx/WebKitSupport/ChromeClientWx.cpp25
-rw-r--r--WebKit/wx/WebKitSupport/ChromeClientWx.h8
-rw-r--r--WebKit/wx/WebKitSupport/EditorClientWx.cpp3
-rw-r--r--WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp12
-rw-r--r--WebKit/wx/WebKitSupport/FrameLoaderClientWx.h2
-rw-r--r--WebKit/wx/WebKitSupport/InspectorClientWx.cpp50
-rw-r--r--WebKit/wx/WebKitSupport/InspectorClientWx.h18
7 files changed, 34 insertions, 84 deletions
diff --git a/WebKit/wx/WebKitSupport/ChromeClientWx.cpp b/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
index ac25daf..a19644d 100644
--- a/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
+++ b/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
@@ -35,6 +35,7 @@
#include "FloatRect.h"
#include "Frame.h"
#include "FrameLoadRequest.h"
+#include "Icon.h"
#include "NotImplemented.h"
#include "PlatformString.h"
#include "WindowFeatures.h"
@@ -336,14 +337,24 @@ IntRect ChromeClientWx::windowResizerRect() const
return IntRect();
}
-void ChromeClientWx::repaint(const IntRect& rect, bool contentChanged, bool immediate, bool repaintContentOnly)
+void ChromeClientWx::invalidateWindow(const IntRect& rect, bool immediate)
+{
+ if (immediate)
+ m_webView->Update();
+}
+
+void ChromeClientWx::invalidateContentsForSlowScroll(const IntRect& rect, bool immediate)
+{
+ invalidateContentsAndWindow(rect, immediate);
+}
+
+void ChromeClientWx::invalidateContentsAndWindow(const IntRect& rect, bool immediate)
{
if (!m_webView)
return;
-
- if (contentChanged)
- m_webView->RefreshRect(rect);
-
+
+ m_webView->RefreshRect(rect);
+
if (immediate) {
m_webView->Update();
}
@@ -431,9 +442,9 @@ void ChromeClientWx::runOpenPanel(Frame*, PassRefPtr<FileChooser>)
notImplemented();
}
-void ChromeClientWx::iconForFiles(const Vector<String>&, PassRefPtr<FileChooser>)
+void ChromeClientWx::chooseIconForFiles(const Vector<String>& filenames, FileChooser* chooser)
{
- notImplemented();
+ chooser->iconLoaded(Icon::createIconForFiles(filenames));
}
bool ChromeClientWx::setCursor(PlatformCursorHandle)
diff --git a/WebKit/wx/WebKitSupport/ChromeClientWx.h b/WebKit/wx/WebKitSupport/ChromeClientWx.h
index 71ae48d..b900f3e 100644
--- a/WebKit/wx/WebKitSupport/ChromeClientWx.h
+++ b/WebKit/wx/WebKitSupport/ChromeClientWx.h
@@ -102,8 +102,11 @@ public:
virtual void scrollBackingStore(int dx, int dy, const IntRect& scrollViewRect, const IntRect& clipRect);
virtual void updateBackingStore();
- virtual void repaint(const IntRect&, bool contentChanged, bool immediate = false, bool repaintContentOnly = false);
+ virtual void invalidateWindow(const IntRect&, bool);
+ virtual void invalidateContentsAndWindow(const IntRect&, bool);
+ virtual void invalidateContentsForSlowScroll(const IntRect&, bool);
virtual void scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect);
+
virtual IntPoint screenToWindow(const IntPoint&) const;
virtual IntRect windowToScreen(const IntRect&) const;
virtual PlatformPageClient platformPageClient() const;
@@ -125,7 +128,7 @@ public:
#endif
virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
- virtual void iconForFiles(const Vector<String>&, PassRefPtr<FileChooser>);
+ virtual void chooseIconForFiles(const Vector<String>&, FileChooser*);
virtual void formStateDidChange(const Node*) { }
@@ -136,6 +139,7 @@ public:
virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const {}
virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
+ virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) { }
private:
wxWebView* m_webView;
diff --git a/WebKit/wx/WebKitSupport/EditorClientWx.cpp b/WebKit/wx/WebKitSupport/EditorClientWx.cpp
index b130557..627ebf9 100644
--- a/WebKit/wx/WebKitSupport/EditorClientWx.cpp
+++ b/WebKit/wx/WebKitSupport/EditorClientWx.cpp
@@ -34,17 +34,16 @@
#include "FrameView.h"
#include "HostWindow.h"
#include "KeyboardEvent.h"
-#include "KeyboardCodes.h"
#include "NotImplemented.h"
#include "Page.h"
#include "PlatformKeyboardEvent.h"
#include "PlatformString.h"
#include "SelectionController.h"
-
#include "WebFrame.h"
#include "WebFramePrivate.h"
#include "WebView.h"
#include "WebViewPrivate.h"
+#include "WindowsKeyboardCodes.h"
#include <stdio.h>
diff --git a/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp b/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
index 6afdd88..a163727 100644
--- a/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
+++ b/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
@@ -325,6 +325,11 @@ void FrameLoaderClientWx::dispatchDidFinishDocumentLoad()
}
}
+void FrameLoaderClientWx::dispatchDidChangeIcons()
+{
+ notImplemented();
+}
+
void FrameLoaderClientWx::dispatchDidFinishLoad()
{
notImplemented();
@@ -604,7 +609,7 @@ void FrameLoaderClientWx::committedLoad(WebCore::DocumentLoader* loader, const c
return;
if (!m_pluginView) {
FrameLoader* fl = loader->frameLoader();
- fl->setEncoding(m_response.textEncodingName(), false);
+ fl->writer()->setEncoding(m_response.textEncodingName(), false);
fl->addData(data, length);
}
@@ -733,11 +738,6 @@ bool FrameLoaderClientWx::dispatchDidLoadResourceFromMemoryCache(DocumentLoader*
return false;
}
-void FrameLoaderClientWx::dispatchDidLoadResourceByXMLHttpRequest(unsigned long, const ScriptString&)
-{
- notImplemented();
-}
-
void FrameLoaderClientWx::dispatchDidFailProvisionalLoad(const ResourceError&)
{
notImplemented();
diff --git a/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h b/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h
index 62218ff..e9f566b 100644
--- a/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h
+++ b/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h
@@ -108,6 +108,7 @@ namespace WebCore {
virtual void dispatchDidFinishLoad();
virtual void dispatchDidFirstLayout();
virtual void dispatchDidFirstVisuallyNonEmptyLayout();
+ virtual void dispatchDidChangeIcons();
virtual void dispatchShow();
virtual void cancelPolicyCheck();
@@ -184,7 +185,6 @@ namespace WebCore {
virtual void dispatchDidFinishLoading(DocumentLoader*, unsigned long);
virtual void dispatchDidFailLoading(DocumentLoader*, unsigned long, const ResourceError&);
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/wx/WebKitSupport/InspectorClientWx.cpp b/WebKit/wx/WebKitSupport/InspectorClientWx.cpp
index ff21ae0..5dc9ac7 100644
--- a/WebKit/wx/WebKitSupport/InspectorClientWx.cpp
+++ b/WebKit/wx/WebKitSupport/InspectorClientWx.cpp
@@ -47,45 +47,7 @@ void InspectorClientWx::inspectorDestroyed()
notImplemented();
}
-Page* InspectorClientWx::createPage()
-{
- notImplemented();
- return 0;
-}
-
-String InspectorClientWx::localizedStringsURL()
-{
- notImplemented();
- return String();
-}
-
-String InspectorClientWx::hiddenPanels()
-{
- notImplemented();
- return String();
-}
-
-void InspectorClientWx::showWindow()
-{
- notImplemented();
-}
-
-void InspectorClientWx::closeWindow()
-{
- notImplemented();
-}
-
-void InspectorClientWx::attachWindow()
-{
- notImplemented();
-}
-
-void InspectorClientWx::detachWindow()
-{
- notImplemented();
-}
-
-void InspectorClientWx::setAttachedWindowHeight(unsigned height)
+void InspectorClientWx::openInspectorFrontend(WebCore::InspectorController*)
{
notImplemented();
}
@@ -100,11 +62,6 @@ void InspectorClientWx::hideHighlight()
notImplemented();
}
-void InspectorClientWx::inspectedURLChanged(const String& newURL)
-{
- notImplemented();
-}
-
void InspectorClientWx::populateSetting(const String& key, String* setting)
{
notImplemented();
@@ -115,9 +72,4 @@ void InspectorClientWx::storeSetting(const String& key, const String& setting)
notImplemented();
}
-void InspectorClientWx::inspectorWindowObjectCleared()
-{
- notImplemented();
-}
-
};
diff --git a/WebKit/wx/WebKitSupport/InspectorClientWx.h b/WebKit/wx/WebKitSupport/InspectorClientWx.h
index f905817..7675dc1 100644
--- a/WebKit/wx/WebKitSupport/InspectorClientWx.h
+++ b/WebKit/wx/WebKitSupport/InspectorClientWx.h
@@ -41,29 +41,13 @@ 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 String& key, String* value);
virtual void storeSetting(const String& key, const String& value);
-
- virtual void inspectorWindowObjectCleared();
};
} // namespace WebCore
generated by cgit v1.1 at 2025-05-19 11:23:17 +0000