Chromium side of merge 39453:39501.

Includes new baselines for fast/transforms/identity-matrix-expected.html, which
was edited slightly, and fast/backgrounds/opacity-on-document-element.html,
which is new and looks correct.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/17010

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

14 files changed, 78 insertions, 10 deletions

diff --git a/DEPS b/DEPS
index 0893d3e..24e358d 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@7494",
+    "/trunk/deps/third_party/WebKit@7512",
 
   "src/third_party/icu38":
     "/trunk/deps/third_party/icu38@7478",
@@ -21,13 +21,13 @@ deps = {
     "http://v8.googlecode.com/svn/trunk@968",
 
   "src/webkit/data/layout_tests/LayoutTests":
-    "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39453",
+    "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39501",
 
   "src/third_party/WebKit/WebKit":
-    "http://svn.webkit.org/repository/webkit/trunk/WebKit@39453",
+    "http://svn.webkit.org/repository/webkit/trunk/WebKit@39501",
 
   "src/third_party/WebKit/WebKitLibraries":
-    "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39453",
+    "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39501",
 }
 
 
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index 8a3eda2..db2c1d5 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@39453
\ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@39501
\ No newline at end of file
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index 9fd54a6..ae371c5 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -154,6 +154,7 @@ wtf_inputs = [
     '$WTF_DIR/RandomNumber.cpp',
     '$WTF_DIR/RefCountedLeakCounter.cpp',
     '$WTF_DIR/TCSystemAlloc.cpp',
+    '$WTF_DIR/Threading.cpp',
     '$WTF_DIR/unicode/UTF8.cpp',
     '$WTF_DIR/unicode/icu/CollatorICU.cpp',
 ]
diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj
index 5a5d7c3..ec8b39f 100644
--- a/webkit/build/JavaScriptCore/WTF.vcproj
+++ b/webkit/build/JavaScriptCore/WTF.vcproj
@@ -314,6 +314,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\Threading.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\Threading.h"
 			>
 		</File>
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 09cc470..6c7bacf 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -421,6 +421,7 @@ input_files = [
     '$WEBCORE_DIR/platform/ScrollbarThemeComposite.cpp',
     '$WEBCORE_DIR/platform/ScrollView.cpp',
     '$WEBCORE_DIR/platform/SharedBuffer.cpp',
+    '$WEBCORE_DIR/platform/ThreadGlobalData.cpp',
     '$WEBCORE_DIR/platform/Timer.cpp',
     '$WEBCORE_DIR/platform/Widget.cpp',
 
@@ -638,6 +639,8 @@ input_files = [
     '$WEBCORE_DIR/rendering/RenderTableSection.cpp',
     '$WEBCORE_DIR/rendering/RenderText.cpp',
     '$WEBCORE_DIR/rendering/RenderTextControl.cpp',
+    '$WEBCORE_DIR/rendering/RenderTextControlMultiLine.cpp',
+    '$WEBCORE_DIR/rendering/RenderTextControlSingleLine.cpp',
     '$WEBCORE_DIR/rendering/RenderTextFragment.cpp',
     '$WEBCORE_DIR/rendering/RenderTheme.cpp',
     '$WEBCORE_DIR/rendering/RenderTreeAsText.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 8a37fd6..3e0a043 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -1226,6 +1226,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ThreadGlobalData.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ThreadGlobalData.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\Threading.h"
 				>
 			</File>
@@ -3470,6 +3478,22 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderTextControlMultiLine.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderTextControlMultiLine.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderTextControlSingleLine.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderTextControlSingleLine.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderTextFragment.cpp"
 				>
 			</File>
@@ -4322,6 +4346,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\FormControlElement.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\KeyboardEvent.cpp"
 				>
 			</File>
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/opacity-on-document-element-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/opacity-on-document-element-expected.checksum
new file mode 100644
index 0000000..e4c56fd
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/opacity-on-document-element-expected.checksum
@@ -0,0 +1 @@
+0a86d95aa14a5b859537bea3e55c55c3
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/opacity-on-document-element-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/opacity-on-document-element-expected.png
new file mode 100644
index 0000000..3c82beb
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/opacity-on-document-element-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/opacity-on-document-element-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/opacity-on-document-element-expected.txt
new file mode 100644
index 0000000..d058b9f
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/opacity-on-document-element-expected.txt
@@ -0,0 +1,9 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x140
+  RenderBlock {HTML} at (0,0) size 800x140 [bgcolor=#008000]
+    RenderBody {BODY} at (50,50) size 700x40 [bgcolor=#808080]
+      RenderBlock {P} at (0,0) size 700x40
+        RenderText {#text} at (0,0) size 646x39
+          text run at (0,0) width 646: "The document background should be red, and the body gray. The rest of the viewport should be white. The"
+          text run at (0,20) width 287: "document and body should have opacity of 0.3."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/identity-matrix-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/identity-matrix-expected.checksum
index e085d69a..5be2e28 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/identity-matrix-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/identity-matrix-expected.checksum
@@ -1 +1 @@
-dc318dbbf1da76484a63adf2aa96348e
\ No newline at end of file
+7166e948881f1ef76a454476fc3e549c
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/identity-matrix-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/identity-matrix-expected.png
index a05c2d6..0718200 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/identity-matrix-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/identity-matrix-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/identity-matrix-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/identity-matrix-expected.txt
index 3c57b47..387a5aa 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/identity-matrix-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/identity-matrix-expected.txt
@@ -3,8 +3,8 @@ layer 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
-      RenderText {#text} at (0,0) size 224x19
-        text run at (0,0) width 224: "The following divs should be idential: "
+      RenderText {#text} at (0,0) size 231x19
+        text run at (0,0) width 231: "The following divs should be identical: "
       RenderBR {BR} at (0,0) size 0x0
       RenderBlock (floating) {DIV} at (5,25) size 110x110 [bgcolor=#87CEEB] [border: (5px solid #000000)]
       RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/tools/test_shell/keyboard_unittest.cc b/webkit/tools/test_shell/keyboard_unittest.cc
index a1a2dd8..673edd1 100644
--- a/webkit/tools/test_shell/keyboard_unittest.cc
+++ b/webkit/tools/test_shell/keyboard_unittest.cc
@@ -7,7 +7,6 @@
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
-#include "EventNames.h"
 #include "EventTarget.h"
 #include "KeyboardCodes.h"
 #include "KeyboardEvent.h"
@@ -27,7 +26,6 @@ class KeyboardTest : public testing::Test {
  public:
   void SetUp() {
     WTF::initializeThreading();
-    WebCore::EventNames::init();
   }
 
   // Pass a WebKeyboardEvent into the EditorClient and get back the string
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index 2fd3fa1..6b57735 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -42,6 +42,10 @@
 		049C0F6F0F00D7CA005BBE56 /* TextBoundariesICU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E91DC0D7F3CC3001ECF42 /* TextBoundariesICU.cpp */; };
 		04C3AFC30EF1E43D0046D578 /* NavigatorBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04C3AFC20EF1E43D0046D578 /* NavigatorBase.cpp */; };
 		04C3AFC60EF1E45F0046D578 /* WorkerNavigator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04C3AFC50EF1E45F0046D578 /* WorkerNavigator.cpp */; };
+		3CF1E7470F09B352009BC1A7 /* Threading.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CF1E7460F09B352009BC1A7 /* Threading.cpp */; };
+		3CF1E74C0F09B3FA009BC1A7 /* ThreadGlobalData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CF1E74A0F09B3FA009BC1A7 /* ThreadGlobalData.cpp */; };
+		3CF1E7530F09B425009BC1A7 /* RenderTextControlMultiLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CF1E74F0F09B425009BC1A7 /* RenderTextControlMultiLine.cpp */; };
+		3CF1E7540F09B425009BC1A7 /* RenderTextControlSingleLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CF1E7510F09B425009BC1A7 /* RenderTextControlSingleLine.cpp */; };
 		4103039F0EFB0F7C008832CA /* CachedPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4103039E0EFB0F7C008832CA /* CachedPage.cpp */; };
 		4112E7060EFB0A26001E0E7A /* RandomNumber.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4112E7050EFB0A26001E0E7A /* RandomNumber.cpp */; };
 		416F45220ED7697D008215B6 /* FrameLoaderClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 416F45210ED7697D008215B6 /* FrameLoaderClient.cpp */; };
@@ -1467,6 +1471,14 @@
 		3CBAF5FE0EFC893600E752CB /* TransformOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransformOperations.h; sourceTree = "<group>"; };
 		3CBAF5FF0EFC893600E752CB /* TranslateTransformOperation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TranslateTransformOperation.cpp; sourceTree = "<group>"; };
 		3CBAF6000EFC893600E752CB /* TranslateTransformOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TranslateTransformOperation.h; sourceTree = "<group>"; };
+		3CF1E7460F09B352009BC1A7 /* Threading.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Threading.cpp; sourceTree = "<group>"; };
+		3CF1E74A0F09B3FA009BC1A7 /* ThreadGlobalData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadGlobalData.cpp; sourceTree = "<group>"; };
+		3CF1E74B0F09B3FA009BC1A7 /* ThreadGlobalData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadGlobalData.h; sourceTree = "<group>"; };
+		3CF1E74F0F09B425009BC1A7 /* RenderTextControlMultiLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTextControlMultiLine.cpp; sourceTree = "<group>"; };
+		3CF1E7500F09B425009BC1A7 /* RenderTextControlMultiLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderTextControlMultiLine.h; sourceTree = "<group>"; };
+		3CF1E7510F09B425009BC1A7 /* RenderTextControlSingleLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTextControlSingleLine.cpp; sourceTree = "<group>"; };
+		3CF1E7520F09B425009BC1A7 /* RenderTextControlSingleLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderTextControlSingleLine.h; sourceTree = "<group>"; };
+		3CF1E7570F09B441009BC1A7 /* FormControlElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormControlElement.h; sourceTree = "<group>"; };
 		410303530EFB0C7C008832CA /* ScriptCachedPageData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptCachedPageData.h; sourceTree = "<group>"; };
 		4103039E0EFB0F7C008832CA /* CachedPage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachedPage.cpp; sourceTree = "<group>"; };
 		410303A10EFB0F8D008832CA /* CachedPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedPage.h; sourceTree = "<group>"; };
@@ -4717,6 +4729,7 @@
 				7B5E85D70D7F28F5001ECF42 /* TCSpinLock.h */,
 				7B5E85D80D7F28F5001ECF42 /* TCSystemAlloc.cpp */,
 				7B5E85D90D7F28F5001ECF42 /* TCSystemAlloc.h */,
+				3CF1E7460F09B352009BC1A7 /* Threading.cpp */,
 				4DB7F5260E9BD3FB00C66CE0 /* Threading.h */,
 				4DB7F5270E9BD3FB00C66CE0 /* ThreadingPthreads.cpp */,
 				4DB7F5280E9BD3FB00C66CE0 /* ThreadSpecific.h */,
@@ -4984,6 +4997,7 @@
 				7B5E8A090D7F3A7C001ECF42 /* ExceptionBase.h */,
 				7B5E8A0A0D7F3A7C001ECF42 /* ExceptionCode.cpp */,
 				7B5E8A0B0D7F3A7C001ECF42 /* ExceptionCode.h */,
+				3CF1E7570F09B441009BC1A7 /* FormControlElement.h */,
 				7B5E8A0C0D7F3A7C001ECF42 /* KeyboardEvent.cpp */,
 				7B5E8A0D0D7F3A7C001ECF42 /* KeyboardEvent.h */,
 				7B5E8A110D7F3A7C001ECF42 /* MappedAttribute.cpp */,
@@ -5707,6 +5721,8 @@
 				4D16411C0EC29D01008F024E /* Theme.h */,
 				4D16411D0EC29D01008F024E /* ThemeTypes.h */,
 				7B5E91F90D7F3CC3001ECF42 /* ThreadCheck.h */,
+				3CF1E74A0F09B3FA009BC1A7 /* ThreadGlobalData.cpp */,
+				3CF1E74B0F09B3FA009BC1A7 /* ThreadGlobalData.h */,
 				7B5E91FC0D7F3CC3001ECF42 /* Timer.cpp */,
 				7B5E91FD0D7F3CC3001ECF42 /* Timer.h */,
 				4D16411E0EC29D01008F024E /* TreeShared.h */,
@@ -6196,6 +6212,10 @@
 				B5C180A80E958F0E006EAF87 /* RenderText.h */,
 				7B5E959D0D7F3E95001ECF42 /* RenderTextControl.cpp */,
 				7B5E959E0D7F3E95001ECF42 /* RenderTextControl.h */,
+				3CF1E74F0F09B425009BC1A7 /* RenderTextControlMultiLine.cpp */,
+				3CF1E7500F09B425009BC1A7 /* RenderTextControlMultiLine.h */,
+				3CF1E7510F09B425009BC1A7 /* RenderTextControlSingleLine.cpp */,
+				3CF1E7520F09B425009BC1A7 /* RenderTextControlSingleLine.h */,
 				7B5E959F0D7F3E95001ECF42 /* RenderTextFragment.cpp */,
 				7B5E95A00D7F3E95001ECF42 /* RenderTextFragment.h */,
 				7B5E95A10D7F3E95001ECF42 /* RenderTheme.cpp */,
@@ -8140,6 +8160,7 @@
 				4112E7060EFB0A26001E0E7A /* RandomNumber.cpp in Sources */,
 				E40054A70E9BC4C20055B38E /* RefCountedLeakCounter.cpp in Sources */,
 				7B5E86090D7F28F5001ECF42 /* TCSystemAlloc.cpp in Sources */,
+				3CF1E7470F09B352009BC1A7 /* Threading.cpp in Sources */,
 				4DB7F52A0E9BD3FB00C66CE0 /* ThreadingPthreads.cpp in Sources */,
 				7B5E860E0D7F28F5001ECF42 /* UTF8.cpp in Sources */,
 			);
@@ -8977,6 +8998,8 @@
 				E45625890E268E87005E4685 /* RenderTableSection.cpp in Sources */,
 				E456258A0E268E87005E4685 /* RenderText.cpp in Sources */,
 				E456258B0E268E87005E4685 /* RenderTextControl.cpp in Sources */,
+				3CF1E7530F09B425009BC1A7 /* RenderTextControlMultiLine.cpp in Sources */,
+				3CF1E7540F09B425009BC1A7 /* RenderTextControlSingleLine.cpp in Sources */,
 				E456258C0E268E87005E4685 /* RenderTextFragment.cpp in Sources */,
 				E456258D0E268E87005E4685 /* RenderTheme.cpp in Sources */,
 				41A362390F0032B100778012 /* RenderThemeChromiumMac.mm in Sources */,
@@ -9272,6 +9295,7 @@
 				E45624180E268E87005E4685 /* TextIterator.cpp in Sources */,
 				E45624990E268E87005E4685 /* TextResourceDecoder.cpp in Sources */,
 				E45625460E268E87005E4685 /* TextStream.cpp in Sources */,
+				3CF1E74C0F09B3FA009BC1A7 /* ThreadGlobalData.cpp in Sources */,
 				E45625480E268E87005E4685 /* Timer.cpp in Sources */,
 				E45624760E268E87005E4685 /* TimeRanges.cpp in Sources */,
 				41822B070F0000F70034A67A /* TransformOperations.cpp in Sources */,