Diff
Modified: trunk/ChangeLog (99810 => 99811)
--- trunk/ChangeLog 2011-11-10 04:37:32 UTC (rev 99810)
+++ trunk/ChangeLog 2011-11-10 04:40:07 UTC (rev 99811)
@@ -1,3 +1,9 @@
+2011-11-09 Kevin Ollivier <[email protected]>
+
+ [wx] Unreviewed build fix. Update project files.
+
+ * wscript:
+
2011-11-09 Philippe Normand <[email protected]>
[GTK][DRT] window internals object is not reset after each test
Modified: trunk/Tools/ChangeLog (99810 => 99811)
--- trunk/Tools/ChangeLog 2011-11-10 04:37:32 UTC (rev 99810)
+++ trunk/Tools/ChangeLog 2011-11-10 04:40:07 UTC (rev 99811)
@@ -1,5 +1,17 @@
2011-11-09 Kevin Ollivier <[email protected]>
+ [wx] Unreviewed build fix. Update project files and
+ add LTC stubs for new methods.
+
+ * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
+ (LayoutTestController::addChromeInputField):
+ (LayoutTestController::removeChromeInputField):
+ (LayoutTestController::focusWebView):
+ (LayoutTestController::setBackingScaleFactor):
+ * waf/build/settings.py:
+
+2011-11-09 Kevin Ollivier <[email protected]>
+
[wx] Unreviewed build fix. Support XCode 4 when building deps.
* wx/install-unix-extras:
Modified: trunk/Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp (99810 => 99811)
--- trunk/Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp 2011-11-10 04:37:32 UTC (rev 99810)
+++ trunk/Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp 2011-11-10 04:40:07 UTC (rev 99811)
@@ -645,3 +645,19 @@
void LayoutTestController::allowRoundingHacks()
{
}
+
+void LayoutTestController::addChromeInputField()
+{
+}
+
+void LayoutTestController::removeChromeInputField()
+{
+}
+
+void LayoutTestController::focusWebView()
+{
+}
+
+void LayoutTestController::setBackingScaleFactor(double)
+{
+}
Modified: trunk/Tools/waf/build/settings.py (99810 => 99811)
--- trunk/Tools/waf/build/settings.py 2011-11-10 04:37:32 UTC (rev 99810)
+++ trunk/Tools/waf/build/settings.py 2011-11-10 04:40:07 UTC (rev 99811)
@@ -141,6 +141,7 @@
'Source/WebCore/platform/image-decoders/webp',
'Source/WebCore/platform/mock',
'Source/WebCore/platform/network',
+ 'Source/WebCore/platform/posix',
'Source/WebCore/platform/sql',
'Source/WebCore/platform/text',
'Source/WebCore/platform/text/transcoder',
@@ -236,7 +237,7 @@
build_port = Options.options.port
- feature_defines = ['ENABLE_DATABASE', 'ENABLE_XSLT', 'ENABLE_JAVASCRIPT_DEBUGGER',
+ feature_defines = ['ENABLE_DATABASE', 'ENABLE_SQL_DATABASE', 'ENABLE_XSLT', 'ENABLE_JAVASCRIPT_DEBUGGER',
'ENABLE_SVG', 'ENABLE_FILTERS', 'ENABLE_SVG_FONTS',
'BUILDING_%s' % build_port.upper()]
@@ -348,12 +349,15 @@
if min_version == "10.4":
sdk_version += "u"
conf.env.append_value('LIB_WKINTERFACE', ['WebKitSystemInterfaceTiger'])
+ elif min_version == "10.7":
+ conf.env.append_value('LIB_WKINTERFACE', ['WebKitSystemInterfaceLion'])
else:
# NOTE: There is a WebKitSystemInterfaceSnowLeopard, but when we use that
# on 10.6, we get a strange missing symbol error, and this library seems to
# work fine for wx's purposes.
conf.env.append_value('LIB_WKINTERFACE', ['WebKitSystemInterfaceLeopard'])
-
+ conf.env.append_value('LINKFLAGS', ['-framework', 'QuartzCore'])
+
# match WebKit Mac's default here unless we're building on platforms that won't support 64-bit.
archs = []
Modified: trunk/wscript (99810 => 99811)
--- trunk/wscript 2011-11-10 04:37:32 UTC (rev 99810)
+++ trunk/wscript 2011-11-10 04:40:07 UTC (rev 99811)
@@ -185,7 +185,7 @@
'Source/WebCore/platform/mac/WebCoreSystemInterface.mm',
'Source/WebCore/platform/graphics/cg/FloatSizeCG.cpp',
'Source/WebCore/platform/graphics/mac/ComplexTextController.cpp',
- 'Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp',
+ 'Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm',
'Source/WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp',
'Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp',
'Source/WebCore/platform/graphics/mac/SimpleFontDataATSUI.mm',
@@ -318,6 +318,13 @@
excludes.append('WebDOMScriptProfileNode.cpp')
excludes.append('WebNativeEventListener.cpp')
+ # features we don't build / use
+ excludes.append('JSNavigatorCustom.cpp')
+ excludes.append('WebGLContextEvent.cpp')
+ excludes.append('FileSystemPOSIX.cpp')
+ excludes.append('SharedBufferPOSIX.cpp')
+
+
# These files appear not to build with older versions of ICU
excludes.append('LocalizedNumberICU.cpp')
excludes.append('LocaleToScriptMappingICU.cpp')
@@ -339,6 +346,9 @@
# we don't use gestures currently
excludes.append('PlatformGestureRecognizer.cpp')
+ # we need a better system to exclude CF stuff
+ excludes.append('HyphenationCF.cpp')
+
if sys.platform.startswith('darwin'):
webcore.includes += ' Source/WebKit/mac/WebCoreSupport WebCore/platform/mac'
webcore.source += ' Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm'
