summaryrefslogtreecommitdiffstats
path: root/webkit/build
diff options
context:
space:
mode:
authordglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-28 20:33:24 +0000
committerdglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-28 20:33:24 +0000
commite4b4591f0c327baec00da5809fa2e2cdb85e4362 (patch)
treeeef341b0ca907158b624c2e074978214070759c2 /webkit/build
parent49fd5cd62a9773ce94fdd5e0e3d048d8c4fd0ff0 (diff)
downloadchromium_src-e4b4591f0c327baec00da5809fa2e2cdb85e4362.zip
chromium_src-e4b4591f0c327baec00da5809fa2e2cdb85e4362.tar.gz
chromium_src-e4b4591f0c327baec00da5809fa2e2cdb85e4362.tar.bz2
WebKit Merge 42805:42932, Chromium side.
Gross offenders: * Unforking LazyEventListeners: http://trac.webkit.org/changeset/42843 * Removing ListMarkerBox: http://trac.webkit.org/changeset/42846 * SVG changes: http://trac.webkit.org/changeset/42840 * Window object is now an event target: http://trac.webkit.org/changeset/42882 R=jeremy BUG=0 TEST=trybots Review URL: http://codereview.chromium.org/99147 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14776 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
-rw-r--r--webkit/build/WebCore/WebCore.vcproj8
1 files changed, 0 insertions, 8 deletions
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 30a532c..0e1dffc 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -3237,14 +3237,6 @@
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\ListMarkerBox.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\ListMarkerBox.h"
- >
- </File>
- <File
RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\MediaControlElements.cpp"
>
</File>