Title: [175196] trunk/Source
- Revision
- 175196
- Author
- [email protected]
- Date
- 2014-10-24 19:15:31 -0700 (Fri, 24 Oct 2014)
Log Message
Fix the iOS build
Patch by Benjamin Poulain <[email protected]> on 2014-10-24
Source/WebKit/mac:
* Configurations/WebKitLegacy.xcconfig:
* WebView/WebView.mm:
Source/WebKit2:
* Configurations/WebKit.xcconfig:
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (175195 => 175196)
--- trunk/Source/WebKit/mac/ChangeLog 2014-10-25 00:50:00 UTC (rev 175195)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-10-25 02:15:31 UTC (rev 175196)
@@ -1,3 +1,10 @@
+2014-10-24 Benjamin Poulain <[email protected]>
+
+ Fix the iOS build
+
+ * Configurations/WebKitLegacy.xcconfig:
+ * WebView/WebView.mm:
+
2014-10-24 Beth Dakin <[email protected]>
Build fix.
Modified: trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig (175195 => 175196)
--- trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2014-10-25 00:50:00 UTC (rev 175195)
+++ trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2014-10-25 02:15:31 UTC (rev 175196)
@@ -25,7 +25,7 @@
#include "Version.xcconfig"
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.nib *.pdf *.tiff CarbonUtils.m CarbonWindowAdapter.mm CarbonWindowContentView.m CarbonWindowFrame.m HIViewAdapter.m HIWebView.mm OutlookQuirksUserScript.js PopupMenuMac.mm SearchPopupMenuMac.mm WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebIconDatabasePrivate.* WebInspectorClient.mm WebJavaScriptTextInputPanel.* WebKeyGenerator.* WebNetscapeContainerCheckContextInfo.* WebNetscapeContainerCheckPrivate.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebStringTruncator.* WebTextCompletionController.*;
+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.nib *.pdf *.tiff CarbonUtils.m CarbonWindowAdapter.mm CarbonWindowContentView.m CarbonWindowFrame.m HIViewAdapter.m HIWebView.mm OutlookQuirksUserScript.js PopupMenuMac.mm SearchPopupMenuMac.mm WebActionMenuController.* WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebIconDatabasePrivate.* WebInspectorClient.mm WebJavaScriptTextInputPanel.* WebKeyGenerator.* WebNetscapeContainerCheckContextInfo.* WebNetscapeContainerCheckPrivate.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebStringTruncator.* WebTextCompletionController.*;
EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.mm MemoryMeasure.h WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebMIMETypeRegistry.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h;
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (175195 => 175196)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-10-25 00:50:00 UTC (rev 175195)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-10-25 02:15:31 UTC (rev 175196)
@@ -8525,6 +8525,7 @@
return NSMakeRect(rect.origin.x, [self bounds].size.height - rect.origin.y - rect.size.height, rect.size.width, rect.size.height);
}
+#if !PLATFORM(IOS)
- (void)prepareForMenu:(NSMenu *)menu withEvent:(NSEvent *)event
{
if (menu != self.actionMenu)
@@ -8532,6 +8533,7 @@
[_private->actionMenuController prepareForMenu:menu withEvent:event];
}
+#endif
@end
Modified: trunk/Source/WebKit2/ChangeLog (175195 => 175196)
--- trunk/Source/WebKit2/ChangeLog 2014-10-25 00:50:00 UTC (rev 175195)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-25 02:15:31 UTC (rev 175196)
@@ -1,3 +1,9 @@
+2014-10-24 Benjamin Poulain <[email protected]>
+
+ Fix the iOS build
+
+ * Configurations/WebKit.xcconfig:
+
2014-10-24 Beth Dakin <[email protected]>
_actionMenuItemsForHitTestResult should also take a type indicating what the menu
Modified: trunk/Source/WebKit2/Configurations/WebKit.xcconfig (175195 => 175196)
--- trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2014-10-25 00:50:00 UTC (rev 175195)
+++ trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2014-10-25 02:15:31 UTC (rev 175196)
@@ -47,7 +47,7 @@
SECTORDER_FLAGS_Production_macosx = -Wl,-order_file,mac/WebKit2.order;
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.pdf com.apple.WebKit.Databases.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb PlugInSandboxProfiles/*.sb;
+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.pdf WKActionMenuController.* com.apple.WebKit.Databases.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb PlugInSandboxProfiles/*.sb;
EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
INSTALLHDRS_SCRIPT_PHASE = YES;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
