Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 2 insertions, 6 deletions

diff --git a/Source/WebCore/fileapi/WebKitBlobBuilder.cpp b/Source/WebCore/fileapi/WebKitBlobBuilder.cpp
index 8312a547c..1622e2fe4 100644
--- a/Source/WebCore/fileapi/WebKitBlobBuilder.cpp
+++ b/Source/WebCore/fileapi/WebKitBlobBuilder.cpp
@@ -39,7 +39,6 @@
 #include "HistogramSupport.h"
 #include "LineEnding.h"
 #include "ScriptCallStack.h"
-#include "ScriptExecutionContext.h"
 #include "TextEncoding.h"
 #include <wtf/ArrayBuffer.h>
 #include <wtf/ArrayBufferView.h>
@@ -89,11 +88,8 @@ void BlobBuilder::append(const String& text, const String& endingType)
 }
 
 #if ENABLE(BLOB)
-void BlobBuilder::append(ScriptExecutionContext* context, ArrayBuffer* arrayBuffer)
+void BlobBuilder::append(ArrayBuffer* arrayBuffer)
 {
-    String consoleMessage("ArrayBuffer values are deprecated in Blob Constructor. Use ArrayBufferView instead.");
-    context->addConsoleMessage(JSMessageSource, LogMessageType, WarningMessageLevel, consoleMessage);
-
     HistogramSupport::histogramEnumeration("WebCore.Blob.constructor.ArrayBufferOrView", BlobConstructorArrayBuffer, BlobConstructorArrayBufferOrViewMax);
 
     if (!arrayBuffer)
@@ -150,7 +146,7 @@ void BlobBuilder::appendBytesData(const void* data, size_t length)
 PassRefPtr<Blob> BlobBuilder::getBlob(const String& contentType)
 {
     OwnPtr<BlobData> blobData = BlobData::create();
-    blobData->setContentType(contentType);
+    blobData->setContentType(Blob::normalizedContentType(contentType));
     blobData->swapItems(m_items);
 
     RefPtr<Blob> blob = Blob::create(blobData.release(), m_size);