diff options
| -rwxr-xr-x | webkit/build/V8Bindings/build-generated-files.sh | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 5 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/webkit/build/V8Bindings/build-generated-files.sh b/webkit/build/V8Bindings/build-generated-files.sh index c175cc9..18328c1 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_SVG ENABLE_SVG_ANIMATION ENABLE_SVG_AS_IMAGE ENABLE_SVG_FONTS ENABLE_SVG_FOREIGN_OBJECT ENABLE_SVG_USE ENABLE_VIDEO ENABLE_WORKERS ENABLE_XPATH ENABLE_XSLT" +export FEATURE_DEFINES="ENABLE_SVG ENABLE_SVG_ANIMATION ENABLE_SVG_AS_IMAGE ENABLE_SVG_FONTS ENABLE_SVG_FOREIGN_OBJECT ENABLE_SVG_USE ENABLE_VIDEO ENABLE_WORKERS ENABLE_CHANNEL_MESSAGING 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/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index de8c808..6c5e13c 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2455,11 +2455,6 @@ BUG10055 LINUX DEBUG : LayoutTests/svg/text/text-tselect-02-f.svg = FAIL BUG10045 LINUX : LayoutTests/editing/inserting/5418891.html = FAIL BUG10045 LINUX : LayoutTests/editing/inserting/5510537.html = FAIL -// Regression from WebKit merge 42403:42440 -- MessageChannel binding no longer -// gets generated, probably just a matter of enabling ENABLE_CHANNEL_MESSAGING -// due to http://trac.webkit.org/changeset/42428. -BUG10489 : chrome/fast/dom/messageport-gc.html = TIMEOUT - // New test added by http://trac.webkit.org/changeset/42501. // Has already been rebaselined for chromium-win. BUG10529 LINUX : LayoutTests/editing/inserting/6703873.html = FAIL diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index f075bfd..37a282a 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -5,6 +5,7 @@ { 'variables': { 'feature_defines': [ + 'ENABLE_CHANNEL_MESSAGING=1', 'ENABLE_DATABASE=1', 'ENABLE_DASHBOARD_SUPPORT=0', 'ENABLE_JAVASCRIPT_DEBUGGER=0', |