diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/SConscript | 2 | ||||
| -rw-r--r-- | webkit/build/WebCore/webcore.vsprops | 2 | ||||
| -rw-r--r-- | webkit/build/webkit_common_defines.vsprops | 2 | ||||
| -rw-r--r-- | webkit/webkit.xcodeproj/project.pbxproj | 4 |
5 files changed, 6 insertions, 6 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@63", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@6068", + "/trunk/deps/third_party/WebKit@6051", "src/third_party/icu38": "/trunk/deps/third_party/icu38@5827", diff --git a/webkit/SConscript b/webkit/SConscript index d3d3d58..eca7cb8 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -163,7 +163,6 @@ env.Append( ['ENABLE_JSC_MULTIPLE_THREADS', '0'], ['ENABLE_ICONDATABASE', '0'], ['ENABLE_DATABASE', '1'], - ['ENABLE_ACTIVEX_TYPE_CONVERSION_WMPLAYER', '0'], ['ENABLE_XSLT', '1'], ['ENABLE_XPATH', '1'], ['ENABLE_SVG', '1'], @@ -183,6 +182,7 @@ env.Append( 'PNG_USER_CONFIG', 'CHROME_PNG_WRITE_SUPPORT', ['__PRETTY_FUNCTION__', '__FUNCTION__'], + 'DISABLE_ACTIVEX_TYPE_CONVERSION_MPLAYER2', '__STD_C', ['USE_SYSTEM_MALLOC', '1'], diff --git a/webkit/build/WebCore/webcore.vsprops b/webkit/build/WebCore/webcore.vsprops index 9228690..e0b0446 100644 --- a/webkit/build/WebCore/webcore.vsprops +++ b/webkit/build/WebCore/webcore.vsprops @@ -7,7 +7,7 @@ > <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="__PRETTY_FUNCTION__=__FUNCTION__" + PreprocessorDefinitions="__PRETTY_FUNCTION__=__FUNCTION__;DISABLE_ACTIVEX_TYPE_CONVERSION_MPLAYER2" DisableSpecificWarnings="4138; 4244; 4291; 4305; 4355; 4521; 4099;" /> </VisualStudioPropertySheet> diff --git a/webkit/build/webkit_common_defines.vsprops b/webkit/build/webkit_common_defines.vsprops index 6cf4d9e..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_ACTIVEX_TYPE_CONVERSION_WMPLAYER=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;" + 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> diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj index 5956584..63b1a17 100644 --- a/webkit/webkit.xcodeproj/project.pbxproj +++ b/webkit/webkit.xcodeproj/project.pbxproj @@ -9577,7 +9577,7 @@ DIR_V8 = "$(XCODEPROJ_DEPTH)/v8"; DIR_WEBCORE = "$(DIR_WEBKIT)/WebCore"; DIR_WEBKIT = "$(DIR_THIRD_PARTY)/WebKit"; - FEATURE_DEFINES = "ENABLE_DATABASE=1 ENABLE_DASHBOARD_SUPPORT=0 ENABLE_JAVASCRIPT_DEBUGGER=0 ENABLE_JSC_MULTIPLE_THREADS=0 ENABLE_ICONDATABASE=0 ENABLE_ACTIVEX_TYPE_CONVERSION_WMPLAYER=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_=\"FixMeAndRemoveTrailingUnderscore\" USE_GOOGLE_URL_LIBRARY USE_SYSTEM_MALLOC=1"; + FEATURE_DEFINES = "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_=\"FixMeAndRemoveTrailingUnderscore\" USE_GOOGLE_URL_LIBRARY USE_SYSTEM_MALLOC=1"; FRAMEWORK_SEARCH_PATHS = ( "$(FRAMEWORK_SEARCH_PATHS)", "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks", @@ -9707,7 +9707,7 @@ DIR_V8 = "$(XCODEPROJ_DEPTH)/v8"; DIR_WEBCORE = "$(DIR_WEBKIT)/WebCore"; DIR_WEBKIT = "$(DIR_THIRD_PARTY)/WebKit"; - FEATURE_DEFINES = "ENABLE_DATABASE=1 ENABLE_DASHBOARD_SUPPORT=0 ENABLE_JAVASCRIPT_DEBUGGER=0 ENABLE_JSC_MULTIPLE_THREADS=0 ENABLE_ICONDATABASE=0 ENABLE_ACTIVEX_TYPE_CONVERSION_WMPLAYER=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_=\"FixMeAndRemoveTrailingUnderscore\" USE_GOOGLE_URL_LIBRARY USE_SYSTEM_MALLOC=1"; + FEATURE_DEFINES = "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_=\"FixMeAndRemoveTrailingUnderscore\" USE_GOOGLE_URL_LIBRARY USE_SYSTEM_MALLOC=1"; FRAMEWORK_SEARCH_PATHS = ( "$(FRAMEWORK_SEARCH_PATHS)", "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks", |