diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-21 23:41:22 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-21 23:41:22 +0000 |
| commit | 17e09ae6e699f59553f8e70c0949f7302058bde5 (patch) | |
| tree | 70f10217d4b5295f0adbcae1442b7ae64c7bfc1e /webkit/build | |
| parent | 9704baeb5d2d07fe46879fd166663a975add7255 (diff) | |
| download | chromium_src-17e09ae6e699f59553f8e70c0949f7302058bde5.zip chromium_src-17e09ae6e699f59553f8e70c0949f7302058bde5.tar.gz chromium_src-17e09ae6e699f59553f8e70c0949f7302058bde5.tar.bz2 | |
non third_party/WEbKit side of WebKit merge 38550:38575.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5867 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
| -rw-r--r-- | webkit/build/WebCore/SConscript | 1 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 4 | ||||
| -rw-r--r-- | webkit/build/webkit_common_defines.vsprops | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index ac4950b..1111c3b 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -327,6 +327,7 @@ input_files = [ '$WEBCORE_DIR/loader/DocumentLoader.cpp', '$WEBCORE_DIR/loader/FormState.cpp', '$WEBCORE_DIR/loader/FrameLoader.cpp', + '$WEBCORE_DIR/loader/FrameLoaderClient.cpp', '$WEBCORE_DIR/loader/FTPDirectoryDocument.cpp', '$WEBCORE_DIR/loader/FTPDirectoryParser.cpp', '$WEBCORE_DIR/loader/ImageDocument.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 0fc40e6..bab99ae 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -638,6 +638,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\loader\FrameLoaderClient.cpp" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\loader\FrameLoaderClient.h" > </File> diff --git a/webkit/build/webkit_common_defines.vsprops b/webkit/build/webkit_common_defines.vsprops index aa30250..0f750cc 100644 --- a/webkit/build/webkit_common_defines.vsprops +++ b/webkit/build/webkit_common_defines.vsprops @@ -6,6 +6,6 @@ > <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="ENABLE_DATABASE=1;ENABLE_DASHBOARD_SUPPORT=0;ENABLE_JAVASCRIPT_DEBUGGER=0;ENABLE_JSC_MULTIPLE_THREADS=0;ENABLE_ICONDATABASE=0;ENABLE_XSLT=1;ENABLE_XPATH=1;ENABLE_SVG=1;ENABLE_SVG_ANIMATION=1;ENABLE_SVG_AS_IMAGE=1;ENABLE_SVG_USE=1;ENABLE_SVG_FOREIGN_OBJECT=1;ENABLE_SVG_FONTS=1;ENABLE_VIDEO=0;WEBCORE_NAVIGATOR_PLATFORM="\"Win32\"";USE_GOOGLE_URL_LIBRARY;USE_SYSTEM_MALLOC=1;CRASH=__debugbreak;BUILDING_CHROMIUM__=1;" + PreprocessorDefinitions="ENABLE_DATABASE=1;ENABLE_DASHBOARD_SUPPORT=0;ENABLE_JAVASCRIPT_DEBUGGER=0;ENABLE_JSC_MULTIPLE_THREADS=0;ENABLE_ICONDATABASE=0;ENABLE_XSLT=1;ENABLE_XPATH=1;ENABLE_SVG=1;ENABLE_SVG_ANIMATION=1;ENABLE_SVG_AS_IMAGE=1;ENABLE_SVG_USE=1;ENABLE_SVG_FOREIGN_OBJECT=1;ENABLE_SVG_FONTS=1;ENABLE_VIDEO=0;ENABLE_WORKERS=0;WEBCORE_NAVIGATOR_PLATFORM="\"Win32\"";USE_GOOGLE_URL_LIBRARY;USE_SYSTEM_MALLOC=1;CRASH=__debugbreak;BUILDING_CHROMIUM__=1;" /> </VisualStudioPropertySheet> |