7 files changed, 54 insertions, 14 deletions
diff --git a/DEPS b/DEPS
index 2682ec7..6560fdb 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
     "http://googletest.googlecode.com/svn/trunk@63",
 
   "src/third_party/WebKit":
-    "/trunk/deps/third_party/WebKit@6577",
+    "/trunk/deps/third_party/WebKit@6697",
 
   "src/third_party/icu38":
     "/trunk/deps/third_party/icu38@6594",
@@ -21,13 +21,13 @@ deps = {
     "http://v8.googlecode.com/svn/trunk@911",
 
   "src/webkit/data/layout_tests/LayoutTests":
-    "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39000",
+    "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39050",
 
   "src/third_party/WebKit/WebKit":
-    "http://svn.webkit.org/repository/webkit/trunk/WebKit@39000",
+    "http://svn.webkit.org/repository/webkit/trunk/WebKit@39050",
 
   "src/third_party/WebKit/WebKitLibraries":
-    "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39000",
+    "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39050",
 }
 
 
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index 1ef5307..57a24ea 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@39000
-\ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@39050
+\ No newline at end of file
diff --git a/webkit/port/bindings/v8/JSDOMBinding.cpp b/webkit/port/bindings/v8/JSDOMBinding.cpp
index 1c2f664..7749083 100644
--- a/webkit/port/bindings/v8/JSDOMBinding.cpp
+++ b/webkit/port/bindings/v8/JSDOMBinding.cpp
@@ -42,7 +42,7 @@ void updateDOMNodeDocument(Node* node, Document* oldDocument,
     // We don't do anything here in V8 bindings
 }
 
-JSC::ExecState* execStateFromNode(Node* node)
+ScriptState* scriptStateFromNode(Node* node)
 {
     // This should be never reached with V8 bindings (WebKit only uses it
     // for non-JS bindings)
diff --git a/webkit/port/bindings/v8/JSDOMBinding.h b/webkit/port/bindings/v8/JSDOMBinding.h
index 02537b5..815472b 100644
--- a/webkit/port/bindings/v8/JSDOMBinding.h
+++ b/webkit/port/bindings/v8/JSDOMBinding.h
@@ -34,9 +34,7 @@
 #ifndef JSDOMBinding_h
 #define JSDOMBinding_h
 
-namespace JSC {
-    class ExecState;
-}
+#include "ScriptState.h"
 
 namespace WebCore {
     class Node;
@@ -45,7 +43,8 @@ namespace WebCore {
     void updateDOMNodeDocument(Node*, Document* oldDocument,
                                Document* newDocument);
 
-    JSC::ExecState* execStateFromNode(Node*);
+    ScriptState* scriptStateFromNode(Node*);
+
 }
 
 
diff --git a/webkit/port/bindings/v8/ScriptState.h b/webkit/port/bindings/v8/ScriptState.h
new file mode 100755
index 0000000..c86e30d
--- /dev/null
+++ b/webkit/port/bindings/v8/ScriptState.h
@@ -0,0 +1,38 @@
+// Copyright (c) 2008, 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
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * 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
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef ScriptState_h
+#define ScriptState_h
+
+#include "interpreter/CallFrame.h"
+
+namespace WebCore {
+    typedef JSC::ExecState ScriptState;
+}
+#endif // ScriptState_h
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 21d0a29..22107eb 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -257,10 +257,6 @@ LayoutTests/plugins/bindings-test.html = FAIL CRASH
 // subframes are not data URLs (probably we want files in the resources dir.).
 LayoutTests/fast/encoding/char-encoding.html = FAIL
 
-// This test should pass once we merge with r39021 or later. After the merge, 
-// fast/encoding/char-decoding-mac.html should be added to tests_ignored.txt.
-LayoutTests/fast/encoding/char-decoding.html = FAIL
-
 // Bug 1130795: since we don't have Aqua-themed controls, don't ignore the
 // box-shadow properties of controls that request Aqua theming.  But since Aqua
 // controls are rare on the web, defer this fix.
@@ -2035,4 +2031,8 @@ DEBUG : LayoutTests/svg/dynamic-updates/SVGEllipseElement-dom-ry-attr.html = CRA
 LINUX : LayoutTests/fast/events/5056619.html = PASS FAIL
 
 // Started failing with r6667 I think. (darin)
+LayoutTests/fast/dom/javascript-url-crash-function.html = CRASH
 WIN : LayoutTests/http/tests/misc/font-face-in-multiple-segmented-faces.html = CRASH
+
+// Webkit merge 39000:39050 failures:
+LayoutTests/fast/css/acid2-pixel.html = TIMEOUT
diff --git a/webkit/tools/layout_tests/test_lists/tests_ignored.txt b/webkit/tools/layout_tests/test_lists/tests_ignored.txt
index 6d3e999..e3f60ea 100644
--- a/webkit/tools/layout_tests/test_lists/tests_ignored.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_ignored.txt
@@ -191,3 +191,6 @@ LINUX : chrome/fonts/impact.html = FAIL
 // repeatedly creates big regular expressions.  All the test is trying
 // to verify is that we don't crash on this page.
 LayoutTests/fast/js/regexp-charclass-crash.html = PASS TIMEOUT
+
+// Test to verify legacy MAC encodings.
+LayoutTests/fast/encoding/char-decoding-mac.html = FAIL
+\ No newline at end of file