diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-05 14:34:32 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-05 14:34:32 -0800 |
| commit | 635860845790a19bf50bbc51ba8fb66a96dde068 (patch) | |
| tree | ef6ad9ff73a5b57f65249d4232a202fa77e6a140 /WebKit/win/WebResource.cpp | |
| parent | 8e35f3cfc7fba1d1c829dc557ebad6409cbe16a2 (diff) | |
| download | external_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.zip external_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.tar.gz external_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.tar.bz2 | |
auto import from //depot/cupcake/@136594
Diffstat (limited to 'WebKit/win/WebResource.cpp')
| -rw-r--r-- | WebKit/win/WebResource.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebKit/win/WebResource.cpp b/WebKit/win/WebResource.cpp index 9374aec..3c2087f 100644 --- a/WebKit/win/WebResource.cpp +++ b/WebKit/win/WebResource.cpp @@ -27,6 +27,7 @@ #include "WebKitDLL.h" #include "WebResource.h" +#include "MarshallingHelpers.h" #include "MemoryStream.h" #pragma warning(push, 0) @@ -105,7 +106,7 @@ HRESULT STDMETHODCALLTYPE WebResource::initWithData( /* [in] */ BSTR frameName) { m_data = data; - m_url = KURL(String(url)); + m_url = MarshallingHelpers::BSTRToKURL(url); m_mimeType = String(mimeType); m_textEncodingName = String(textEncodingName); m_frameName = String(frameName); |