summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/wx
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit/wx')
-rw-r--r--Source/WebKit/wx/ChangeLog129
-rw-r--r--Source/WebKit/wx/WebFrame.cpp11
-rw-r--r--Source/WebKit/wx/WebFrame.h3
-rw-r--r--Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp4
-rw-r--r--Source/WebKit/wx/WebKitSupport/ChromeClientWx.h2
-rw-r--r--Source/WebKit/wx/WebKitSupport/EditorClientWx.cpp22
-rw-r--r--Source/WebKit/wx/WebKitSupport/EditorClientWx.h7
-rw-r--r--Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp14
-rw-r--r--Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h3
-rw-r--r--Source/WebKit/wx/WebView.cpp2
-rw-r--r--Source/WebKit/wx/WebView.h1
11 files changed, 167 insertions, 31 deletions
diff --git a/Source/WebKit/wx/ChangeLog b/Source/WebKit/wx/ChangeLog
index 13ab1b8..3e385b1 100644
--- a/Source/WebKit/wx/ChangeLog
+++ b/Source/WebKit/wx/ChangeLog
@@ -1,3 +1,132 @@
+2011-03-07 Sam Weinig <sam@webkit.org>
+
+ Reviewed by Anders Carlsson.
+
+ Replace WebKit2's decidePolicyForMIMEType with decidePolicyForResponse
+ https://bugs.webkit.org/show_bug.cgi?id=55827
+
+ Renamed FrameLoaderClient::dispatchDecidePolicyForMIMEType to dispatchDecidePolicyForResponse
+ and pass the entire response, instead of just the MIMEType.
+
+ * WebKitSupport/FrameLoaderClientWx.cpp:
+ (WebCore::FrameLoaderClientWx::dispatchDecidePolicyForResponse):
+ * WebKitSupport/FrameLoaderClientWx.h:
+
+2011-03-03 Alexey Proskuryakov <ap@apple.com>
+
+ Removing an include of WebCoreKeyboardUIMode.h that Ive just added. It's already included
+ via ChromeClient.h
+
+ * WebKitSupport/ChromeClientWx.h:
+
+2011-03-02 Alexey Proskuryakov <ap@apple.com>
+
+ Reviewed by Darin Adler.
+
+ REGRESSION (WebKit2): Tab keys no longer observe Full Keyboard Access
+ https://bugs.webkit.org/show_bug.cgi?id=55633
+ <rdar://problem/8963023>
+
+ * WebKitSupport/ChromeClientWx.cpp: (WebCore::ChromeClientWx::keyboardUIMode):
+ * WebKitSupport/ChromeClientWx.h:
+ Implement keyboardUIMode() instead of tabsToLinks(). No change in functionality, since
+ this platform doesn't observe or have full keyboard access state.
+
+2011-03-01 Kevin Ollivier <kevino@theolliviers.com>
+
+ [wx] Build fix after removal of Frame::isContentEditable.
+
+ * WebFrame.cpp:
+ (wxWebFrame::IsEditable):
+
+2011-02-28 Chang Shu <cshu@webkit.org>
+
+ Reviewed by Ryosuke Niwa.
+
+ Remove the support of Frame::isContentEditable and its dependencies.
+ https://bugs.webkit.org/show_bug.cgi?id=54292
+
+ Remove the WebKit side implementation. Make WebKit support depend on Document::inDesignMode.
+
+ * WebFrame.cpp:
+ (wxWebFrame::wxWebFrame):
+ (wxWebFrame::MakeEditable):
+ (wxWebFrame::IsEditable):
+ * WebFrame.h:
+ * WebKitSupport/EditorClientWx.cpp:
+ * WebKitSupport/EditorClientWx.h:
+ * WebView.cpp:
+ (wxWebView::wxWebView):
+ * WebView.h:
+
+2011-02-24 Peter Kasting <pkasting@google.com>
+
+ Reviewed by Eric Seidel.
+
+ Drop the "U; " encryption level from the User Agent string.
+ https://bugs.webkit.org/show_bug.cgi?id=54566
+
+ * WebKitSupport/FrameLoaderClientWx.cpp:
+ (WebCore::FrameLoaderClientWx::userAgent):
+
+2011-02-22 Laszlo Gombos <laszlo.1.gombos@nokia.com>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Drop the language tag part from the User Agent string
+ https://bugs.webkit.org/show_bug.cgi?id=54560
+
+ * WebKitSupport/FrameLoaderClientWx.cpp:
+ (WebCore::FrameLoaderClientWx::userAgent):
+
+2011-02-19 Charlie Reis <creis@chromium.org>
+
+ Reviewed by Mihai Parparita.
+
+ Ensure loading has stopped in HistoryController::goToItem
+ https://bugs.webkit.org/show_bug.cgi?id=54517
+
+ Add a FrameLoaderClient callback for whether to stop loading before goToItem.
+
+ Test: http/tests/navigation/forward-to-fragment-fires-onload.html
+
+ * WebKitSupport/FrameLoaderClientWx.cpp:
+ (WebCore::FrameLoaderClientWx::shouldStopLoadingForHistoryItem): Added.
+ * WebKitSupport/FrameLoaderClientWx.h:
+
+2011-02-17 Kevin Ollivier <kevino@theolliviers.com>
+
+ [wx] Build fix after move of DocumentWriter to DocumentLoader.
+
+ * WebKitSupport/FrameLoaderClientWx.cpp:
+ (WebCore::FrameLoaderClientWx::setMainDocumentError):
+ (WebCore::FrameLoaderClientWx::dispatchDidFailLoading):
+
+2011-01-26 MORITA Hajime <morrita@google.com>
+
+ Reviewed by Ryosuke Niwa.
+
+ Refactoring: Extract TextCheckerClient from EditorClient
+ https://bugs.webkit.org/show_bug.cgi?id=53213
+
+ * WebKitSupport/EditorClientWx.h:
+ (WebCore::EditorClientWx::textChecker):
+
+2011-02-07 Ryosuke Niwa <rniwa@webkit.org>
+
+ Reviewed by Adam Barth.
+
+ Add EditorClient callbacks to override isDOMPasteAllowed and javaScriptCanAccessClipboard
+ https://bugs.webkit.org/show_bug.cgi?id=52417
+
+ Added two callback functions, canCopyCut and canPaste to EditorClient. They are currently
+ not implemented.
+
+ * WebKitSupport/EditorClientWx.cpp:
+ (WebCore::EditorClientWx::canCopyCut): Added.
+ (WebCore::EditorClientWx::canPaste): Added.
+ * WebKitSupport/EditorClientWx.h:
+
2011-02-10 Nate Chapin <japhet@chromium.org>
Reviewed by Adam Barth.
diff --git a/Source/WebKit/wx/WebFrame.cpp b/Source/WebKit/wx/WebFrame.cpp
index 1d5f03a..e32d300 100644
--- a/Source/WebKit/wx/WebFrame.cpp
+++ b/Source/WebKit/wx/WebFrame.cpp
@@ -77,7 +77,6 @@
wxWebFrame::wxWebFrame(wxWebView* container, wxWebFrame* parent, WebViewFrameData* data) :
m_textMagnifier(1.0),
- m_isEditable(false),
m_isInitialized(false),
m_beingDestroyed(false)
{
@@ -403,10 +402,16 @@ void wxWebFrame::ResetTextSize()
void wxWebFrame::MakeEditable(bool enable)
{
- m_isEditable = enable;
+ if (enable != IsEditable() && m_impl->frame && m_impl->frame->document())
+ m_impl->frame->document()->setDesignMode(enable ? WebCore::Document::on : WebCore::Document::off);
}
-
+bool wxWebFrame::IsEditable() const
+{
+ if (m_impl->frame && m_impl->frame->document())
+ return m_impl->frame->document()->inDesignMode();
+ return false;
+}
bool wxWebFrame::CanCopy()
{
diff --git a/Source/WebKit/wx/WebFrame.h b/Source/WebKit/wx/WebFrame.h
index 3e9355a..9b331c0 100644
--- a/Source/WebKit/wx/WebFrame.h
+++ b/Source/WebKit/wx/WebFrame.h
@@ -159,7 +159,7 @@ public:
void DecreaseTextSize();
void ResetTextSize();
void MakeEditable(bool enable);
- bool IsEditable() const { return m_isEditable; }
+ bool IsEditable() const;
WebCore::Frame* GetFrame();
@@ -173,7 +173,6 @@ public:
private:
float m_textMagnifier;
- bool m_isEditable;
bool m_isInitialized;
bool m_beingDestroyed;
WebFramePrivate* m_impl;
diff --git a/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp b/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
index 026d8a6..d525c09 100644
--- a/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
+++ b/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
@@ -333,10 +333,10 @@ bool ChromeClientWx::shouldInterruptJavaScript()
return false;
}
-bool ChromeClientWx::tabsToLinks() const
+KeyboardUIMode ChromeClientWx::keyboardUIMode()
{
notImplemented();
- return false;
+ return KeyboardAccessDefault;
}
IntRect ChromeClientWx::windowResizerRect() const
diff --git a/Source/WebKit/wx/WebKitSupport/ChromeClientWx.h b/Source/WebKit/wx/WebKitSupport/ChromeClientWx.h
index 94e6504..b0a42ab 100644
--- a/Source/WebKit/wx/WebKitSupport/ChromeClientWx.h
+++ b/Source/WebKit/wx/WebKitSupport/ChromeClientWx.h
@@ -98,7 +98,7 @@ public:
virtual void setStatusbarText(const String&);
virtual bool shouldInterruptJavaScript();
- virtual bool tabsToLinks() const;
+ virtual WebCore::KeyboardUIMode keyboardUIMode();
virtual IntRect windowResizerRect() const;
virtual void scrollBackingStore(int dx, int dy, const IntRect& scrollViewRect, const IntRect& clipRect);
diff --git a/Source/WebKit/wx/WebKitSupport/EditorClientWx.cpp b/Source/WebKit/wx/WebKitSupport/EditorClientWx.cpp
index 5601364..a7e324d 100644
--- a/Source/WebKit/wx/WebKitSupport/EditorClientWx.cpp
+++ b/Source/WebKit/wx/WebKitSupport/EditorClientWx.cpp
@@ -197,18 +197,6 @@ bool EditorClientWx::selectWordBeforeMenuEvent()
return false;
}
-bool EditorClientWx::isEditable()
-{
- Frame* frame = m_page->focusController()->focusedOrMainFrame();
-
- if (frame) {
- wxWebView* webKitWin = dynamic_cast<wxWebView*>(frame->view()->hostWindow()->platformPageClient());
- if (webKitWin)
- return webKitWin->IsEditable();
- }
- return false;
-}
-
bool EditorClientWx::shouldBeginEditing(Range*)
{
notImplemented();
@@ -325,6 +313,16 @@ void EditorClientWx::clearUndoRedoOperations()
}
}
+bool EditorClientWx::canCopyCut(bool defaultValue) const
+{
+ return defaultValue;
+}
+
+bool EditorClientWx::canPaste(bool defaultValue) const
+{
+ return defaultValue;
+}
+
bool EditorClientWx::canUndo() const
{
Frame* frame = m_page->focusController()->focusedOrMainFrame();
diff --git a/Source/WebKit/wx/WebKitSupport/EditorClientWx.h b/Source/WebKit/wx/WebKitSupport/EditorClientWx.h
index 7dbee31..d1d3597 100644
--- a/Source/WebKit/wx/WebKitSupport/EditorClientWx.h
+++ b/Source/WebKit/wx/WebKitSupport/EditorClientWx.h
@@ -30,13 +30,14 @@
#include "EditorClient.h"
#include "Page.h"
+#include "TextCheckerClient.h"
#include "WebView.h"
#include "WebFrame.h"
namespace WebCore {
-class EditorClientWx : public EditorClient {
+class EditorClientWx : public EditorClient, public TextCheckerClient {
friend class ::wxWebView;
friend class ::wxWebFrame;
@@ -56,7 +57,6 @@ public:
virtual int spellCheckerDocumentTag();
virtual bool selectWordBeforeMenuEvent();
- virtual bool isEditable();
virtual bool shouldBeginEditing(Range*);
virtual bool shouldEndEditing(Range*);
@@ -81,6 +81,8 @@ public:
virtual void registerCommandForRedo(PassRefPtr<EditCommand>);
virtual void clearUndoRedoOperations();
+ virtual bool canCopyCut(bool defaultValue) const;
+ virtual bool canPaste(bool defaultValue) const;
virtual bool canUndo() const;
virtual bool canRedo() const;
@@ -113,6 +115,7 @@ public:
virtual void willSetInputMethodState();
virtual void setInputMethodState(bool enabled);
virtual void requestCheckingOfString(WebCore::SpellChecker*, int, const WTF::String&) {}
+ virtual TextCheckerClient* textChecker() { return this; }
private:
Page* m_page;
diff --git a/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp b/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
index a10df7d..68e1e70 100644
--- a/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
+++ b/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
@@ -533,7 +533,7 @@ void FrameLoaderClientWx::setTitle(const String& title, const KURL&)
String FrameLoaderClientWx::userAgent(const KURL&)
{
// FIXME: Use the new APIs introduced by the GTK port to fill in these values.
- return String("Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en) AppleWebKit/418.9.1 (KHTML, like Gecko) Safari/419.3");
+ return String("Mozilla/5.0 (Macintosh; Intel Mac OS X) AppleWebKit/418.9.1 (KHTML, like Gecko) Safari/419.3");
}
void FrameLoaderClientWx::dispatchDidReceiveIcon()
@@ -577,6 +577,11 @@ bool FrameLoaderClientWx::shouldGoToHistoryItem(WebCore::HistoryItem*) const
return true;
}
+bool FrameLoaderClientWx::shouldStopLoadingForHistoryItem(WebCore::HistoryItem*) const
+{
+ return true;
+}
+
void FrameLoaderClientWx::dispatchDidAddBackForwardItem(WebCore::HistoryItem*) const
{
}
@@ -612,7 +617,7 @@ bool FrameLoaderClientWx::canCachePage() const
void FrameLoaderClientWx::setMainDocumentError(WebCore::DocumentLoader* loader, const WebCore::ResourceError&)
{
if (m_firstData) {
- loader->frameLoader()->writer()->setEncoding(m_response.textEncodingName(), false);
+ loader->writer()->setEncoding(m_response.textEncodingName(), false);
m_firstData = false;
}
}
@@ -737,8 +742,7 @@ void FrameLoaderClientWx::dispatchDidFinishLoading(DocumentLoader*, unsigned lon
void FrameLoaderClientWx::dispatchDidFailLoading(DocumentLoader* loader, unsigned long, const ResourceError&)
{
if (m_firstData) {
- FrameLoader* fl = loader->frameLoader();
- fl->writer()->setEncoding(m_response.textEncodingName(), false);
+ loader->writer()->setEncoding(m_response.textEncodingName(), false);
m_firstData = false;
}
if (m_webView) {
@@ -771,7 +775,7 @@ Frame* FrameLoaderClientWx::dispatchCreatePage(const NavigationAction&)
return false;
}
-void FrameLoaderClientWx::dispatchDecidePolicyForMIMEType(FramePolicyFunction function, const String& mimetype, const ResourceRequest& request)
+void FrameLoaderClientWx::dispatchDecidePolicyForResponse(FramePolicyFunction function, const ResourceResponse& response, const ResourceRequest& request)
{
if (!m_webFrame)
return;
diff --git a/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h b/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h
index e26cbe2..8f1e69e 100644
--- a/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h
+++ b/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h
@@ -160,6 +160,7 @@ namespace WebCore {
virtual void updateGlobalHistory();
virtual void updateGlobalHistoryRedirectLinks();
virtual bool shouldGoToHistoryItem(HistoryItem*) const;
+ virtual bool shouldStopLoadingForHistoryItem(HistoryItem*) const;
virtual void dispatchDidAddBackForwardItem(HistoryItem*) const;
virtual void dispatchDidRemoveBackForwardItem(HistoryItem*) const;
virtual void dispatchDidChangeBackForwardIndex() const;
@@ -196,7 +197,7 @@ namespace WebCore {
virtual void dispatchDidFailProvisionalLoad(const ResourceError&);
virtual void dispatchDidFailLoad(const ResourceError&);
virtual Frame* dispatchCreatePage(const WebCore::NavigationAction&);
- virtual void dispatchDecidePolicyForMIMEType(FramePolicyFunction function, const String&, const ResourceRequest&);
+ virtual void dispatchDecidePolicyForResponse(FramePolicyFunction function, const ResourceResponse&, const ResourceRequest&);
virtual void dispatchDecidePolicyForNewWindowAction(FramePolicyFunction function, const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>, const String&);
virtual void dispatchDecidePolicyForNavigationAction(FramePolicyFunction function, const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>);
virtual void dispatchUnableToImplementPolicy(const ResourceError&);
diff --git a/Source/WebKit/wx/WebView.cpp b/Source/WebKit/wx/WebView.cpp
index 0df3879..3215b7a 100644
--- a/Source/WebKit/wx/WebView.cpp
+++ b/Source/WebKit/wx/WebView.cpp
@@ -327,7 +327,6 @@ const wxChar* wxWebViewNameStr = wxT("webView");
wxWebView::wxWebView() :
m_textMagnifier(1.0),
- m_isEditable(false),
m_isInitialized(false),
m_beingDestroyed(false),
m_mouseWheelZooms(false),
@@ -338,7 +337,6 @@ wxWebView::wxWebView() :
wxWebView::wxWebView(wxWindow* parent, int id, const wxPoint& position,
const wxSize& size, long style, const wxString& name) :
m_textMagnifier(1.0),
- m_isEditable(false),
m_isInitialized(false),
m_beingDestroyed(false),
m_mouseWheelZooms(false),
diff --git a/Source/WebKit/wx/WebView.h b/Source/WebKit/wx/WebView.h
index 4a6b081..fc80bf4 100644
--- a/Source/WebKit/wx/WebView.h
+++ b/Source/WebKit/wx/WebView.h
@@ -249,7 +249,6 @@ private:
DECLARE_DYNAMIC_CLASS(wxWebView)
#endif
float m_textMagnifier;
- bool m_isEditable;
bool m_isInitialized;
bool m_beingDestroyed;
bool m_mouseWheelZooms;
generated by cgit v1.1 at 2025-11-13 12:51:44 +0000