Roll WebKit DEPS from 45738 to 45840.

Review URL: http://codereview.chromium.org/149575

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20589 0039d316-1c4b-4281-b951-d872f2087c98

12 files changed, 61 insertions, 10 deletions

diff --git a/webkit/api/public/WebWorkerClient.h b/webkit/api/public/WebWorkerClient.h
index 6c6f0db..a5faddd 100644
--- a/webkit/api/public/WebWorkerClient.h
+++ b/webkit/api/public/WebWorkerClient.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ -14,7 +14,7 @@
  *     * Neither the name of Google Inc. nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -51,6 +51,7 @@ namespace WebKit {
         virtual void postConsoleMessageToWorkerObject(
             int destinationIdentifier,
             int sourceIdentifier,
+            int messageType,
             int messageLevel,
             const WebString& message,
             int lineNumber,
diff --git a/webkit/glue/chrome_client_impl.cc b/webkit/glue/chrome_client_impl.cc
index 53aca2e..d868767 100644
--- a/webkit/glue/chrome_client_impl.cc
+++ b/webkit/glue/chrome_client_impl.cc
@@ -312,6 +312,7 @@ void ChromeClientImpl::setResizable(bool value) {
 }
 
 void ChromeClientImpl::addMessageToConsole(WebCore::MessageSource source,
+                                           WebCore::MessageType type,
                                            WebCore::MessageLevel level,
                                            const WebCore::String& message,
                                            unsigned int line_no,
diff --git a/webkit/glue/chrome_client_impl.h b/webkit/glue/chrome_client_impl.h
index 03478cd..cebffc2 100644
--- a/webkit/glue/chrome_client_impl.h
+++ b/webkit/glue/chrome_client_impl.h
@@ -70,6 +70,7 @@ class ChromeClientImpl : public WebCore::ChromeClientChromium {
   virtual void setResizable(bool);
 
   virtual void addMessageToConsole(WebCore::MessageSource source,
+                                   WebCore::MessageType type,
                                    WebCore::MessageLevel level,
                                    const WebCore::String& message,
                                    unsigned int lineNumber,
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 73ae01bc..f74dd2c 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -1708,8 +1708,9 @@ void WebFrameImpl::AddMessageToConsole(const WebConsoleMessage& message) {
   }
 
   frame()->domWindow()->console()->addMessage(
-      WebCore::OtherMessageSource, webcore_message_level,
-      webkit_glue::WebStringToString(message.text), 1, String());
+      WebCore::OtherMessageSource, WebCore::LogMessageType,
+      webcore_message_level, webkit_glue::WebStringToString(message.text),
+      1, String());
 }
 
 void WebFrameImpl::ClosePage() {
diff --git a/webkit/glue/webworker_impl.cc b/webkit/glue/webworker_impl.cc
index e42dbfe..4016e85 100644
--- a/webkit/glue/webworker_impl.cc
+++ b/webkit/glue/webworker_impl.cc
@@ -277,6 +277,7 @@ void WebWorkerImpl::PostExceptionTask(
 void WebWorkerImpl::postConsoleMessageToWorkerObject(
     WebCore::MessageDestination destination,
     WebCore::MessageSource source,
+    WebCore::MessageType type,
     WebCore::MessageLevel level,
     const WebCore::String& message,
     int line_number,
@@ -286,6 +287,7 @@ void WebWorkerImpl::postConsoleMessageToWorkerObject(
       this,
       static_cast<int>(destination),
       static_cast<int>(source),
+      static_cast<int>(type),
       static_cast<int>(level),
       message,
       line_number,
@@ -297,6 +299,7 @@ void WebWorkerImpl::PostConsoleMessageTask(
     WebWorkerImpl* this_ptr,
     int destination,
     int source,
+    int type,
     int level,
     const WebCore::String& message,
     int line_number,
@@ -304,6 +307,7 @@ void WebWorkerImpl::PostConsoleMessageTask(
   this_ptr->client_->postConsoleMessageToWorkerObject(
       destination,
       source,
+      type,
       level,
       webkit_glue::StringToWebString(message),
       line_number,
diff --git a/webkit/glue/webworker_impl.h b/webkit/glue/webworker_impl.h
index f7daf42..0a1a3db 100644
--- a/webkit/glue/webworker_impl.h
+++ b/webkit/glue/webworker_impl.h
@@ -45,6 +45,7 @@ class WebWorkerImpl: public WebCore::WorkerObjectProxy,
   virtual void postConsoleMessageToWorkerObject(
       WebCore::MessageDestination destination,
       WebCore::MessageSource source,
+      WebCore::MessageType type,
       WebCore::MessageLevel level,
       const WebCore::String& message,
       int line_number,
@@ -104,6 +105,7 @@ class WebWorkerImpl: public WebCore::WorkerObjectProxy,
       WebWorkerImpl* this_ptr,
       int destination,
       int source,
+      int type,
       int level,
       const WebCore::String& message,
       int line_number,
diff --git a/webkit/glue/webworkerclient_impl.cc b/webkit/glue/webworkerclient_impl.cc
index d915ca7..22b7c17 100644
--- a/webkit/glue/webworkerclient_impl.cc
+++ b/webkit/glue/webworkerclient_impl.cc
@@ -221,6 +221,7 @@ void WebWorkerClientImpl::postExceptionToWorkerObject(
 void WebWorkerClientImpl::postConsoleMessageToWorkerObject(
     int destination_id,
     int source_id,
+    int message_type,
     int message_level,
     const WebString& message,
     int line_number,
@@ -228,7 +229,7 @@ void WebWorkerClientImpl::postConsoleMessageToWorkerObject(
   if (WTF::currentThread() != worker_thread_id_) {
     script_execution_context_->postTask(
         WebCore::createCallbackTask(&PostConsoleMessageToWorkerObjectTask, this,
-            destination_id, source_id, message_level,
+            destination_id, source_id, message_type, message_level,
             webkit_glue::WebStringToString(message),
             line_number,
             webkit_glue::WebStringToString(source_url)));
@@ -238,6 +239,7 @@ void WebWorkerClientImpl::postConsoleMessageToWorkerObject(
   script_execution_context_->addMessage(
       static_cast<WebCore::MessageDestination>(destination_id),
       static_cast<WebCore::MessageSource>(source_id),
+      static_cast<WebCore::MessageType>(message_type),
       static_cast<WebCore::MessageLevel>(message_level),
       webkit_glue::WebStringToString(message),
       line_number,
@@ -332,6 +334,7 @@ void WebWorkerClientImpl::PostConsoleMessageToWorkerObjectTask(
     WebWorkerClientImpl* this_ptr,
     int destination_id,
     int source_id,
+    int message_type,
     int message_level,
     const WebCore::String& message,
     int line_number,
@@ -339,6 +342,7 @@ void WebWorkerClientImpl::PostConsoleMessageToWorkerObjectTask(
   this_ptr->script_execution_context_->addMessage(
       static_cast<WebCore::MessageDestination>(destination_id),
       static_cast<WebCore::MessageSource>(source_id),
+      static_cast<WebCore::MessageType>(message_type),
       static_cast<WebCore::MessageLevel>(message_level),
       message,
       line_number,
diff --git a/webkit/glue/webworkerclient_impl.h b/webkit/glue/webworkerclient_impl.h
index b5f1aac..18422cf 100644
--- a/webkit/glue/webworkerclient_impl.h
+++ b/webkit/glue/webworkerclient_impl.h
@@ -56,6 +56,7 @@ class WebWorkerClientImpl : public WebCore::WorkerContextProxy,
   virtual void postConsoleMessageToWorkerObject(
       int destination_id,
       int source_id,
+      int message_type,
       int message_level,
       const WebKit::WebString& message,
       int line_number,
@@ -110,6 +111,7 @@ class WebWorkerClientImpl : public WebCore::WorkerContextProxy,
       WebWorkerClientImpl* this_ptr,
       int destination_id,
       int source_id,
+      int message_type,
       int message_level,
       const WebCore::String& message,
       int line_number,
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 667f85c..0800316 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2843,3 +2843,36 @@ BUG16675 : LayoutTests/fast/dom/offset-parent-positioned-and-inline.html = CRASH
 BUG16675 : LayoutTests/fast/images/favicon-as-image.html = CRASH
 BUG16675 : LayoutTests/fast/images/pdf-as-background.html = CRASH
 
+// WebKit merge 42738:45840
+// Canvas-related failures.
+BUG16676 : LayoutTests/fast/canvas/canvas-composite-alpha.html = FAIL
+BUG16676 : LayoutTests/fast/canvas/canvas-invalid-strokestyle.html = FAIL
+BUG16676 : LayoutTests/fast/canvas/canvas-path-with-inf-nan-dimensions.html = FAIL
+BUG16676 : LayoutTests/fast/canvas/canvas-set-properties-with-non-invertible-ctm.html = FAIL
+BUG16676 : LayoutTests/fast/canvas/canvas-stroke-empty-fill.html = FAIL
+BUG16676 : LayoutTests/fast/canvas/canvas-text-baseline.html = FAIL
+BUG16676 : LayoutTests/fast/canvas/canvas-transforms-during-path.html = FAIL
+BUG16676 : LayoutTests/fast/canvas/fill-stroke-clip-reset-path.html = FAIL
+BUG16676 : LayoutTests/fast/canvas/quadraticCurveTo.xml = FAIL
+
+// WebKit merge 42738:45840
+// New tests, need baseline.
+BUG16678 : LayoutTests/media/audio-data-url.html = FAIL
+BUG16678 : LayoutTests/fast/dom/replace-first-child.html = FAIL
+BUG16678 : LayoutTests/fast/text/international/khmer-selection.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/base-href-safe3.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/inline-event-HTML-entities.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/javascript-link-HTML-entities-control-char.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/javascript-link-HTML-entities-named.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/javascript-link-HTML-entities-null-char.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/javascript-link-HTML-entities.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/javascript-link-control-char.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/javascript-link-null-char.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/javascript-link.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/link-onclick-entities.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/script-tag-entities.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/script-tag-src-redirect-safe.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/script-tag-with-source-double-quote.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/script-tag-with-source-entities.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/script-tag-with-source-no-quote.html = FAIL
+
diff --git a/webkit/tools/test_shell/test_worker/test_webworker.cc b/webkit/tools/test_shell/test_worker/test_webworker.cc
index 29733b4..9adacd8 100644
--- a/webkit/tools/test_shell/test_worker/test_webworker.cc
+++ b/webkit/tools/test_shell/test_worker/test_webworker.cc
@@ -87,14 +87,15 @@ void TestWebWorker::postExceptionToWorkerObject(const WebString& error_message,
 void TestWebWorker::postConsoleMessageToWorkerObject(
     int destination_id,
     int source_id,
+    int message_type,
     int message_level,
     const WebString& message,
     int line_number,
     const WebString& source_url) {
   if (webworkerclient_delegate_)
     webworkerclient_delegate_->postConsoleMessageToWorkerObject(
-        destination_id, source_id, message_level, message, line_number,
-        source_url);
+        destination_id, source_id, message_type, message_level,
+        message, line_number, source_url);
 }
 
 void TestWebWorker::confirmMessageFromWorkerObject(bool has_pending_activity) {
diff --git a/webkit/tools/test_shell/test_worker/test_webworker.h b/webkit/tools/test_shell/test_worker/test_webworker.h
index 171b09c..f0ee118 100644
--- a/webkit/tools/test_shell/test_worker/test_webworker.h
+++ b/webkit/tools/test_shell/test_worker/test_webworker.h
@@ -41,6 +41,7 @@ class TestWebWorker : public WebKit::WebWorker,
   virtual void postConsoleMessageToWorkerObject(
       int destination_id,
       int source_id,
+      int message_type,
       int message_level,
       const WebKit::WebString& message,
       int line_number,
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 7f428c3..308fb5f 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -708,6 +708,7 @@
         '../third_party/WebKit/WebCore/dom/EventException.idl',
         '../third_party/WebKit/WebCore/dom/EventListener.idl',
         '../third_party/WebKit/WebCore/dom/EventTarget.idl',
+        '../third_party/WebKit/WebCore/dom/HTMLAllCollection.idl',
         '../third_party/WebKit/WebCore/dom/KeyboardEvent.idl',
         '../third_party/WebKit/WebCore/dom/MessageChannel.idl',
         '../third_party/WebKit/WebCore/dom/MessageEvent.idl',
@@ -3196,6 +3197,7 @@
         '../third_party/WebKit/WebCore/rendering/RenderBR.h',
         '../third_party/WebKit/WebCore/rendering/RenderBlock.cpp',
         '../third_party/WebKit/WebCore/rendering/RenderBlock.h',
+        '../third_party/WebKit/WebCore/rendering/RenderBlockLineLayout.cpp',
         '../third_party/WebKit/WebCore/rendering/RenderBox.cpp',
         '../third_party/WebKit/WebCore/rendering/RenderBox.h',
         '../third_party/WebKit/WebCore/rendering/RenderBoxModelObject.cpp',
@@ -3364,8 +3366,6 @@
         '../third_party/WebKit/WebCore/rendering/TextControlInnerElements.h',
         '../third_party/WebKit/WebCore/rendering/TransformState.cpp',
         '../third_party/WebKit/WebCore/rendering/TransformState.h',
-        '../third_party/WebKit/WebCore/rendering/bidi.cpp',
-        '../third_party/WebKit/WebCore/rendering/bidi.h',
         '../third_party/WebKit/WebCore/rendering/break_lines.cpp',
         '../third_party/WebKit/WebCore/rendering/break_lines.h',
         '../third_party/WebKit/WebCore/storage/ChangeVersionWrapper.cpp',