summaryrefslogtreecommitdiffstats
path: root/WebKit/wx/WebFrame.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebKit/wx/WebFrame.cpp')
-rw-r--r--WebKit/wx/WebFrame.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/WebKit/wx/WebFrame.cpp b/WebKit/wx/WebFrame.cpp
index b479a41..630eb8f 100644
--- a/WebKit/wx/WebFrame.cpp
+++ b/WebKit/wx/WebFrame.cpp
@@ -36,6 +36,7 @@
#include "HTMLFrameOwnerElement.h"
#include "markup.h"
#include "Page.h"
+#include "PlatformString.h"
#include "RenderTreeAsText.h"
#include "RenderObject.h"
#include "RenderView.h"
@@ -177,7 +178,7 @@ wxString wxWebFrame::RunScript(const wxString& javascript)
{
wxString returnValue = wxEmptyString;
if (m_impl->frame) {
- JSC::JSValuePtr result = m_impl->frame->loader()->executeScript(javascript, true).jsValue();
+ JSC::JSValue result = m_impl->frame->loader()->executeScript(javascript, true).jsValue();
if (result)
returnValue = wxString(result.toString(m_impl->frame->script()->globalObject()->globalExec()).UTF8String().c_str(), wxConvUTF8);
}
@@ -308,6 +309,13 @@ void wxWebFrame::DecreaseTextSize()
}
}
+void wxWebFrame::ResetTextSize()
+{
+ m_textMagnifier = 1.0;
+ if (m_impl->frame)
+ m_impl->frame->setZoomFactor(m_textMagnifier, true);
+}
+
void wxWebFrame::MakeEditable(bool enable)
{
m_isEditable = enable;