Chromium half of WebKit Merge, turns off ENABLE_VIDEO

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

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

6 files changed, 48 insertions, 8 deletions

diff --git a/DEPS b/DEPS
index ad74b04..b9b3327 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
 vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
-  "webkit_revision": "41906",
+  "webkit_revision": "41944",
 }
 
 
@@ -19,7 +19,7 @@ deps = {
     "http://googletest.googlecode.com/svn/trunk@214",
 
   "src/third_party/WebKit":
-    "/trunk/deps/third_party/WebKit@12376",
+    "/trunk/deps/third_party/WebKit@12477",
 
   "src/third_party/icu38":
     "/trunk/deps/third_party/icu38@12390",
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index d52fd3f..609ff80 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@41906
\ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@41944
\ No newline at end of file
diff --git a/webkit/build/V8Bindings/build-generated-files.sh b/webkit/build/V8Bindings/build-generated-files.sh
index 46a3dc0..2453744 100755
--- a/webkit/build/V8Bindings/build-generated-files.sh
+++ b/webkit/build/V8Bindings/build-generated-files.sh
@@ -43,7 +43,7 @@ export ENCODINGS_PREFIX=""
 
 # To see what FEATURE_DEFINES Apple uses, look at:
 # webkit/third_party/WebCore/Configurations/WebCore.xcconfig
-export FEATURE_DEFINES="ENABLE_WORKERS ENABLE_VIDEO ENABLE_SVG ENABLE_SVG_ANIMATION ENABLE_SVG_AS_IMAGE ENABLE_SVG_FONTS ENABLE_SVG_FOREIGN_OBJECT ENABLE_SVG_USE ENABLE_XPATH ENABLE_XSLT"
+export FEATURE_DEFINES="ENABLE_WORKERS ENABLE_SVG ENABLE_SVG_ANIMATION ENABLE_SVG_AS_IMAGE ENABLE_SVG_FONTS ENABLE_SVG_FOREIGN_OBJECT ENABLE_SVG_USE ENABLE_XPATH ENABLE_XSLT"
 
 # Adjust the number of jobs spawned according to the CPU count.
 if [ -z "$NUMBER_OF_PROCESSORS" ]; then
diff --git a/webkit/build/webkit_common_defines.vsprops b/webkit/build/webkit_common_defines.vsprops
index e2ff37a5..a8a9b17 100644
--- a/webkit/build/webkit_common_defines.vsprops
+++ b/webkit/build/webkit_common_defines.vsprops
@@ -6,6 +6,6 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		PreprocessorDefinitions="ENABLE_DATABASE=1;ENABLE_DASHBOARD_SUPPORT=0;ENABLE_JAVASCRIPT_DEBUGGER=0;ENABLE_JSC_MULTIPLE_THREADS=0;ENABLE_ICONDATABASE=0;ENABLE_XSLT=1;ENABLE_XPATH=1;ENABLE_SVG=1;ENABLE_SVG_ANIMATION=1;ENABLE_SVG_AS_IMAGE=1;ENABLE_SVG_USE=1;ENABLE_SVG_FOREIGN_OBJECT=1;ENABLE_SVG_FONTS=1;ENABLE_VIDEO=1;ENABLE_WORKERS=1;WEBCORE_NAVIGATOR_PLATFORM=&quot;\&quot;Win32\&quot;&quot;;USE_GOOGLE_URL_LIBRARY;USE_SYSTEM_MALLOC=1;CRASH=__debugbreak;BUILDING_CHROMIUM__=1"
+		PreprocessorDefinitions="ENABLE_DATABASE=1;ENABLE_DASHBOARD_SUPPORT=0;ENABLE_JAVASCRIPT_DEBUGGER=0;ENABLE_JSC_MULTIPLE_THREADS=0;ENABLE_ICONDATABASE=0;ENABLE_XSLT=1;ENABLE_XPATH=1;ENABLE_SVG=1;ENABLE_SVG_ANIMATION=1;ENABLE_SVG_AS_IMAGE=1;ENABLE_SVG_USE=1;ENABLE_SVG_FOREIGN_OBJECT=1;ENABLE_SVG_FONTS=1;ENABLE_WORKERS=1;WEBCORE_NAVIGATOR_PLATFORM=&quot;\&quot;Win32\&quot;&quot;;USE_GOOGLE_URL_LIBRARY;USE_SYSTEM_MALLOC=1;CRASH=__debugbreak;BUILDING_CHROMIUM__=1"
 	/>
 </VisualStudioPropertySheet>
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index 27d66c6..5eebb36 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -156,8 +156,8 @@ class AutocompletePopupMenuClient : public WebCore::PopupMenuClient {
     font_description.setComputedSize(12.0);
     Font font(font_description, 0, 0);
     font.update(text_field->document()->styleSelector()->fontSelector());
-    style_.reset(new PopupMenuStyle(Color::black, Color::white, font, true));
-
+    style_.reset(new PopupMenuStyle(Color::black, Color::white, font, true,
+        Length(WebCore::Fixed), LTR));
   }
 
   virtual ~AutocompletePopupMenuClient() {
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index f6c8c8b..47f41d1 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -2246,7 +2246,7 @@ WIN DEBUG : LayoutTests/fast/dom/length-attribute-mapping.html = CRASH
 WIN DEBUG : LayoutTests/svg/W3C-SVG-1.1/extend-namespace-01-f.svg = CRASH
 WIN LINUX : LayoutTests/fast/repaint/renderer-destruction-by-invalidateSelection-crash.html = FAIL PASS
 WIN LINUX : LayoutTests/editing/selection/move-by-line-002.html = FAIL PASS
-WIN : LayoutTests/webarchive/loading/cache-expired-subresource.html = CRASH PASS
+WIN : LayoutTests/webarchive/loading/cache-expired-subresource.html = CRASH PASS TIMEOUT
 WIN : LayoutTests/webarchive/loading/test-loading-archive.html = CRASH TIMEOUT PASS
 LINUX : LayoutTests/http/tests/navigation/javascriptlink-basic.html = FAIL PASS
 MAC : LayoutTests/fast/css/rgb-float.html = FAIL PASS
@@ -2267,3 +2267,43 @@ LINUX DEBUG : chrome/fast/dom/htmliframeelement-document.html = FAIL
 // Merge 41860:41906 New tests
 DEFER WIN LINUX : LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table.html = FAIL
 DEFER WIN LINUX : LayoutTests/http/tests/misc/generated-content-inside-table.html = FAIL
+
+// New failures from merge
+DEFER WIN : LayoutTests/editing/selection/hit-test-anonymous.html = FAIL
+DEFER WIN : LayoutTests/fast/clip/016.html = FAIL
+DEFER WIN : LayoutTests/fast/clip/outline-overflowClip.html = FAIL
+DEFER WIN : LayoutTests/fast/css/clip-zooming.html = FAIL
+DEFER WIN : LayoutTests/fast/css/rtl-ordering.html = FAIL
+DEFER WIN : LayoutTests/fast/encoding/denormalised-voiced-japanese-chars.html = FAIL
+DEFER WIN : LayoutTests/fast/forms/input-appearance-height.html = FAIL
+DEFER WIN : LayoutTests/fast/forms/listbox-hit-test-zoomed.html = FAIL
+DEFER WIN : LayoutTests/fast/forms/search-zoomed.html = FAIL
+DEFER WIN : LayoutTests/fast/forms/select-visual-hebrew.html = FAIL
+DEFER WIN : LayoutTests/fast/forms/slider-mouse-events.html = FAIL
+DEFER WIN : LayoutTests/fast/forms/slider-onchange-event.html = FAIL
+DEFER WIN : LayoutTests/fast/forms/slider-padding.html = FAIL
+DEFER WIN : LayoutTests/fast/forms/slider-thumb-shared-style.html = FAIL
+DEFER WIN : LayoutTests/fast/forms/slider-transformed.html = FAIL
+DEFER WIN : LayoutTests/fast/forms/slider-zoomed.html = FAIL
+DEFER WIN : LayoutTests/fast/forms/visual-hebrew-text-field.html = FAIL
+DEFER WIN : LayoutTests/fast/lists/w3-list-styles.html = FAIL
+DEFER WIN : LayoutTests/fast/text/international/001.html = FAIL
+DEFER WIN : LayoutTests/fast/text/international/002.html = FAIL
+DEFER WIN : LayoutTests/fast/text/international/003.html = FAIL
+DEFER WIN : LayoutTests/fast/text/international/wrap-CJK-001.html = FAIL
+DEFER WIN : LayoutTests/http/tests/security/cross-frame-access-protocol-explicit-domain.html = FAIL
+DEFER WIN : LayoutTests/http/tests/security/cross-frame-access-protocol.html = FAIL
+DEFER WIN : LayoutTests/http/tests/ssl/verify-ssl-enabled.php = FAIL
+DEFER WIN : LayoutTests/svg/W3C-SVG-1.1/animate-elem-36-t.svg = FAIL
+DEFER WIN : LayoutTests/svg/W3C-SVG-1.1/animate-elem-39-t.svg = FAIL
+DEFER WIN : LayoutTests/svg/W3C-SVG-1.1/text-fonts-01-t.svg = FAIL
+DEFER WIN : LayoutTests/svg/W3C-SVG-1.1/text-intro-05-t.svg = FAIL
+DEFER WIN : LayoutTests/svg/carto.net/scrollbar.svg = FAIL
+DEFER WIN : LayoutTests/svg/carto.net/selectionlist.svg = FAIL
+DEFER WIN : LayoutTests/svg/custom/focus-ring.svg = FAIL
+DEFER WIN : LayoutTests/svg/custom/image-parent-translation.xhtml = FAIL
+DEFER WIN : LayoutTests/svg/custom/js-update-image.svg = FAIL
+DEFER WIN : LayoutTests/svg/custom/text-image-opacity.svg = FAIL
+DEFER WIN : LayoutTests/svg/text/text-fonts-01-t.svg = FAIL
+DEFER WIN : LayoutTests/svg/text/text-intro-05-t.svg = FAIL
+DEFER WIN : LayoutTests/http/tests/security/originHeader/origin-header-for-https.html = TIMEOUT