summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-06-02 07:14:56 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-02 07:14:56 -0700
commit6ea85f710d3202b52ed43e19dad04aaa014dda94 (patch)
tree168009eaee3c48629850b8cbcfd5573b6aca187f
parentb4d178df818e8b6e7a1cfbb0e34bbf7bb9d74ec9 (diff)
parentc39561a98d7f17dc7ffe9aad1090c58e2e39794f (diff)
downloadexternal_webkit-6ea85f710d3202b52ed43e19dad04aaa014dda94.zip
external_webkit-6ea85f710d3202b52ed43e19dad04aaa014dda94.tar.gz
external_webkit-6ea85f710d3202b52ed43e19dad04aaa014dda94.tar.bz2
Merge "Fix compiler warning in CachedResourceLoader"
-rw-r--r--Source/WebCore/loader/cache/CachedResourceLoader.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
index 71edb1b..56715c6 100644
--- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp
+++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
@@ -85,11 +85,10 @@ CachedResourceLoader::CachedResourceLoader(Document* document)
, m_autoLoadImages(true)
, m_loadFinishing(false)
, m_allowStaleResources(false)
- , m_isInMethod(0)
#ifdef ANDROID_BLOCK_NETWORK_IMAGE
, m_blockNetworkImage(false)
#endif
-
+ , m_isInMethod(0)
{
}