Update WebKit r44872:44922

Compensate for atwilson@'s change to MessagePorts and add new added layout tests which failure.

The deleted *expected files were due to a conversion of a test to dump as text.

atwilson's code review was done in http://codereview.chromium.org/131047

BUG=None
TEST=None
TBR=paulg


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

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

9 files changed, 18 insertions, 23 deletions

diff --git a/DEPS b/DEPS
index 0fd099e..1cbf521 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
 vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
-  "webkit_revision": "44872",
+  "webkit_revision": "44922",
 }
 
 
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/5156801-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/5156801-expected.checksum
deleted file mode 100644
index 67c9614..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/5156801-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-116cc8a04bff7f42e110c037af53a94a
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/5156801-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/5156801-expected.png
deleted file mode 100644
index b755014..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/5156801-expected.png
+++ /dev/null
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5156801-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5156801-expected.checksum
deleted file mode 100644
index 8729207..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5156801-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-609fceb7b5c5cfe8b6330bd147e3bae0
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5156801-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5156801-expected.png
deleted file mode 100644
index 41587d4..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5156801-expected.png
+++ /dev/null
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5156801-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5156801-expected.txt
deleted file mode 100644
index 3cee497..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5156801-expected.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x40
-        RenderText {#text} at (0,0) size 783x39
-          text run at (0,0) width 783: "This tests for a bug where delete would crash if a node just after the selection to delete is removed in a DOMNodeRemoved event"
-          text run at (0,20) width 297: "handler for the last node in the selection to delete."
-      RenderBlock {DIV} at (0,56) size 784x20
-        RenderText {#text} at (0,0) size 20x19
-          text run at (0,0) width 20: "foo"
-        RenderInline {SPAN} at (0,0) size 7x19
-          RenderText {#text} at (20,0) size 7x19
-            text run at (20,0) width 7: "x"
-        RenderInline {SPAN} at (0,0) size 7x19
-          RenderText {#text} at (27,0) size 7x19
-            text run at (27,0) width 7: "y"
diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp
index 46bff01..1f2a669 100644
--- a/webkit/port/bindings/v8/v8_proxy.cpp
+++ b/webkit/port/bindings/v8/v8_proxy.cpp
@@ -361,11 +361,18 @@ ACTIVE_DOM_OBJECT_TYPES(MAKE_CASE)
     // ports are actually entangled in MessagePort::entangle, but to avoid
     // forking MessagePort.* this is postponed to GC time. Having this postponed
     // has the drawback that the wrappers are "entangled/unentangled" for each
-    // GC even though their entnaglement most likely is still the same.
+    // GC even though their entanglement most likely is still the same.
     if (type == V8ClassIndex::MESSAGEPORT) {
       // Get the port and its entangled port.
       MessagePort* port1 = static_cast<MessagePort*>(obj);
-      MessagePortProxy* port2 = port1->entangledPort();
+      MessagePort* port2 = port1->locallyEntangledPort();
+
+      // If we are remotely entangled, then mark this object as reachable
+      // (we can't determine reachability directly as the remote object is
+      // out-of-proc).
+      if (port1->isEntangled() && !port2)
+          wrapper.ClearWeak();
+
       if (port2 != NULL) {
         // As ports are always entangled in pairs only perform the entanglement
         // once for each pair (see ASSERT in MessagePort::unentangle()).
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 77c4beb..8fe1487 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2767,3 +2767,6 @@ BUG14771 WIN LINUX : LayoutTests/svg/filters/feTile.svg = FAIL
 BUG14752 LINUX DEBUG: LayoutTests/http/tests/cache/subresource-expiration.html = CRASH PASS
 BUG14751 LINUX DEBUG: LayoutTests/css2.1/atrule_longest_match.html = CRASH PASS
 BUG14767 LINUX : LayoutTests/dom/html/level1/core/documentgetdoctypenodtd.html = CRASH PASS
+
+BUG14832 : LayoutTests/editing/selection/user-drag-element-and-user-select-none.html = FAIL
+BUG14831 : LayoutTests/fast/events/event-trace.html = FAIL
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 9b03435..208ed3b 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -34,6 +34,7 @@
       '../third_party/WebKit/WebCore/bindings/v8/custom',
       '../third_party/WebKit/WebCore/css',
       '../third_party/WebKit/WebCore/dom',
+      '../third_party/WebKit/WebCore/dom/default',
       '../third_party/WebKit/WebCore/editing',
       '../third_party/WebKit/WebCore/history',
       '../third_party/WebKit/WebCore/html',
@@ -1346,6 +1347,8 @@
         '../third_party/WebKit/WebCore/css/WebKitCSSMatrix.h',
         '../third_party/WebKit/WebCore/css/WebKitCSSTransformValue.cpp',
         '../third_party/WebKit/WebCore/css/WebKitCSSTransformValue.h',
+        '../third_party/WebKit/WebCore/dom/default/PlatformMessagePortChannel.cpp',
+        '../third_party/WebKit/WebCore/dom/default/PlatformMessagePortChannel.h',
         '../third_party/WebKit/WebCore/dom/ActiveDOMObject.cpp',
         '../third_party/WebKit/WebCore/dom/ActiveDOMObject.h',
         '../third_party/WebKit/WebCore/dom/Attr.cpp',
@@ -1433,6 +1436,8 @@
         '../third_party/WebKit/WebCore/dom/MessageEvent.h',
         '../third_party/WebKit/WebCore/dom/MessagePort.cpp',
         '../third_party/WebKit/WebCore/dom/MessagePort.h',
+        '../third_party/WebKit/WebCore/dom/MessagePortChannel.cpp',
+        '../third_party/WebKit/WebCore/dom/MessagePortChannel.h',
         '../third_party/WebKit/WebCore/dom/MouseEvent.cpp',
         '../third_party/WebKit/WebCore/dom/MouseEvent.h',
         '../third_party/WebKit/WebCore/dom/MouseRelatedEvent.cpp',