diff options
Diffstat (limited to 'WebKit/wx')
| -rw-r--r-- | WebKit/wx/ChangeLog | 29 | ||||
| -rw-r--r-- | WebKit/wx/WebFrame.cpp | 2 | ||||
| -rw-r--r-- | WebKit/wx/WebView.cpp | 10 | ||||
| -rw-r--r-- | WebKit/wx/wscript | 2 |
4 files changed, 35 insertions, 8 deletions
diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog index aefe2a1..36c9990 100644 --- a/WebKit/wx/ChangeLog +++ b/WebKit/wx/ChangeLog @@ -1,3 +1,32 @@ +2010-06-21 Kevin Ollivier <kevino@theolliviers.com> + + Build fix after conversion of WebInterfaceSystem to Obj-C++. + + * WebView.cpp: + * wscript: + +2010-06-15 Dumitru Daniliuc <dumi@chromium.org> + + Reviewed by Adam Barth. + + Move isAvailable()/setIsAvailable() from Database/DatabaseSync to AbstractDatabase. + https://bugs.webkit.org/show_bug.cgi?id=39041 + + * WebView.cpp: + (wxWebView::SetDatabasesEnabled): + (wxWebView::AreDatabasesEnabled): + +2010-06-15 Darin Adler <darin@apple.com> + + Reviewed by Adam Barth. + + Move functions out of Frame class that were marked "move to Chrome" + https://bugs.webkit.org/show_bug.cgi?id=39636 + + * WebFrame.cpp: + (wxWebFrame::ShouldClose): Call shouldClose on FrameLoader instead + of going through Frame. + 2010-06-14 Ilya Tikhonovsky <loislo@chromium.org> Reviewed by Pavel Feldman. diff --git a/WebKit/wx/WebFrame.cpp b/WebKit/wx/WebFrame.cpp index cb66a72..e1f7ecc 100644 --- a/WebKit/wx/WebFrame.cpp +++ b/WebKit/wx/WebFrame.cpp @@ -414,7 +414,7 @@ wxWebViewDOMElementInfo wxWebFrame::HitTest(const wxPoint& pos) const bool wxWebFrame::ShouldClose() const { if (m_impl->frame) - return m_impl->frame->shouldClose(); + return m_impl->frame->loader()->shouldClose(); return true; } diff --git a/WebKit/wx/WebView.cpp b/WebKit/wx/WebView.cpp index d9a22cb..a2897b5 100644 --- a/WebKit/wx/WebView.cpp +++ b/WebKit/wx/WebView.cpp @@ -74,7 +74,7 @@ #include <wtf/text/CString.h> #if ENABLE(DATABASE) -#include "Database.h" +#include "AbstractDatabase.h" #include "DatabaseTracker.h" #endif @@ -258,10 +258,8 @@ wxWebViewCachePolicy wxWebView::GetCachePolicy() } #if OS(DARWIN) -// prototype - function is in WebKitSystemInterface.mm -extern "C" { +// prototype - function is in WebSystemInterface.mm void InitWebCoreSystemInterface(void); -} #endif BEGIN_EVENT_TABLE(wxWebView, wxWindow) @@ -995,7 +993,7 @@ wxString wxWebView::GetDatabaseDirectory() void wxWebView::SetDatabasesEnabled(bool enabled) { #if ENABLE(DATABASE) - WebCore::Database::setIsAvailable(enabled); + WebCore::AbstractDatabase::setIsAvailable(enabled); #endif } @@ -1003,7 +1001,7 @@ void wxWebView::SetDatabasesEnabled(bool enabled) bool wxWebView::AreDatabasesEnabled() { #if ENABLE(DATABASE) - return WebCore::Database::isAvailable(); + return WebCore::AbstractDatabase::isAvailable(); #endif return false; } diff --git a/WebKit/wx/wscript b/WebKit/wx/wscript index fe934f1..d0594b3 100644 --- a/WebKit/wx/wscript +++ b/WebKit/wx/wscript @@ -109,7 +109,7 @@ def build(bld): if sys.platform.startswith('darwin'): exts.append('.mm') obj.includes += '../mac/WebCoreSupport ../../WebCore/platform/mac' - obj.source = "../mac/WebCoreSupport/WebSystemInterface.m" + obj.source = "../mac/WebCoreSupport/WebSystemInterface.mm" obj.find_sources_in_dirs(webkit_dirs) if building_on_win32: |