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.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/WebKit/wx/WebFrame.cpp b/WebKit/wx/WebFrame.cpp
index 7bfcc5d..b479a41 100644
--- a/WebKit/wx/WebFrame.cpp
+++ b/WebKit/wx/WebFrame.cpp
@@ -39,16 +39,17 @@
#include "RenderTreeAsText.h"
#include "RenderObject.h"
#include "RenderView.h"
-
-#include "EditorClientWx.h"
-#include "FrameLoaderClientWx.h"
-
#include "ScriptController.h"
#include "ScriptValue.h"
+#include "TextEncoding.h"
+
#include "JSDOMBinding.h"
#include <runtime/JSValue.h>
#include <runtime/UString.h>
+#include "EditorClientWx.h"
+#include "FrameLoaderClientWx.h"
+
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include "wx/wx.h"
@@ -141,7 +142,7 @@ void wxWebFrame::SetPageSource(const wxString& source, const wxString& baseUrl)
{
if (m_impl->frame && m_impl->frame->loader()) {
WebCore::FrameLoader* loader = m_impl->frame->loader();
- loader->begin(WebCore::KURL(static_cast<const char*>(baseUrl.mb_str(wxConvUTF8))));
+ loader->begin(WebCore::KURL(WebCore::KURL(), static_cast<const char*>(baseUrl.mb_str(wxConvUTF8)), WebCore::UTF8Encoding()));
loader->write(static_cast<const WebCore::String>(source));
loader->end();
}
@@ -194,7 +195,7 @@ bool wxWebFrame::FindString(const wxString& string, bool forward, bool caseSensi
void wxWebFrame::LoadURL(const wxString& url)
{
if (m_impl->frame && m_impl->frame->loader()) {
- WebCore::KURL kurl = WebCore::KURL(static_cast<const char*>(url.mb_str(wxConvUTF8)));
+ WebCore::KURL kurl = WebCore::KURL(WebCore::KURL(), static_cast<const char*>(url.mb_str(wxConvUTF8)), WebCore::UTF8Encoding());
// NB: This is an ugly fix, but CURL won't load sub-resources if the
// protocol is omitted; sadly, it will not emit an error, either, so
// there's no way for us to catch this problem the correct way yet.
@@ -209,7 +210,7 @@ void wxWebFrame::LoadURL(const wxString& url)
kurl.setPath("//" + kurl.path());
}
}
- m_impl->frame->loader()->load(kurl);
+ m_impl->frame->loader()->load(kurl, false);
}
}