diff options
| author | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-28 20:33:24 +0000 |
|---|---|---|
| committer | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-28 20:33:24 +0000 |
| commit | e4b4591f0c327baec00da5809fa2e2cdb85e4362 (patch) | |
| tree | eef341b0ca907158b624c2e074978214070759c2 /webkit/webkit.gyp | |
| parent | 49fd5cd62a9773ce94fdd5e0e3d048d8c4fd0ff0 (diff) | |
| download | chromium_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/webkit.gyp')
| -rw-r--r-- | webkit/webkit.gyp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 92a5adf..2b068e0 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -3123,8 +3123,6 @@ '../third_party/WebKit/WebCore/rendering/InlineTextBox.h', '../third_party/WebKit/WebCore/rendering/LayoutState.cpp', '../third_party/WebKit/WebCore/rendering/LayoutState.h', - '../third_party/WebKit/WebCore/rendering/ListMarkerBox.cpp', - '../third_party/WebKit/WebCore/rendering/ListMarkerBox.h', '../third_party/WebKit/WebCore/rendering/MediaControlElements.cpp', '../third_party/WebKit/WebCore/rendering/MediaControlElements.h', '../third_party/WebKit/WebCore/rendering/PointerEventsHitRules.cpp', |