diff options
| author | Andrei Popescu <andreip@google.com> | 2009-12-15 05:05:47 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-15 05:05:47 -0800 |
| commit | 27fe1be0694fb6b93e68f2c660707bf547f11448 (patch) | |
| tree | 0c30ab1d8461c7249fe42488b011bbdbcc66ecc3 | |
| parent | 6c71a725e7d7d323ce940f529297f865dd136a0a (diff) | |
| parent | c337233bf32d37af40d40c195996c2d3bf0cba8a (diff) | |
| download | external_webkit-27fe1be0694fb6b93e68f2c660707bf547f11448.zip external_webkit-27fe1be0694fb6b93e68f2c660707bf547f11448.tar.gz external_webkit-27fe1be0694fb6b93e68f2c660707bf547f11448.tar.bz2 | |
am c337233b: Do not merge
Merge commit 'c337233bf32d37af40d40c195996c2d3bf0cba8a' into eclair-mr2-plus-aosp
* commit 'c337233bf32d37af40d40c195996c2d3bf0cba8a':
Do not merge
| -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); |