Title: [162011] trunk/Source
- Revision
- 162011
- Author
- [email protected]
- Date
- 2014-01-14 14:34:11 -0800 (Tue, 14 Jan 2014)
Log Message
Source/WebCore: Export __ZN7WebCore11FileChooser16chooseMediaFilesERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEERKS3_PNS_4IconE
to fix WK1 iOS linking.
* WebCore.exp.in:
Source/WebKit/ios: Fix WK1 iOS build: need implementations of these functions in WebInspectorClientIOS.
* WebCoreSupport/WebInspectorClientIOS.mm:
(WebInspectorClient::indicate):
(WebInspectorClient::hideIndication):
Source/WebKit/mac: Fix iOS WK1 linking.
* Configurations/WebKit.xcconfig: We do need WebOpenPanelResultListener
on iOS.
* WebCoreSupport/WebOpenPanelResultListener.mm: Need <WebCore/Icon.h>
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (162010 => 162011)
--- trunk/Source/WebCore/ChangeLog 2014-01-14 22:33:56 UTC (rev 162010)
+++ trunk/Source/WebCore/ChangeLog 2014-01-14 22:34:11 UTC (rev 162011)
@@ -1,5 +1,12 @@
2014-01-14 Simon Fraser <[email protected]>
+ Export __ZN7WebCore11FileChooser16chooseMediaFilesERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEERKS3_PNS_4IconE
+ to fix WK1 iOS linking.
+
+ * WebCore.exp.in:
+
+2014-01-14 Simon Fraser <[email protected]>
+
iOS build fixing: export required by iOS WebKit1.
* WebCore.exp.in:
Modified: trunk/Source/WebCore/WebCore.exp.in (162010 => 162011)
--- trunk/Source/WebCore/WebCore.exp.in 2014-01-14 22:33:56 UTC (rev 162010)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-01-14 22:34:11 UTC (rev 162011)
@@ -2263,6 +2263,7 @@
__ZN7WebCore11BidiContext6createEh14UCharDirectionbNS_19BidiEmbeddingSourceEPS0_
__ZN7WebCore11CachedImage5imageEv
__ZN7WebCore11EditCommand18setEndingSelectionERKNS_16VisibleSelectionE
+__ZN7WebCore11FileChooser16chooseMediaFilesERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEERKS3_PNS_4IconE
__ZN7WebCore11Geolocation29resetAllGeolocationPermissionEv
__ZN7WebCore11ImageSource26s_acceleratedImageDecodingE
__ZN7WebCore11MathMLNames4initEv
Modified: trunk/Source/WebKit/ios/ChangeLog (162010 => 162011)
--- trunk/Source/WebKit/ios/ChangeLog 2014-01-14 22:33:56 UTC (rev 162010)
+++ trunk/Source/WebKit/ios/ChangeLog 2014-01-14 22:34:11 UTC (rev 162011)
@@ -1,3 +1,11 @@
+2014-01-14 Simon Fraser <[email protected]>
+
+ Fix WK1 iOS build: need implementations of these functions in WebInspectorClientIOS.
+
+ * WebCoreSupport/WebInspectorClientIOS.mm:
+ (WebInspectorClient::indicate):
+ (WebInspectorClient::hideIndication):
+
2014-01-13 Simon Fraser <[email protected]>
More work towards getting iOS WK1 building.
Modified: trunk/Source/WebKit/ios/WebCoreSupport/WebInspectorClientIOS.mm (162010 => 162011)
--- trunk/Source/WebKit/ios/WebCoreSupport/WebInspectorClientIOS.mm 2014-01-14 22:33:56 UTC (rev 162010)
+++ trunk/Source/WebKit/ios/WebCoreSupport/WebInspectorClientIOS.mm 2014-01-14 22:34:11 UTC (rev 162011)
@@ -88,6 +88,16 @@
[m_highlighter.get() hideHighlight];
}
+void WebInspectorClient::indicate()
+{
+ [m_webView setIndicatingForRemoteInspector:YES];
+}
+
+void WebInspectorClient::hideIndication()
+{
+ [m_webView setIndicatingForRemoteInspector:NO];
+}
+
void WebInspectorClient::didSetSearchingForNode(bool enabled)
{
WebInspector *inspector = [m_webView inspector];
Modified: trunk/Source/WebKit/mac/ChangeLog (162010 => 162011)
--- trunk/Source/WebKit/mac/ChangeLog 2014-01-14 22:33:56 UTC (rev 162010)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-14 22:34:11 UTC (rev 162011)
@@ -1,5 +1,13 @@
2014-01-14 Simon Fraser <[email protected]>
+ Fix iOS WK1 linking.
+
+ * Configurations/WebKit.xcconfig: We do need WebOpenPanelResultListener
+ on iOS.
+ * WebCoreSupport/WebOpenPanelResultListener.mm: Need <WebCore/Icon.h>
+
+2014-01-14 Simon Fraser <[email protected]>
+
iOS build fixing: link WebKit against Security.framework on iOS.
* Configurations/WebKit.xcconfig:
Modified: trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig (162010 => 162011)
--- trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-01-14 22:33:56 UTC (rev 162010)
+++ trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-01-14 22:34:11 UTC (rev 162011)
@@ -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 MailQuirksUserScript.js OutlookQuirksUserScript.js PopupMenuMac.mm SearchPopupMenuMac.mm WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebIconDatabasePrivate.* WebInspectorClient.mm WebJavaScriptTextInputPanel.* WebKeyGenerator.* WebNetscapeContainerCheckContextInfo.* WebNetscapeContainerCheckPrivate.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebOpenPanelResultListener.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebRenderNode.mm WebStringTruncator.* WebTextCompletionController.*;
+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.nib *.pdf *.tiff CarbonUtils.m CarbonWindowAdapter.mm CarbonWindowContentView.m CarbonWindowFrame.m HIViewAdapter.m HIWebView.mm MailQuirksUserScript.js OutlookQuirksUserScript.js PopupMenuMac.mm SearchPopupMenuMac.mm WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebIconDatabasePrivate.* WebInspectorClient.mm WebJavaScriptTextInputPanel.* WebKeyGenerator.* WebNetscapeContainerCheckContextInfo.* WebNetscapeContainerCheckPrivate.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebRenderNode.mm 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 WebNSStringDrawing.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h;
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebOpenPanelResultListener.mm (162010 => 162011)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebOpenPanelResultListener.mm 2014-01-14 22:33:56 UTC (rev 162010)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebOpenPanelResultListener.mm 2014-01-14 22:34:11 UTC (rev 162011)
@@ -28,6 +28,10 @@
#import <WebCore/FileChooser.h>
#import <wtf/PassRefPtr.h>
+#if PLATFORM(IOS)
+#import <WebCore/Icon.h>
+#endif
+
using namespace WebCore;
@implementation WebOpenPanelResultListener
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
