Title: [121331] trunk
- Revision
- 121331
- Author
- rn...@webkit.org
- Date
- 2012-06-27 02:15:18 -0700 (Wed, 27 Jun 2012)
Log Message
Fix gcc build after r121302
https://bugs.webkit.org/show_bug.cgi?id=90055
Reviewed by Mark Rowe.
Source/ThirdParty:
Assume RTTI is disabled so that gtest builds under XCode 3.2.6.
* gtest/xcode/Config/General.xcconfig:
Tools:
Assume RTTI is always disabled so that gtest builds on XCode 3.2.6.
It appears that gcc doesn't like window.get().* inside a template so replace that by [window.get() *] instead.
* TestWebKitAPI/Configurations/Base.xcconfig:
* TestWebKitAPI/Tests/mac/AcceptsFirstMouse.mm:
(TestWebKitAPI::AcceptsFirstMouse::runTest):
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ChangeLog (121330 => 121331)
--- trunk/Source/ThirdParty/ChangeLog 2012-06-27 08:54:43 UTC (rev 121330)
+++ trunk/Source/ThirdParty/ChangeLog 2012-06-27 09:15:18 UTC (rev 121331)
@@ -1,3 +1,14 @@
+2012-06-27 Ryosuke Niwa <rn...@webkit.org>
+
+ Fix gcc build after r121302
+ https://bugs.webkit.org/show_bug.cgi?id=90055
+
+ Reviewed by Mark Rowe.
+
+ Assume RTTI is disabled so that gtest builds under XCode 3.2.6.
+
+ * gtest/xcode/Config/General.xcconfig:
+
2012-04-30 Carlos Garcia Campos <cgar...@igalia.com>
Unreviewed. Fix make distcheck.
Modified: trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig (121330 => 121331)
--- trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2012-06-27 08:54:43 UTC (rev 121330)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2012-06-27 09:15:18 UTC (rev 121331)
@@ -36,7 +36,7 @@
// Turn on position dependent code for most cases (overridden where appropriate)
GCC_DYNAMIC_NO_PIC = YES
-GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) GTEST_HAS_TR1_TUPLE=0;
+GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) GTEST_HAS_TR1_TUPLE=0 GTEST_HAS_RTTI=0;
CLANG_CXX_LIBRARY = $(CLANG_CXX_LIBRARY_$(TARGET_MAC_OS_X_VERSION_MAJOR));
CLANG_CXX_LIBRARY_1060 = libstdc++;
@@ -71,6 +71,5 @@
SDKROOT_1090_1070 = macosx10.7;
SDKROOT_1090_1080 = macosx10.8;
-
// VERSIONING BUILD SETTINGS (used in Info.plist)
GTEST_VERSIONINFO_ABOUT = © 2008 Google Inc.
Modified: trunk/Tools/ChangeLog (121330 => 121331)
--- trunk/Tools/ChangeLog 2012-06-27 08:54:43 UTC (rev 121330)
+++ trunk/Tools/ChangeLog 2012-06-27 09:15:18 UTC (rev 121331)
@@ -1,3 +1,18 @@
+2012-06-27 Ryosuke Niwa <rn...@webkit.org>
+
+ Fix gcc build after r121302
+ https://bugs.webkit.org/show_bug.cgi?id=90055
+
+ Reviewed by Mark Rowe.
+
+ Assume RTTI is always disabled so that gtest builds on XCode 3.2.6.
+
+ It appears that gcc doesn't like window.get().* inside a template so replace that by [window.get() *] instead.
+
+ * TestWebKitAPI/Configurations/Base.xcconfig:
+ * TestWebKitAPI/Tests/mac/AcceptsFirstMouse.mm:
+ (TestWebKitAPI::AcceptsFirstMouse::runTest):
+
2012-06-27 Csaba Osztrogonác <o...@webkit.org>
Add master.cfg unittest to help migration - pass BuildStep instances instead of BuildStep subclasses
Modified: trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig (121330 => 121331)
--- trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2012-06-27 08:54:43 UTC (rev 121330)
+++ trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2012-06-27 09:15:18 UTC (rev 121331)
@@ -26,7 +26,7 @@
CLANG_WARN_CXX0X_EXTENSIONS = NO;
HEADER_SEARCH_PATHS = ${BUILT_PRODUCTS_DIR}/usr/local/include $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu;
FRAMEWORK_SEARCH_PATHS = $(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks;
-GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) ENABLE_DASHBOARD_SUPPORT WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST GTEST_HAS_TR1_TUPLE=0;
+GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) ENABLE_DASHBOARD_SUPPORT WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST GTEST_HAS_TR1_TUPLE=0 GTEST_HAS_RTTI=0;
DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
PREBINDING = NO
GCC_C_LANGUAGE_STANDARD = gnu99
Modified: trunk/Tools/TestWebKitAPI/Tests/mac/AcceptsFirstMouse.mm (121330 => 121331)
--- trunk/Tools/TestWebKitAPI/Tests/mac/AcceptsFirstMouse.mm 2012-06-27 08:54:43 UTC (rev 121330)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/AcceptsFirstMouse.mm 2012-06-27 09:15:18 UTC (rev 121331)
@@ -48,16 +48,16 @@
void AcceptsFirstMouse::runTest(View view)
{
RetainPtr<NSWindow> window(AdoptNS, [[NSWindow alloc] initWithContentRect:view.frame styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES]);
- [window.get().contentView addSubview:view];
+ [[window.get() contentView] addSubview:view];
CGFloat viewHeight = view.bounds.size.height;
NSPoint pointInsideSelection = NSMakePoint(50, viewHeight - 50);
- NSEvent *mouseEventInsideSelection = [NSEvent mouseEventWithType:NSLeftMouseDown location:pointInsideSelection modifierFlags:0 timestamp:0 windowNumber:window.get().windowNumber context:nil eventNumber:0 clickCount:1 pressure:1];
+ NSEvent *mouseEventInsideSelection = [NSEvent mouseEventWithType:NSLeftMouseDown location:pointInsideSelection modifierFlags:0 timestamp:0 windowNumber:[window.get() windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1];
EXPECT_TRUE([[view hitTest:pointInsideSelection] acceptsFirstMouse:mouseEventInsideSelection]);
NSPoint pointOutsideSelection = NSMakePoint(50, viewHeight - 150);
- NSEvent *mouseEventOutsideSelection = [NSEvent mouseEventWithType:NSLeftMouseDown location:pointOutsideSelection modifierFlags:0 timestamp:0 windowNumber:window.get().windowNumber context:nil eventNumber:0 clickCount:1 pressure:1];
+ NSEvent *mouseEventOutsideSelection = [NSEvent mouseEventWithType:NSLeftMouseDown location:pointOutsideSelection modifierFlags:0 timestamp:0 windowNumber:[window.get() windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1];
EXPECT_FALSE([[view hitTest:pointInsideSelection] acceptsFirstMouse:mouseEventOutsideSelection]);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
