WebKit update 48700:48721.

Accommodate upstream changes, introduced by:
* http://trac.webkit.org/changeset/48720 (V8 fix)
* http://trac.webkit.org/changeset/48701 (original)


R=vitalyr
TEST=none
BUG=none

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

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

5 files changed, 35 insertions, 20 deletions

diff --git a/DEPS b/DEPS
index 4895fef9..92c267c 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
 vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
-  "webkit_revision": "48700",
+  "webkit_revision": "48721",
   "ffmpeg_revision": "26428",
 }
 
diff --git a/webkit/api/src/ApplicationCacheHost.cpp b/webkit/api/src/ApplicationCacheHost.cpp
index 6085dbd..75129a9 100644
--- a/webkit/api/src/ApplicationCacheHost.cpp
+++ b/webkit/api/src/ApplicationCacheHost.cpp
@@ -63,7 +63,8 @@ public:
 
     virtual void notifyEventListener(WebApplicationCacheHost::EventID eventID)
     {
-        m_innerHost->notifyEventListener(static_cast<ApplicationCacheHost::EventID>(eventID));
+        m_innerHost->notifyDOMApplicationCache(
+            static_cast<ApplicationCacheHost::EventID>(eventID));
     }
 
     ApplicationCacheHost* m_innerHost;
@@ -217,10 +218,15 @@ void ApplicationCacheHost::setDOMApplicationCache(DOMApplicationCache* domApplic
     m_domApplicationCache = domApplicationCache;
 }
 
-void ApplicationCacheHost::notifyEventListener(EventID id)
+void ApplicationCacheHost::notifyDOMApplicationCache(EventID id)
 {
-    if (m_domApplicationCache)
-        m_domApplicationCache->callEventListener(id);
+    if (m_domApplicationCache) {
+        ExceptionCode ec = 0;
+        m_domApplicationCache->dispatchEvent(
+            Event::create(DOMApplicationCache::toEventType(id), false, false),
+            ec);
+        ASSERT(!ec);
+    }
 }
 
 ApplicationCacheHost::Status ApplicationCacheHost::status() const
diff --git a/webkit/glue/webworker_impl.cc b/webkit/glue/webworker_impl.cc
index f306c91..ada6864 100644
--- a/webkit/glue/webworker_impl.cc
+++ b/webkit/glue/webworker_impl.cc
@@ -10,6 +10,7 @@
 #include "DedicatedWorkerThread.h"
 #include "GenericWorkerTask.h"
 #include "KURL.h"
+#include "MessageEvent.h"
 #include "MessagePort.h"
 #include "MessagePortChannel.h"
 #include "ScriptExecutionContext.h"
@@ -122,7 +123,8 @@ void WebWorkerImpl::PostMessageToWorkerContextTask(
 
   WTF::OwnPtr<WebCore::MessagePortArray> ports =
       WebCore::MessagePort::entanglePorts(*context, channels.release());
-  worker_context->dispatchMessage(message, ports.release());
+  worker_context->dispatchEvent(
+      WebCore::MessageEvent::create(ports.release(), message));
 
   this_ptr->confirmMessageFromWorkerObject(
       worker_context->hasPendingActivity());
diff --git a/webkit/glue/webworkerclient_impl.cc b/webkit/glue/webworkerclient_impl.cc
index c273dbb..8df7175 100644
--- a/webkit/glue/webworkerclient_impl.cc
+++ b/webkit/glue/webworkerclient_impl.cc
@@ -9,16 +9,18 @@
 #include "base/compiler_specific.h"
 
 #include "DedicatedWorkerThread.h"
+#include "ErrorEvent.h"
 #include "Frame.h"
 #include "FrameLoaderClient.h"
 #include "GenericWorkerTask.h"
+#include "MessageEvent.h"
 #include "MessagePort.h"
 #include "MessagePortChannel.h"
 #include "ScriptExecutionContext.h"
-#include "WorkerContextExecutionProxy.h"
-#include "WorkerMessagingProxy.h"
 #include "Worker.h"
 #include "WorkerContext.h"
+#include "WorkerContextExecutionProxy.h"
+#include "WorkerMessagingProxy.h"
 #include <wtf/Threading.h>
 
 #undef LOG
@@ -237,10 +239,10 @@ void WebWorkerClientImpl::postExceptionToWorkerObject(
   }
 
   bool handled = false;
-  handled = worker_->dispatchScriptErrorEvent(
-      webkit_glue::WebStringToString(error_message),
-      webkit_glue::WebStringToString(source_url),
-      line_number);
+  handled = worker_->dispatchEvent(
+      WebCore::ErrorEvent::create(webkit_glue::WebStringToString(error_message),
+                                  webkit_glue::WebStringToString(source_url),
+                                  line_number));
   if (!handled)
     script_execution_context_->reportException(
         webkit_glue::WebStringToString(error_message),
@@ -347,7 +349,8 @@ void WebWorkerClientImpl::PostMessageToWorkerObjectTask(
   if (this_ptr->worker_) {
     WTF::OwnPtr<WebCore::MessagePortArray> ports =
         WebCore::MessagePort::entanglePorts(*context, channels.release());
-    this_ptr->worker_->dispatchMessage(message, ports.release());
+    this_ptr->worker_->dispatchEvent(
+        WebCore::MessageEvent::create(ports.release(), message));
   }
 }
 
@@ -359,8 +362,8 @@ void WebWorkerClientImpl::PostExceptionToWorkerObjectTask(
     const WebCore::String& source_url) {
   bool handled = false;
   if (this_ptr->worker_)
-    handled = this_ptr->worker_->dispatchScriptErrorEvent(
-        error_message, source_url, line_number);
+    handled = this_ptr->worker_->dispatchEvent(
+        WebCore::ErrorEvent::create(error_message, source_url, line_number));
   if (!handled)
     this_ptr->script_execution_context_->reportException(
         error_message, line_number, source_url);
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index a13b2a5..94802f4 100755
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -430,8 +430,7 @@ BUG18978 MAC : LayoutTests/http/tests/xmlhttprequest/cache-override.html = FAIL
 // LightTPD doesn't accept unknown HTTP methods
 BUG18978 SKIP : LayoutTests/http/tests/xmlhttprequest/methods-lower-case.html = TIMEOUT CRASH
 BUG18978 : LayoutTests/http/tests/xmlhttprequest/methods-async.html = TIMEOUT
-BUG18978 LINUX MAC : LayoutTests/http/tests/xmlhttprequest/access-control-basic-allow-preflight-cache-invalidation-by-method.html = FAIL
-BUG18978 WIN : LayoutTests/http/tests/xmlhttprequest/access-control-basic-allow-preflight-cache-invalidation-by-method.html = FAIL TIMEOUT
+BUG18978 : LayoutTests/http/tests/xmlhttprequest/access-control-basic-allow-preflight-cache-invalidation-by-method.html = FAIL TIMEOUT
 // LightTPD doesn't accept unknown HTTP methods and passes CGIs a Content-Type
 // even when a request didn't send the header.
 BUG18978 WIN LINUX : LayoutTests/http/tests/xmlhttprequest/methods.html = FAIL
@@ -1810,9 +1809,9 @@ BUG9798 WIN DEBUG : LayoutTests/http/tests/misc/empty-file-formdata.html = TIMEO
 BUG9798 WIN DEBUG : LayoutTests/http/tests/misc/refresh-headers.php = TIMEOUT PASS
 BUG9798 WIN RELEASE : LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe.html = TIMEOUT PASS
 BUG9798 WIN RELEASE : LayoutTests/http/tests/uri/utf8-path.html = TIMEOUT PASS
-BUG9798 WIN MAC : LayoutTests/http/tests/xmlhttprequest/access-control-basic-allow-preflight-cache-invalidation-by-header.html = TIMEOUT PASS
-BUG9798 WIN : LayoutTests/http/tests/xmlhttprequest/access-control-basic-allow-preflight-cache-timeout.html = TIMEOUT PASS
-BUG9798 WIN MAC RELEASE : LayoutTests/http/tests/xmlhttprequest/access-control-basic-allow-preflight-cache.html = TIMEOUT PASS
+BUG9798 : LayoutTests/http/tests/xmlhttprequest/access-control-basic-allow-preflight-cache-invalidation-by-header.html = TIMEOUT PASS
+BUG9798 : LayoutTests/http/tests/xmlhttprequest/access-control-basic-allow-preflight-cache-timeout.html = TIMEOUT PASS
+BUG9798 : LayoutTests/http/tests/xmlhttprequest/access-control-basic-allow-preflight-cache.html = TIMEOUT PASS
 BUG9798 : LayoutTests/http/tests/xmlhttprequest/failed-auth.html = TIMEOUT PASS
 BUG9798 WIN RELEASE : LayoutTests/transitions/change-values-during-transition.html = FAIL PASS
 BUG9797 LINUX DEBUG : LayoutTests/svg/carto.net/colourpicker.svg = FAIL
@@ -2345,3 +2344,8 @@ BUG_DGLAZKOV : LayoutTests/fast/loader/fragment-after-redirect-gets-back-entry.h
 BUG_DGLAZKOV LINUX WIN : LayoutTests/fast/forms/basic-buttons.html = FAIL
 BUG_DGLAZKOV LINUX WIN : LayoutTests/fast/forms/basic-inputs.html = FAIL
 BUG_DGLAZKOV : LayoutTests/fast/forms/textarea-maxlength.html = FAIL
+
+// WebKit update 48700:48721
+BUG_DGLAZKOV : LayoutTests/fast/xmlhttprequest/xmlhttprequest-get.xhtml = FAIL
+BUG_DGLAZKOV : LayoutTests/http/tests/xmlhttprequest/event-target.html = FAIL
+BUG_DGLAZKOV : LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-abort-readyState-shouldDispatchEvent.html = FAIL