diff options
author | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 21:54:49 +0000 |
---|---|---|
committer | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 21:54:49 +0000 |
commit | 75b61bdafbb19ec3a60caee9016a4cdd7f1cba3b (patch) | |
tree | 48dda7fc8eeaf6012e9967d1e9c02e59b9f6c9c7 /webkit | |
parent | 76edb6710c1baa00745f48bb7d19dde7999879f2 (diff) | |
download | chromium_src-75b61bdafbb19ec3a60caee9016a4cdd7f1cba3b.zip chromium_src-75b61bdafbb19ec3a60caee9016a4cdd7f1cba3b.tar.gz chromium_src-75b61bdafbb19ec3a60caee9016a4cdd7f1cba3b.tar.bz2 |
Build WebKit Full Screen API. Support is disabled by default; enable with --enable-fullscreen.
Commit after WK bug 44797 (r79774).
Fullscreen tests are temporarily until expectations can be updated.
(Deleted test video-play-suspend.html is removed from test_expectations to fix lint errors.)
BUG=16735
TEST=fullscreen layout tests
Review URL: http://codereview.chromium.org/6627001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/glue/webpreferences.cc | 5 | ||||
-rw-r--r-- | webkit/glue/webpreferences.h | 1 | ||||
-rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index 252b83d..0edac2f 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -72,7 +72,8 @@ WebPreferences::WebPreferences() accelerated_2d_canvas_enabled(false), accelerated_plugins_enabled(false), memory_info_enabled(false), - interactive_form_validation_enabled(true) { + interactive_form_validation_enabled(true), + fullscreen_enabled(false) { } WebPreferences::~WebPreferences() { @@ -205,4 +206,6 @@ void WebPreferences::Apply(WebView* web_view) const { settings->setInteractiveFormValidationEnabled( interactive_form_validation_enabled); + + settings->setFullScreenEnabled(fullscreen_enabled); } diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h index 1b07b76..aed98ba 100644 --- a/webkit/glue/webpreferences.h +++ b/webkit/glue/webpreferences.h @@ -79,6 +79,7 @@ struct WebPreferences { bool accelerated_plugins_enabled; bool memory_info_enabled; bool interactive_form_validation_enabled; + bool fullscreen_enabled; // We try to keep the default values the same as the default values in // chrome, except for the cases where it would require lots of extra work for diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 3c9112b..7b36dde 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -10,9 +10,6 @@ BUGCR69594 SKIP : http/tests/appcache/different-https-origin-resource-main.html BUGV8_1203 DEBUG : fast/canvas/webgl/gl-get-calls.html = PASS CRASH -// Potential broken test found by r75985. -BUGCR74092 : http/tests/media/video-play-suspend.html = TIMEOUT - // WebKit fix is at r79797, but since we had to revert the WebKit roll adding the failing expectation back. BUGJAMESR : fast/filesystem/op-get-entry.html = PASS TEXT @@ -21,3 +18,6 @@ BUG_ANTONM MAC : http/tests/security/xss-DENIED-xml-external-entity.xhtml = TEXT BUG_ANTONM MAC : http/tests/security/xss-DENIED-xsl-external-entity.xml = TEXT BUG_TONYG MAC : svg/text/font-size-below-point-five.svg = TEXT + +// Skip these tests until the test_expecitations can be updated after this Chromium patch lands. +BUGWK44797 SKIP : fullscreen = PASS FAIL TIMEOUT |