diff options
| author | Huahui Wu <hwu@google.com> | 2011-02-16 20:58:42 -0800 |
|---|---|---|
| committer | Huahui Wu <hwu@google.com> | 2011-02-16 21:02:59 -0800 |
| commit | 990373e4c55ba4f0312b5ab7974388d717d1907c (patch) | |
| tree | 1824c43736d3a6690637437ed065c761139b06e3 /WebKit/android/WebCoreSupport/WebUrlLoader.cpp | |
| parent | 03d850006e8ce54945fe44c36ffaf074143184c5 (diff) | |
| download | external_webkit-990373e4c55ba4f0312b5ab7974388d717d1907c.zip external_webkit-990373e4c55ba4f0312b5ab7974388d717d1907c.tar.gz external_webkit-990373e4c55ba4f0312b5ab7974388d717d1907c.tar.bz2 | |
b/3452201 Set certificate only when it's from the main page.
Change-Id: Ia81109b5afe993bac2ee4a3b2da232c19f750439
Diffstat (limited to 'WebKit/android/WebCoreSupport/WebUrlLoader.cpp')
| -rw-r--r-- | WebKit/android/WebCoreSupport/WebUrlLoader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/android/WebCoreSupport/WebUrlLoader.cpp b/WebKit/android/WebCoreSupport/WebUrlLoader.cpp index 531619a..0c90bc5 100644 --- a/WebKit/android/WebCoreSupport/WebUrlLoader.cpp +++ b/WebKit/android/WebCoreSupport/WebUrlLoader.cpp @@ -45,7 +45,7 @@ WebUrlLoader::~WebUrlLoader() } PassRefPtr<WebUrlLoader> WebUrlLoader::start(FrameLoaderClient* client, WebCore::ResourceHandle* resourceHandle, - const WebCore::ResourceRequest& resourceRequest, bool isMainResource, bool isSync, WebRequestContext* context) + const WebCore::ResourceRequest& resourceRequest, bool isMainResource, bool isMainFrame, bool isSync, WebRequestContext* context) { FrameLoaderClientAndroid* androidClient = static_cast<FrameLoaderClientAndroid*>(client); WebFrame* webFrame = androidClient->webFrame(); @@ -58,7 +58,7 @@ PassRefPtr<WebUrlLoader> WebUrlLoader::start(FrameLoaderClient* client, WebCore: webFrame->maybeSavePassword(androidClient->getFrame(), resourceRequest); RefPtr<WebUrlLoader> loader = WebUrlLoader::create(webFrame, resourceHandle, resourceRequest); - loader->m_loaderClient->start(isMainResource, isSync, context); + loader->m_loaderClient->start(isMainResource, isMainFrame, isSync, context); return loader.release(); } |