diff options
author | Feng Qian <> | 2009-04-10 18:11:29 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-10 18:11:29 -0700 |
commit | 8f72e70a9fd78eec56623b3a62e68f16b7b27e28 (patch) | |
tree | 181bf9a400c30a1bf34ea6d72560e8d00111d549 /WebCore/loader/icon/IconLoader.cpp | |
parent | 7ed56f225e0ade046e1c2178977f72b2d896f196 (diff) | |
download | external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.zip external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.gz external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.bz2 |
AI 145796: Land the WebKit merge @r42026.
Automated import of CL 145796
Diffstat (limited to 'WebCore/loader/icon/IconLoader.cpp')
-rw-r--r-- | WebCore/loader/icon/IconLoader.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/WebCore/loader/icon/IconLoader.cpp b/WebCore/loader/icon/IconLoader.cpp index b7bf115..5dd000e 100644 --- a/WebCore/loader/icon/IconLoader.cpp +++ b/WebCore/loader/icon/IconLoader.cpp @@ -35,6 +35,7 @@ #include "ResourceHandle.h" #include "ResourceResponse.h" #include "ResourceRequest.h" +#include "SharedBuffer.h" #include "SubresourceLoader.h" #include <wtf/UnusedParam.h> @@ -62,14 +63,6 @@ void IconLoader::startLoading() if (m_resourceLoader) return; - // FIXME: http://bugs.webkit.org/show_bug.cgi?id=10902 - // Once ResourceHandle will load without a DocLoader, we can remove this check. - // A frame may be documentless - one example is a frame containing only a PDF. - if (!m_frame->document()) { - LOG(IconDatabase, "Documentless-frame - icon won't be loaded"); - return; - } - // Set flag so we can detect the case where the load completes before // SubresourceLoader::create returns. m_loadIsInProgress = true; |