diff options
| author | Andrei Popescu <andreip@google.com> | 2009-12-15 12:26:47 +0000 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2009-12-15 12:26:47 +0000 |
| commit | c337233bf32d37af40d40c195996c2d3bf0cba8a (patch) | |
| tree | 0c30ab1d8461c7249fe42488b011bbdbcc66ecc3 /WebCore | |
| parent | 34c094028c1a0d04a7dc21256c0cfde68ec4d93f (diff) | |
| download | external_webkit-c337233bf32d37af40d40c195996c2d3bf0cba8a.zip external_webkit-c337233bf32d37af40d40c195996c2d3bf0cba8a.tar.gz external_webkit-c337233bf32d37af40d40c195996c2d3bf0cba8a.tar.bz2 | |
Do not merge
Replicate https://android-git.corp.google.com/g/#change,35704 to mr2
to leave this branch in a sane state. Otherwise, the browser crashes on startup.
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/network/android/ResourceHandleAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/platform/network/android/ResourceHandleAndroid.cpp b/WebCore/platform/network/android/ResourceHandleAndroid.cpp index 60bfc7b..c4332d0 100644 --- a/WebCore/platform/network/android/ResourceHandleAndroid.cpp +++ b/WebCore/platform/network/android/ResourceHandleAndroid.cpp @@ -52,7 +52,7 @@ bool ResourceHandle::start(Frame* frame) { DocumentLoader* docLoader = frame->loader()->activeDocumentLoader(); MainResourceLoader* mainLoader = docLoader->mainResourceLoader(); - bool isMainResource = (mainLoader->handle() == this); + bool isMainResource = mainLoader && (mainLoader->handle() == this); PassRefPtr<ResourceLoaderAndroid> loader = ResourceLoaderAndroid::start(this, d->m_request, frame->loader()->client(), isMainResource, false); |