summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-08-13 10:23:53 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-13 10:23:53 -0700
commit0a26479271d788e68a0240bbd2c0a541b60c8839 (patch)
tree1e4f690e52ea58c893ac9e6b345e6e2226935973 /WebKit
parent0f3bce65488d955e265fdd51dc78f7de0a236819 (diff)
parente478129e5879616b6fb973b3f2552522fd60765f (diff)
downloadexternal_webkit-0a26479271d788e68a0240bbd2c0a541b60c8839.zip
external_webkit-0a26479271d788e68a0240bbd2c0a541b60c8839.tar.gz
external_webkit-0a26479271d788e68a0240bbd2c0a541b60c8839.tar.bz2
Merge "Guard usage of BLOB-only feature correctly."
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp b/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
index 8545686..bfb8eb7 100644
--- a/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
+++ b/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
@@ -111,6 +111,7 @@ WebUrlLoaderClient::WebUrlLoaderClient(WebCore::ResourceHandle* resourceHandle,
thread->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(m_request, &WebRequest::AppendBytesToUpload, element.m_data.data(), size));
}
break;
+#if ENABLE(BLOB)
case FormDataElement::encodedFile:
if (element.m_fileLength == -1)
continue; // TODO: Not supporting directories yet
@@ -119,6 +120,7 @@ WebUrlLoaderClient::WebUrlLoaderClient(WebCore::ResourceHandle* resourceHandle,
// Chrome code is here: webkit/glue/weburlloader_impl.cc:391
}
break;
+#endif
default:
// TODO: Add a warning/DCHECK/assert here, should never happen
break;