diff options
| author | Patrick Scott <phanna@android.com> | 2010-03-17 14:33:58 -0400 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2010-03-17 14:33:58 -0400 |
| commit | ce878f945225024203d44e7fdf9492179112ced2 (patch) | |
| tree | 9ed7dab36b662ef0019f16caee38256475412946 /WebCore/platform | |
| parent | b0c2f7b33106420933e04a3b0a69ca4d1d1b3fd8 (diff) | |
| download | external_webkit-ce878f945225024203d44e7fdf9492179112ced2.zip external_webkit-ce878f945225024203d44e7fdf9492179112ced2.tar.gz external_webkit-ce878f945225024203d44e7fdf9492179112ced2.tar.bz2 | |
Compare the client rather than the handle as the handle may not be set yet.
Bug: 2256744
Change-Id: I45baf86d56192c8752cb34f33795d2fa015ebe26
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/network/android/ResourceHandleAndroid.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/platform/network/android/ResourceHandleAndroid.cpp b/WebCore/platform/network/android/ResourceHandleAndroid.cpp index c4332d0..1154b47 100644 --- a/WebCore/platform/network/android/ResourceHandleAndroid.cpp +++ b/WebCore/platform/network/android/ResourceHandleAndroid.cpp @@ -52,7 +52,8 @@ bool ResourceHandle::start(Frame* frame) { DocumentLoader* docLoader = frame->loader()->activeDocumentLoader(); MainResourceLoader* mainLoader = docLoader->mainResourceLoader(); - bool isMainResource = mainLoader && (mainLoader->handle() == this); + bool isMainResource = + static_cast<void*>(mainLoader) == static_cast<void*>(client()); PassRefPtr<ResourceLoaderAndroid> loader = ResourceLoaderAndroid::start(this, d->m_request, frame->loader()->client(), isMainResource, false); |