summaryrefslogtreecommitdiffstats
path: root/WebKit/wx
diff options
context:
space:
mode:
Diffstat (limited to 'WebKit/wx')
-rw-r--r--WebKit/wx/ChangeLog190
-rw-r--r--WebKit/wx/WebFrame.cpp12
-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
-rw-r--r--WebKit/wx/WebSettings.cpp14
-rw-r--r--WebKit/wx/WebSettings.h10
-rw-r--r--WebKit/wx/WebView.cpp22
-rw-r--r--WebKit/wx/WebView.h10
13 files changed, 260 insertions, 116 deletions
diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index 7d6d9dd..6e04904 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,193 @@
+2010-04-20 Adam Barth <abarth@webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ Factor DocumentWriter out of FrameLoader
+ https://bugs.webkit.org/show_bug.cgi?id=37175
+
+ Update these callsites because the method moved to DocumentWriter.
+
+ * WebKitSupport/FrameLoaderClientWx.cpp:
+ (WebCore::FrameLoaderClientWx::committedLoad):
+
+2010-04-20 Kent Tamura <tkent@chromium.org>
+
+ Reviewed by Darin Adler.
+
+ Change a parameter type of chooseIconForFiles()
+ https://bugs.webkit.org/show_bug.cgi?id=37504
+
+ * WebKitSupport/ChromeClientWx.cpp:
+ (WebCore::ChromeClientWx::chooseIconForFiles):
+ * WebKitSupport/ChromeClientWx.h:
+
+2010-04-19 Kevin Ollivier <kevino@theolliviers.com>
+
+ Build fix, add stub for new FrameLoaderClient method.
+
+ * WebKitSupport/FrameLoaderClientWx.cpp:
+ (WebCore::FrameLoaderClientWx::dispatchDidChangeIcons):
+ * WebKitSupport/FrameLoaderClientWx.h:
+
+2010-04-11 Sheriff Bot <webkit.review.bot@gmail.com>
+
+ Unreviewed, rolling out r57468.
+ http://trac.webkit.org/changeset/57468
+ https://bugs.webkit.org/show_bug.cgi?id=37433
+
+ Broke the world... Must have applied the patch wrong
+ (Requested by abarth on #webkit).
+
+ * WebKitSupport/FrameLoaderClientWx.cpp:
+ (WebCore::FrameLoaderClientWx::committedLoad):
+
+2010-04-11 Adam Barth <abarth@webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ Factor DocumentWriter out of FrameLoader
+ https://bugs.webkit.org/show_bug.cgi?id=37175
+
+ Update these callsites because the method moved to DocumentWriter.
+
+ * WebKitSupport/FrameLoaderClientWx.cpp:
+ (WebCore::FrameLoaderClientWx::committedLoad):
+
+2010-04-07 Andrey Kosyakov <caseq@chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Removed redundant FrameLoaderClient::dispatchDidLoadResourceByXMLHttpRequest()
+ https://bugs.webkit.org/show_bug.cgi?id=36949
+
+ * WebKitSupport/FrameLoaderClientWx.cpp:
+ * WebKitSupport/FrameLoaderClientWx.h:
+
+2010-03-31 Marcus Bulach <bulach@chromium.org>
+
+ Reviewed by Jeremy Orlow.
+
+ Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
+ https://bugs.webkit.org/show_bug.cgi?id=35031
+
+ * WebKitSupport/ChromeClientWx.h:
+ (WebCore::ChromeClientWx::cancelGeolocationPermissionRequestForFrame):
+
+2010-03-30 Gavin Barraclough <barraclough@apple.com>
+
+ Rubber stamped by Sam Weinig.
+
+ https://bugs.webkit.org/show_bug.cgi?id=36866
+ Move CString to WTF
+
+ * WebFrame.cpp:
+ * WebView.cpp:
+
+2010-03-30 Kevin Ollivier <kevino@theolliviers.com>
+
+ [wx] Build fix after method name change.
+
+ * WebFrame.cpp:
+ (wxWebFrame::RunScript):
+
+2010-03-28 Alexey Proskuryakov <ap@apple.com>
+
+ Build fix. Include WindowsKeyboardCodes.h instead of KeyboardCodes.h.
+
+ * WebKitSupport/EditorClientWx.cpp:
+
+2010-03-24 Kent Tamura <tkent@chromium.org>
+
+ Reviewed by Darin Adler.
+
+ Make Icon::createIconForFiles() optional.
+ https://bugs.webkit.org/show_bug.cgi?id=35072
+
+ - Rename iconForFiles() to chooseIconForFiles().
+ - Call Icon::createIconForFiles() from chooseIconForFiles().
+
+ * WebKitSupport/ChromeClientWx.cpp:
+ (WebCore::ChromeClientWx::chooseIconForFiles):
+ * WebKitSupport/ChromeClientWx.h:
+
+2010-03-20 Kevin Ollivier <kevino@theolliviers.com>
+
+ [wx] Build fixes after recent changes, including move of setDatabasesEnabled from Settings.
+
+ * WebFrame.cpp:
+ (wxWebFrame::RunScript):
+ * WebKitSupport/InspectorClientWx.cpp:
+ (WebCore::InspectorClientWx::openInspectorFrontend):
+ * WebSettings.cpp:
+ * WebSettings.h:
+ * WebView.cpp:
+ (wxWebView::Create):
+ (wxWebView::SetDatabasesEnabled):
+ (wxWebView::AreDatabasesEnabled):
+ * WebView.h:
+
+2010-03-16 Yury Semikhatsky <yurys@chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Introduce InspectorFrontendClient that provides InspectorFrontend with an interface to the embedder. InspectorClient now serves as a delegate for InspectorController and does not contain methods for managing inspector frontend window. That allows to create remote InspectorFrontendHost.
+
+ Introduce InspectorFrontendClient that would provide InspectorFrontend with an interface to the embedder
+ https://bugs.webkit.org/show_bug.cgi?id=35036
+
+ * WebKitSupport/InspectorClientWx.cpp:
+ * WebKitSupport/InspectorClientWx.h:
+
+2010-03-11 Anders Carlsson <andersca@apple.com>
+
+ Reviewed by David Hyatt.
+
+ Remove invalidateContents, it isn't used and it never makes sense to only invalidate the contents.
+
+ * WebKitSupport/ChromeClientWx.cpp:
+ * WebKitSupport/ChromeClientWx.h:
+
+2010-03-02 Adam Treat <atreat@rim.com>
+
+ Reviewed by Dave Hyatt.
+
+ Adapt the wx port to the refactoring of repaint methods.
+
+ https://bugs.webkit.org/show_bug.cgi?id=34214
+
+ * WebKitSupport/ChromeClientWx.cpp:
+ (WebCore::ChromeClientWx::invalidateContents):
+ (WebCore::ChromeClientWx::invalidateWindow):
+ (WebCore::ChromeClientWx::invalidateContentsForSlowScroll):
+ (WebCore::ChromeClientWx::invalidateContentsAndWindow):
+ * WebKitSupport/ChromeClientWx.h:
+
+2010-03-01 Jakob Petsovits <jpetsovits@rim.com>
+
+ Reviewed by Adam Barth.
+
+ Adapt to the new ZoomMode enum.
+ https://bugs.webkit.org/show_bug.cgi?id=35347
+
+ * WebFrame.cpp:
+ (wxWebFrame::IncreaseTextSize):
+ (wxWebFrame::DecreaseTextSize):
+ (wxWebFrame::ResetTextSize):
+
+2010-02-23 Steve Block <steveblock@google.com>
+
+ Reviewed by Darin Adler.
+
+ Adds ChromeClient::cancelGeolocationPermissionRequestForFrame
+ https://bugs.webkit.org/show_bug.cgi?id=34962
+
+ This method is required so that a Geolocation object can cancel an
+ asynchronous permission request. This allows the chrome client to cancel
+ any UI it is showing for the permission request.
+
+ * WebKitSupport/ChromeClientWx.h:
+ (WebCore::ChromeClientWx::cancelGeolocationPermissionRequestForFrame):
+
2010-02-17 Dmitry Titov <dimich@chromium.org>
Reviewed by David Levin, Darin Fisher, Simon Hausmann.
diff --git a/WebKit/wx/WebFrame.cpp b/WebKit/wx/WebFrame.cpp
index 6cda197..78427e4 100644
--- a/WebKit/wx/WebFrame.cpp
+++ b/WebKit/wx/WebFrame.cpp
@@ -25,7 +25,6 @@
#include "config.h"
#include "BackForwardList.h"
-#include "CString.h"
#include "Document.h"
#include "Editor.h"
#include "Element.h"
@@ -50,6 +49,7 @@
#include "JSDOMBinding.h"
#include <runtime/JSValue.h>
#include <runtime/UString.h>
+#include <wtf/text/CString.h>
#include "EditorClientWx.h"
#include "FrameLoaderClientWx.h"
@@ -201,12 +201,12 @@ wxString wxWebFrame::RunScript(const wxString& javascript)
wxASSERT_MSG(hasLoaded, wxT("Document must be loaded before calling RunScript."));
if (hasLoaded) {
WebCore::ScriptController* controller = m_impl->frame->script();
- bool jsEnabled = controller->canExecuteScripts();
+ bool jsEnabled = controller->canExecuteScripts(WebCore::AboutToExecuteScript);
wxASSERT_MSG(jsEnabled, wxT("RunScript requires JavaScript to be enabled."));
if (jsEnabled) {
JSC::JSValue result = controller->executeScript(javascript, true).jsValue();
if (result)
- returnValue = wxString(result.toString(m_impl->frame->script()->globalObject(WebCore::mainThreadNormalWorld())->globalExec()).UTF8String().c_str(), wxConvUTF8);
+ returnValue = wxString(result.toString(m_impl->frame->script()->globalObject(WebCore::mainThreadNormalWorld())->globalExec()).UTF8String().data(), wxConvUTF8);
}
}
}
@@ -316,7 +316,7 @@ void wxWebFrame::IncreaseTextSize()
{
if (CanIncreaseTextSize()) {
m_textMagnifier = m_textMagnifier*TextSizeMultiplierRatio;
- m_impl->frame->setZoomFactor(m_textMagnifier, true);
+ m_impl->frame->setZoomFactor(m_textMagnifier, WebCore::ZoomTextOnly);
}
}
@@ -333,7 +333,7 @@ void wxWebFrame::DecreaseTextSize()
{
if (CanDecreaseTextSize()) {
m_textMagnifier = m_textMagnifier/TextSizeMultiplierRatio;
- m_impl->frame->setZoomFactor(m_textMagnifier, true);
+ m_impl->frame->setZoomFactor(m_textMagnifier, WebCore::ZoomTextOnly);
}
}
@@ -341,7 +341,7 @@ void wxWebFrame::ResetTextSize()
{
m_textMagnifier = 1.0;
if (m_impl->frame)
- m_impl->frame->setZoomFactor(m_textMagnifier, true);
+ m_impl->frame->setZoomFactor(m_textMagnifier, WebCore::ZoomTextOnly);
}
void wxWebFrame::MakeEditable(bool enable)
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
diff --git a/WebKit/wx/WebSettings.cpp b/WebKit/wx/WebSettings.cpp
index 2aa246c..9317546 100644
--- a/WebKit/wx/WebSettings.cpp
+++ b/WebKit/wx/WebSettings.cpp
@@ -102,20 +102,6 @@ bool wxWebSettings::IsJavaScriptEnabled() const
return false;
}
-void wxWebSettings::SetDatabasesEnabled(bool enabled)
-{
- if (m_settings)
- m_settings->setDatabasesEnabled(enabled);
-}
-
-bool wxWebSettings::AreDatabasesEnabled() const
-{
- if (m_settings)
- return m_settings->databasesEnabled();
-
- return false;
-}
-
void wxWebSettings::SetLocalStoragePath(const wxString& path)
{
if (m_settings)
diff --git a/WebKit/wx/WebSettings.h b/WebKit/wx/WebSettings.h
index e526b70..148755a 100644
--- a/WebKit/wx/WebSettings.h
+++ b/WebKit/wx/WebSettings.h
@@ -119,16 +119,6 @@ public:
bool IsJavaScriptEnabled() const;
/**
- Sets whether or not web pages can create databases.
- */
- void SetDatabasesEnabled(bool enabled);
-
- /**
- Returns whether or not the WebView runs JavaScript code.
- */
- bool AreDatabasesEnabled() const;
-
- /**
Sets the path where local data will be stored.
*/
void SetLocalStoragePath(const wxString& path);
diff --git a/WebKit/wx/WebView.cpp b/WebKit/wx/WebView.cpp
index c448bbf..95730b9 100644
--- a/WebKit/wx/WebView.cpp
+++ b/WebKit/wx/WebView.cpp
@@ -28,7 +28,6 @@
#include "ContextMenu.h"
#include "ContextMenuItem.h"
#include "ContextMenuController.h"
-#include "CString.h"
#include "Document.h"
#include "Element.h"
#include "Editor.h"
@@ -69,8 +68,10 @@
#include "JSDOMBinding.h"
#include <runtime/JSValue.h>
#include <runtime/UString.h>
+#include <wtf/text/CString.h>
#if ENABLE(DATABASE)
+#include "Database.h"
#include "DatabaseTracker.h"
#endif
@@ -336,7 +337,7 @@ bool wxWebView::Create(wxWindow* parent, int id, const wxPoint& position,
settings->setJavaScriptEnabled(true);
#if ENABLE(DATABASE)
- settings->setDatabasesEnabled(true);
+ SetDatabasesEnabled(true);
#endif
m_isInitialized = true;
@@ -938,6 +939,23 @@ wxString wxWebView::GetDatabaseDirectory()
#endif
}
+/* static */
+void wxWebView::SetDatabasesEnabled(bool enabled)
+{
+#if ENABLE(DATABASE)
+ WebCore::Database::setIsAvailable(enabled);
+#endif
+}
+
+/* static */
+bool wxWebView::AreDatabasesEnabled()
+{
+#if ENABLE(DATABASE)
+ return WebCore::Database::isAvailable();
+#endif
+ return false;
+}
+
static WebCore::ResourceHandleManager::ProxyType curlProxyType(wxProxyType type)
{
switch (type) {
diff --git a/WebKit/wx/WebView.h b/WebKit/wx/WebView.h
index 9a6546c..f7b41dc 100644
--- a/WebKit/wx/WebView.h
+++ b/WebKit/wx/WebView.h
@@ -195,6 +195,16 @@ public:
static void SetDatabaseDirectory(const wxString& databaseDirectory);
static wxString GetDatabaseDirectory();
+
+ /**
+ Sets whether or not web pages can create databases.
+ */
+ static void SetDatabasesEnabled(bool enabled);
+
+ /**
+ Returns whether or not the WebView runs JavaScript code.
+ */
+ static bool AreDatabasesEnabled();
static void SetProxyInfo(const wxString& host = wxEmptyString,
unsigned long port = 0,
generated by cgit v1.1 at 2025-05-30 01:46:56 +0000