diff options
| author | pamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-22 04:55:14 +0000 |
|---|---|---|
| committer | pamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-22 04:55:14 +0000 |
| commit | ff3d1e05ef440f4ba219179d3536a172b42476e8 (patch) | |
| tree | 5b79c55058a0a1e47c4c51a2efb7e142072bfdb1 /webkit/SConscript | |
| parent | eb6c3395cbcf61eb784765f3975ee7aa3b3d81da (diff) | |
| download | chromium_src-ff3d1e05ef440f4ba219179d3536a172b42476e8.zip chromium_src-ff3d1e05ef440f4ba219179d3536a172b42476e8.tar.gz chromium_src-ff3d1e05ef440f4ba219179d3536a172b42476e8.tar.bz2 | |
cChrome side of WebKit merge 39369:39410.
* Move files from platform/graphics into platform/animation and
platform/graphics/transforms and update include path
* Add stubs for two new methods in FrameLoaderClient
* Re-baseline one new layout test for Windows and add two to tests_fixable.
Review URL: http://codereview.chromium.org/14917
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/SConscript')
| -rw-r--r-- | webkit/SConscript | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/SConscript b/webkit/SConscript index 2cb73e7..7ad4851 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -134,10 +134,12 @@ env.Prepend( '$WEBKIT_DIR_PORT_INC/history', '$WEBKIT_DIR_PORT_INC/page/chromium', '$WEBKIT_DIR_PORT_INC/platform', + '$WEBKIT_DIR_PORT_INC/platform/animation', '$WEBKIT_DIR_PORT_INC/platform/chromium', '$WEBKIT_DIR_PORT_INC/platform/graphics', '$WEBKIT_DIR_PORT_INC/platform/graphics/chromium', '$WEBKIT_DIR_PORT_INC/platform/graphics/skia', + '$WEBKIT_DIR_PORT_INC/platform/graphics/transforms', '$WEBKIT_DIR_PORT_INC/platform/$WEBKIT_PLATFORM_SUBDIR', '$WEBKIT_DIR_PORT_INC/platform/network/chromium', '$WEBKIT_DIR_PORT_INC/rendering', |