Changeset 99811 in webkit

Timestamp:

Nov 9, 2011, 8:40:07 PM (15 years ago)

Author:

kevino@webkit.org

Message:

[wx] Unreviewed build fix. Update project files and add LTC stubs for new methods.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp (modified) (1 diff)
• Tools/waf/build/settings.py (modified) (4 diffs)
• wscript (modified) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+2011-11-09  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed build fix. Update project files.
+
+        * wscript:
+
 2011-11-09  Philippe Normand  <pnormand@igalia.com>
 

trunk/Tools/ChangeLog

@@ +1 @@
+2011-11-09  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [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  <kevino@theolliviers.com>
 

trunk/Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp

@@ -646 +646 @@
 {
 }
+
+void LayoutTestController::addChromeInputField()
+{
+}
+
+void LayoutTestController::removeChromeInputField()
+{
+}
+
+void LayoutTestController::focusWebView()
+{
+}
+
+void LayoutTestController::setBackingScaleFactor(double)
+{
+}

trunk/Tools/waf/build/settings.py

@@ -142 +142 @@
     'Source/WebCore/platform/mock',
     'Source/WebCore/platform/network',
+    'Source/WebCore/platform/posix',
     'Source/WebCore/platform/sql',
     'Source/WebCore/platform/text',
@@ -237 +238 @@
     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()]
@@ -349 +350 @@
             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
@@ -354 +357 @@
             # 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 = []

trunk/wscript

@@ -186 +186 @@
                    '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',
@@ -319 +319 @@
         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')
@@ -339 +346 @@
         # 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'):