diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-16 20:54:28 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-16 20:54:28 +0000 |
| commit | a7eb5dba27030a39ce515fffebb394c3bdefbcb6 (patch) | |
| tree | 65e4b41b32a49a8a3c03d12d08f252204930dba2 /webkit | |
| parent | b4635cc6474eb1b85523e6cc59164e8281fbb53e (diff) | |
| download | chromium_src-a7eb5dba27030a39ce515fffebb394c3bdefbcb6.zip chromium_src-a7eb5dba27030a39ce515fffebb394c3bdefbcb6.tar.gz chromium_src-a7eb5dba27030a39ce515fffebb394c3bdefbcb6.tar.bz2 | |
WebKit merge from r44699 to r44726.
Compile fix for new files in r44726 and a test changed in r44712.
Review URL: http://codereview.chromium.org/125207
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18529 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 4 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 7a48ada..41b6e53 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2770,3 +2770,7 @@ BUG14207 LINUX DEBUG : LayoutTests/tables/mozilla/bugs/bug28341.html = FAIL // Test expectation changed upstream in // http://trac.webkit.org/changeset/44695 BUGMERGE REBASELINE WIN : LayoutTests/fast/frames/viewsource-attribute.html = FAIL + +// WebKit 44699:44726 +// Test expectation changed upstream in r44712 +BUGMERGE REBASELINE WIN : LayoutTests/editing/pasteboard/5368833.html = FAIL diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index a2e8873..5fc9102 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -3736,8 +3736,6 @@ '../third_party/WebKit/WebCore/workers/WorkerContext.cpp', '../third_party/WebKit/WebCore/workers/WorkerContext.h', '../third_party/WebKit/WebCore/workers/WorkerContextProxy.h', - '../third_party/WebKit/WebCore/workers/WorkerImportScriptsClient.cpp', - '../third_party/WebKit/WebCore/workers/WorkerImportScriptsClient.h', '../third_party/WebKit/WebCore/workers/WorkerLoaderProxy.h', '../third_party/WebKit/WebCore/workers/WorkerLocation.cpp', '../third_party/WebKit/WebCore/workers/WorkerLocation.h', @@ -3746,6 +3744,9 @@ '../third_party/WebKit/WebCore/workers/WorkerObjectProxy.h', '../third_party/WebKit/WebCore/workers/WorkerRunLoop.cpp', '../third_party/WebKit/WebCore/workers/WorkerRunLoop.h', + '../third_party/WebKit/WebCore/workers/WorkerScriptLoader.cpp', + '../third_party/WebKit/WebCore/workers/WorkerScriptLoader.h', + '../third_party/WebKit/WebCore/workers/WorkerScriptLoaderClient.h', '../third_party/WebKit/WebCore/workers/WorkerThread.cpp', '../third_party/WebKit/WebCore/workers/WorkerThread.h', '../third_party/WebKit/WebCore/xml/DOMParser.cpp', |