WebKit merge 39100:39141 (CL 2 of 2).

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

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

4 files changed, 47 insertions, 2 deletions

diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 12c1889..cbdf1b6 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -377,12 +377,14 @@ input_files = [
     '$WEBCORE_DIR/page/History.cpp',
     '$WEBCORE_DIR/page/MouseEventWithHitTestResults.cpp',
     '$WEBCORE_DIR/page/Navigator.cpp',
+    '$WEBCORE_DIR/page/NavigatorBase.cpp',
     '$WEBCORE_DIR/page/Page.cpp',
     '$WEBCORE_DIR/page/PageGroup.cpp',
     '$WEBCORE_DIR/page/Screen.cpp',
     '$WEBCORE_DIR/page/SecurityOrigin.cpp',
     '$WEBCORE_DIR/page/Settings.cpp',
     '$WEBCORE_DIR/page/WindowFeatures.cpp',
+    '$WEBCORE_DIR/page/WorkerNavigator.cpp',
 
     '$WEBCORE_DIR/page/animation/AnimationBase.cpp',
     '$WEBCORE_DIR/page/animation/AnimationController.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 5608b90..89391b0 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -398,6 +398,14 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\third_party\WebKit\WebCore\page\NavigatorBase.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\third_party\WebKit\WebCore\page\NavigatorBase.h"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\third_party\WebKit\WebCore\page\Page.cpp"

 				>

 			</File>

@@ -465,6 +473,14 @@
 				RelativePath="..\..\..\third_party\WebKit\WebCore\page\WindowFeatures.h"

 				>

 			</File>

+			<File

+				RelativePath="..\..\..\third_party\WebKit\WebCore\page\WorkerNavigator.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\third_party\WebKit\WebCore\page\WorkerNavigator.h"

+				>

+			</File>

 			<Filter

 				Name="animation"

 				>

diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index a8589b9..2539604 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1702,7 +1702,6 @@ MAC : LayoutTests/fast/js/kde/lval-exceptions.html = FAIL
 MAC : LayoutTests/fast/js/kde/parse.html = FAIL
 MAC : LayoutTests/fast/js/kde/string-1-n.html = FAIL
 MAC : LayoutTests/fast/js/kde/string-2-n.html = FAIL
-MAC : LayoutTests/fast/js/modify-non-references.html = FAIL
 MAC : LayoutTests/fast/js/number-toExponential.html = FAIL
 MAC : LayoutTests/fast/js/number-tofixed.html = FAIL
 MAC : LayoutTests/fast/js/number-toprecision.html = FAIL
@@ -1714,7 +1713,6 @@ MAC : LayoutTests/fast/js/recursion-limit-equal.html = FAIL
 MAC : LayoutTests/fast/js/regexp-compile-crash.html = FAIL
 MAC : LayoutTests/fast/js/regexp-compile.html = FAIL
 MAC : LayoutTests/fast/js/regexp-no-extensions.html = FAIL
-MAC : LayoutTests/fast/js/regexp-overflow.html = FAIL
 MAC : LayoutTests/fast/js/regexp-range-out-of-order.html = FAIL
 MAC : LayoutTests/fast/js/reserved-words.html = FAIL
 MAC : LayoutTests/fast/js/string-capitalization.html = FAIL
@@ -2005,6 +2003,23 @@ LayoutTests/fast/dom/java-applet-calls.html = FAIL
 LayoutTests/fast/repaint/transform-repaint-descendants.html = FAIL
 LayoutTests/http/tests/loading/simple-subframe.html = FAIL
 
+// WebKit Merge 39100:39141 new tests:
+LayoutTests/editing/execCommand/enabling-and-selection-2.html = FAIL
+SKIP : LayoutTests/fast/dom/Window/timeout-released-on-close.html = FAIL
+LayoutTests/fast/events/special-key-events-in-input-text.html = FAIL
+LayoutTests/fast/regex/non-pattern-characters.html = FAIL
+SKIP : LayoutTests/fast/workers/worker-navigator.html = FAIL
+SKIP : LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-image-not-loaded-svg.svg = FAIL
+LayoutTests/wml/go-task-get-method-external-deck.html = FAIL
+LayoutTests/wml/go-task-get-method-same-deck.html = FAIL
+LayoutTests/wml/go-task-get-method-external-deck-with-href.html = FAIL
+
+// WebKit Merge 39100:39141 regressions:
+LayoutTests/fast/css/font-face-descriptor-multiple-values-parsing.html = FAIL
+LayoutTests/fast/js/large-expressions.html = FAIL
+LayoutTests/fast/js/modify-non-references.html = FAIL
+LayoutTests/fast/js/regexp-overflow.html = FAIL
+
 // Linux pixeltest failure: font metrics for Ahem(?).
 // evanm sent a reduction of this problem to agl.
 LINUX : LayoutTests/fast/block/margin-collapse/055.html = FAIL
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index 1eaf751..0107c2d 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -38,6 +38,8 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
+		04C3AFC30EF1E43D0046D578 /* NavigatorBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04C3AFC20EF1E43D0046D578 /* NavigatorBase.cpp */; };
+		04C3AFC60EF1E45F0046D578 /* WorkerNavigator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04C3AFC50EF1E45F0046D578 /* WorkerNavigator.cpp */; };
 		416F45220ED7697D008215B6 /* FrameLoaderClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 416F45210ED7697D008215B6 /* FrameLoaderClient.cpp */; };
 		41AF32C60EE5E6ED00BF6361 /* ScriptInstance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41AF32C40EE5E6ED00BF6361 /* ScriptInstance.cpp */; };
 		4D11C5520E9AC23100EF7617 /* RenderThemeMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = E49E50DE0E65E33200AD47F7 /* RenderThemeMac.mm */; };
@@ -1437,6 +1439,10 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		04C3AFC20EF1E43D0046D578 /* NavigatorBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NavigatorBase.cpp; sourceTree = "<group>"; };
+		04C3AFC40EF1E4430046D578 /* NavigatorBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigatorBase.h; sourceTree = "<group>"; };
+		04C3AFC50EF1E45F0046D578 /* WorkerNavigator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerNavigator.cpp; sourceTree = "<group>"; };
+		04C3AFC70EF1E4650046D578 /* WorkerNavigator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerNavigator.h; sourceTree = "<group>"; };
 		416F45210ED7697D008215B6 /* FrameLoaderClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameLoaderClient.cpp; sourceTree = "<group>"; };
 		41AF32C40EE5E6ED00BF6361 /* ScriptInstance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptInstance.cpp; sourceTree = "<group>"; };
 		41AF32C50EE5E6ED00BF6361 /* ScriptInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptInstance.h; sourceTree = "<group>"; };
@@ -5547,6 +5553,8 @@
 				7B5E8F0A0D7F3C49001ECF42 /* MouseEventWithHitTestResults.h */,
 				ABA23E6B0E9FC43700C96905 /* Navigator.cpp */,
 				4DDC62A20EAD13EF00FB5EBE /* Navigator.h */,
+				04C3AFC20EF1E43D0046D578 /* NavigatorBase.cpp */,
+				04C3AFC40EF1E4430046D578 /* NavigatorBase.h */,
 				7B5E8F0B0D7F3C49001ECF42 /* Page.cpp */,
 				7B5E8F0C0D7F3C49001ECF42 /* Page.h */,
 				4DB7F1FB0E9BAE2900C66CE0 /* PageGroup.cpp */,
@@ -5567,6 +5575,8 @@
 				7B5E8F170D7F3C49001ECF42 /* Settings.h */,
 				7B5E8F1C0D7F3C49001ECF42 /* WindowFeatures.cpp */,
 				7B5E8F1D0D7F3C49001ECF42 /* WindowFeatures.h */,
+				04C3AFC50EF1E45F0046D578 /* WorkerNavigator.cpp */,
+				04C3AFC70EF1E4650046D578 /* WorkerNavigator.h */,
 			);
 			path = page;
 			sourceTree = "<group>";
@@ -9274,6 +9284,8 @@
 				93817B930EF1CD9600993F02 /* NativeImageSkia.cpp in Sources */,
 				93817B940EF1CD9600993F02 /* PlatformContextSkia.cpp in Sources */,
 				93817B950EF1CD9600993F02 /* SkiaUtils.cpp in Sources */,
+				04C3AFC30EF1E43D0046D578 /* NavigatorBase.cpp in Sources */,
+				04C3AFC60EF1E45F0046D578 /* WorkerNavigator.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};