From ce878f945225024203d44e7fdf9492179112ced2 Mon Sep 17 00:00:00 2001
From: Patrick Scott <phanna@android.com>
Date: Wed, 17 Mar 2010 14:33:58 -0400
Subject: Compare the client rather than the handle as the handle may not be
 set yet.

Bug: 2256744
Change-Id: I45baf86d56192c8752cb34f33795d2fa015ebe26
---
 WebCore/platform/network/android/ResourceHandleAndroid.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'WebCore/platform')

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);
 
-- 
cgit v1.1