diff options
| author | dimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-24 22:04:01 +0000 |
|---|---|---|
| committer | dimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-24 22:04:01 +0000 |
| commit | 2073de3cf523d1096d3416ac071b6f6968dbeb79 (patch) | |
| tree | d35c08a138e8d01ab3afe6f48b60c29122438239 /webkit/build | |
| parent | 366ffe559b8d2a422792394114d8cdb2746e8ad5 (diff) | |
| download | chromium_src-2073de3cf523d1096d3416ac071b6f6968dbeb79.zip chromium_src-2073de3cf523d1096d3416ac071b6f6968dbeb79.tar.gz chromium_src-2073de3cf523d1096d3416ac071b6f6968dbeb79.tar.bz2 | |
Chromium side of WebKit merge 42725:42805.
In addition to the tests that were rebaselined or disabled, the following tests fail on my machine but I suspect it's my local ssl problem and will risk it on buildbot. Will promptly disable them if they don't work there.
LayoutTests/http/tests/security/cross-frame-access-protocol-explicit-domain.html = FAIL
LayoutTests/http/tests/security/cross-frame-access-protocol.html = FAIL
LayoutTests/http/tests/ssl/verify-ssl-enabled.php = FAIL
LayoutTests/http/tests/security/originHeader/origin-header-for-https.html = TIMEOUT
Review URL: http://codereview.chromium.org/92157
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14484 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 8c3d0f2..23e966a 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -4981,6 +4981,14 @@ RelativePath="..\..\..\third_party\WebKit\WebCore\dom\XMLTokenizerLibxml2.cpp" > </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\dom\XMLTokenizerScope.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\dom\XMLTokenizerScope.h" + > + </File> </Filter> <Filter Name="editing" |