summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/wx
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit/wx')
-rw-r--r--Source/WebKit/wx/ChangeLog81
-rw-r--r--Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp5
-rw-r--r--Source/WebKit/wx/WebKitSupport/ChromeClientWx.h3
-rw-r--r--Source/WebKit/wx/WebKitSupport/DragClientWx.cpp6
-rw-r--r--Source/WebKit/wx/WebKitSupport/DragClientWx.h1
-rw-r--r--Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp11
-rw-r--r--Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h2
-rw-r--r--Source/WebKit/wx/bindings/python/wscript2
8 files changed, 94 insertions, 17 deletions
diff --git a/Source/WebKit/wx/ChangeLog b/Source/WebKit/wx/ChangeLog
index 4862225..13ab1b8 100644
--- a/Source/WebKit/wx/ChangeLog
+++ b/Source/WebKit/wx/ChangeLog
@@ -1,3 +1,84 @@
+2011-02-10 Nate Chapin <japhet@chromium.org>
+
+ Reviewed by Adam Barth.
+
+ Update calls to DocumentWriter.
+ https://bugs.webkit.org/show_bug.cgi?id=50489
+
+ * WebKitSupport/FrameLoaderClientWx.cpp:
+ (WebCore::FrameLoaderClientWx::finishedLoading):
+
+2011-02-08 Adam Barth <abarth@webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ Remove orphan code from old parser
+ https://bugs.webkit.org/show_bug.cgi?id=53984
+
+ * WebKitSupport/ChromeClientWx.h:
+
+2011-02-07 Enrica Casucci <enrica@apple.com>
+
+ Reviewed Adam Roben and Darin Adler.
+
+ WebKit2: drag and drop support on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=52775
+
+ Removed createDragImageForLink from DragClient.
+
+ * WebKitSupport/DragClientWx.cpp:
+ * WebKitSupport/DragClientWx.h:
+
+2011-02-07 Patrick Gansterer <paroga@webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ [wx] FrameLoaderClient calls loadURLInChildFrame on the child's frame loader
+ https://bugs.webkit.org/show_bug.cgi?id=53895
+
+ * WebKitSupport/FrameLoaderClientWx.cpp:
+ (WebCore::FrameLoaderClientWx::createFrame): Use m_frame instead of childFrame.
+
+2011-02-03 Adam Langley <agl@chromium.org>
+
+ Reviewed by Adam Barth.
+
+ Plumb mixed script URL to FrameLoaderClient
+ https://bugs.webkit.org/show_bug.cgi?id=52384
+
+ Regressions covered by http/tests/security/mixedContent/*
+
+ * WebKitSupport/FrameLoaderClientWx.cpp:
+ (WebCore::FrameLoaderClientWx::didRunInsecureContent):
+ * WebKitSupport/FrameLoaderClientWx.h:
+
+2011-02-02 Kevin Ollivier <kevino@theolliviers.com>
+
+ [wx] Build fixes for wxWebKit.
+
+ * bindings/python/wscript:
+
+2011-01-28 Dan Bernstein <mitz@apple.com>
+
+ Reviewed by Sam Weinig.
+
+ <select> can't display right-to-left (rtl) languages
+ https://bugs.webkit.org/show_bug.cgi?id=19785
+
+ * WebKitSupport/ChromeClientWx.cpp:
+ (WebCore::ChromeClientWx::selectItemAlignmentFollowsMenuWritingDirection): Added.
+ * WebKitSupport/ChromeClientWx.h:
+
+2011-01-27 Nate Chapin <japhet@chromium.org>
+
+ Reviewed by Adam Barth.
+
+ Use Document::url() instead of FrameLoader::url().
+ https://bugs.webkit.org/show_bug.cgi?id=41165
+
+ * WebKitSupport/FrameLoaderClientWx.cpp:
+ (WebCore::FrameLoaderClientWx::dispatchDidFinishDocumentLoad):
+
2011-01-14 Yuzo Fujishima <yuzo@google.com>
Reviewed by Antti Koivisto.
diff --git a/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp b/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
index c89bb17..026d8a6 100644
--- a/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
+++ b/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
@@ -476,6 +476,11 @@ bool ChromeClientWx::selectItemWritingDirectionIsNatural()
return false;
}
+bool ChromeClientWx::selectItemAlignmentFollowsMenuWritingDirection()
+{
+ return false;
+}
+
PassRefPtr<PopupMenu> ChromeClientWx::createPopupMenu(PopupMenuClient* client) const
{
return adoptRef(new PopupMenuWx(client));
diff --git a/Source/WebKit/wx/WebKitSupport/ChromeClientWx.h b/Source/WebKit/wx/WebKitSupport/ChromeClientWx.h
index 2ccad43..94e6504 100644
--- a/Source/WebKit/wx/WebKitSupport/ChromeClientWx.h
+++ b/Source/WebKit/wx/WebKitSupport/ChromeClientWx.h
@@ -139,8 +139,6 @@ public:
virtual void formStateDidChange(const Node*) { }
- virtual PassOwnPtr<HTMLParserQuirks> createHTMLParserQuirks() { return 0; }
-
virtual void setCursor(const Cursor&);
virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const {}
@@ -149,6 +147,7 @@ public:
virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) { }
virtual bool selectItemWritingDirectionIsNatural();
+ virtual bool selectItemAlignmentFollowsMenuWritingDirection();
virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const;
virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const;
diff --git a/Source/WebKit/wx/WebKitSupport/DragClientWx.cpp b/Source/WebKit/wx/WebKitSupport/DragClientWx.cpp
index fb6905b..75744ba 100644
--- a/Source/WebKit/wx/WebKitSupport/DragClientWx.cpp
+++ b/Source/WebKit/wx/WebKitSupport/DragClientWx.cpp
@@ -68,10 +68,4 @@ void DragClientWx::startDrag(DragImageRef dragImage,
notImplemented();
}
-DragImageRef DragClientWx::createDragImageForLink(KURL&, const String& label, Frame*)
-{
- notImplemented();
- return 0;
-}
-
}
diff --git a/Source/WebKit/wx/WebKitSupport/DragClientWx.h b/Source/WebKit/wx/WebKitSupport/DragClientWx.h
index afb54fb..45425c4 100644
--- a/Source/WebKit/wx/WebKitSupport/DragClientWx.h
+++ b/Source/WebKit/wx/WebKitSupport/DragClientWx.h
@@ -39,7 +39,6 @@ public:
virtual WebCore::DragSourceAction dragSourceActionMaskForPoint(const WebCore::IntPoint&);
virtual void startDrag(WebCore::DragImageRef dragImage, const WebCore::IntPoint& dragImageOrigin, const WebCore::IntPoint& eventPos, WebCore::Clipboard*, WebCore::Frame*, bool linkDrag = false);
- virtual WebCore::DragImageRef createDragImageForLink(WebCore::KURL&, const WTF::String& label, WebCore::Frame*);
};
}
diff --git a/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp b/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
index 362c726..a10df7d 100644
--- a/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
+++ b/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
@@ -320,7 +320,7 @@ void FrameLoaderClientWx::dispatchDidFinishDocumentLoad()
if (m_webView) {
wxWebViewLoadEvent wkEvent(m_webView);
wkEvent.SetState(wxWEBVIEW_LOAD_DOC_COMPLETED);
- wkEvent.SetURL(m_frame->loader()->url().string());
+ wkEvent.SetURL(m_frame->document()->url().string());
m_webView->GetEventHandler()->ProcessEvent(wkEvent);
}
}
@@ -394,7 +394,7 @@ void FrameLoaderClientWx::postProgressFinishedNotification()
if (m_webView) {
wxWebViewLoadEvent wkEvent(m_webView);
wkEvent.SetState(wxWEBVIEW_LOAD_DL_COMPLETED);
- wkEvent.SetURL(m_frame->loader()->url().string());
+ wkEvent.SetURL(m_frame->document()->url().string());
m_webView->GetEventHandler()->ProcessEvent(wkEvent);
}
}
@@ -434,8 +434,7 @@ void FrameLoaderClientWx::finishedLoading(DocumentLoader* loader)
{
if (!m_pluginView) {
if (m_firstData) {
- FrameLoader* fl = loader->frameLoader();
- fl->writer()->setEncoding(m_response.textEncodingName(), false);
+ loader->writer()->setEncoding(m_response.textEncodingName(), false);
m_firstData = false;
}
} else {
@@ -595,7 +594,7 @@ void FrameLoaderClientWx::didDisplayInsecureContent()
notImplemented();
}
-void FrameLoaderClientWx::didRunInsecureContent(WebCore::SecurityOrigin*)
+void FrameLoaderClientWx::didRunInsecureContent(WebCore::SecurityOrigin*, const KURL&)
{
notImplemented();
}
@@ -850,7 +849,7 @@ PassRefPtr<Frame> FrameLoaderClientWx::createFrame(const KURL& url, const String
if (!childFrame->page())
return 0;
- childFrame->loader()->loadURLIntoChildFrame(url, referrer, childFrame.get());
+ m_frame->loader()->loadURLIntoChildFrame(url, referrer, childFrame.get());
// The frame's onload handler may have removed it from the document.
if (!childFrame->tree()->parent())
diff --git a/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h b/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h
index b56a900..e26cbe2 100644
--- a/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h
+++ b/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h
@@ -167,7 +167,7 @@ namespace WebCore {
virtual bool canCachePage() const;
virtual void didDisplayInsecureContent();
- virtual void didRunInsecureContent(SecurityOrigin*);
+ virtual void didRunInsecureContent(SecurityOrigin*, const KURL&);
virtual void setMainDocumentError(DocumentLoader*, const ResourceError&);
virtual void committedLoad(DocumentLoader*, const char*, int);
diff --git a/Source/WebKit/wx/bindings/python/wscript b/Source/WebKit/wx/bindings/python/wscript
index 0a1df31..5e1dfc1 100644
--- a/Source/WebKit/wx/bindings/python/wscript
+++ b/Source/WebKit/wx/bindings/python/wscript
@@ -33,7 +33,7 @@ include_paths = [
os.path.join(wk_root, 'Source', 'JavaScriptCore'),
os.path.join(wk_root, 'Source', 'WebCore', 'bindings', 'cpp'),
os.path.join(wk_root, 'Source', 'WebCore', 'DerivedSources'),
- os.path.join(wk_root, 'WebKit', 'wx'),
+ os.path.join(wk_root, 'Source', 'WebKit', 'wx'),
os.path.join(wx_root, 'wxPython', 'include'),
os.path.join(wx_root, '..', 'wxPython', 'include'),
]