Diff
Modified: trunk/Source/WebCore/ChangeLog (161909 => 161910)
--- trunk/Source/WebCore/ChangeLog 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebCore/ChangeLog 2014-01-13 22:55:47 UTC (rev 161910)
@@ -1,3 +1,10 @@
+2014-01-13 Simon Fraser <[email protected]>
+
+ Various iOS WebKit1 build fixes.
+
+ * WebCore.xcodeproj/project.pbxproj: iOS WebKit1 needs various
+ headers to be Private.
+
2014-01-13 Andreas Kling <[email protected]>
Map RootInlineBox to containing region via bit+hashmap.
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (161909 => 161910)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-13 22:55:47 UTC (rev 161910)
@@ -454,6 +454,7 @@
0C45342710CDBBFA00869157 /* JSWebGLUniformLocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0C45342510CDBBFA00869157 /* JSWebGLUniformLocation.cpp */; };
0C45342810CDBBFA00869157 /* JSWebGLUniformLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C45342610CDBBFA00869157 /* JSWebGLUniformLocation.h */; };
0F03C0741884695E00A5F8CA /* SystemMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F03C0731884695E00A5F8CA /* SystemMemory.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 0F03C0751884805500A5F8CA /* InspectorOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C522D4A15B478B2009B7C95 /* InspectorOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; };
0F09087F1444FDB200028917 /* ScrollbarTheme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FE71415142189FC00DB33BA /* ScrollbarTheme.cpp */; };
0F099D0817B968A100FF84B9 /* WebCoreTypedArrayController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F099D0617B968A100FF84B9 /* WebCoreTypedArrayController.cpp */; };
0F099D0917B968A100FF84B9 /* WebCoreTypedArrayController.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F099D0717B968A100FF84B9 /* WebCoreTypedArrayController.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -980,7 +981,7 @@
26B999971804D54200D01121 /* SelectorCompiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 26B999951804D54200D01121 /* SelectorCompiler.h */; };
26C15CF61857E15D00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26C15CF41857E15D00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp */; };
26C15CF71857E15E00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 26C15CF51857E15D00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.h */; };
- 26C17A3E1491D2D400D12BA2 /* FileSystemIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 26C17A3C1491D2D400D12BA2 /* FileSystemIOS.h */; };
+ 26C17A3E1491D2D400D12BA2 /* FileSystemIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 26C17A3C1491D2D400D12BA2 /* FileSystemIOS.h */; settings = {ATTRIBUTES = (Private, ); }; };
26C17A3F1491D2D400D12BA2 /* FileSystemIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 26C17A3D1491D2D400D12BA2 /* FileSystemIOS.mm */; };
26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */ = {isa = PBXBuildFile; fileRef = 26E98A0F130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h */; };
26F40D4A14904A6300CA67C4 /* EventLoopIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 26F40D4914904A6300CA67C4 /* EventLoopIOS.mm */; };
@@ -3673,7 +3674,7 @@
A54A82EC15228D2F00C72BA6 /* DOMNodePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = A54A82EA15228CA300C72BA6 /* DOMNodePrivate.h */; };
A54A82F115228DF600C72BA6 /* DOMNodePrivate.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = A54A82EA15228CA300C72BA6 /* DOMNodePrivate.h */; };
A5732B0A136A161D005C8D7C /* DateComponents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5732B08136A161D005C8D7C /* DateComponents.cpp */; };
- A5732B0B136A161D005C8D7C /* DateComponents.h in Headers */ = {isa = PBXBuildFile; fileRef = A5732B09136A161D005C8D7C /* DateComponents.h */; };
+ A5732B0B136A161D005C8D7C /* DateComponents.h in Headers */ = {isa = PBXBuildFile; fileRef = A5732B09136A161D005C8D7C /* DateComponents.h */; settings = {ATTRIBUTES = (Private, ); }; };
A5840E1C187B74D500843B10 /* InspectorInstrumentationCookie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5840E1A187B74D500843B10 /* InspectorInstrumentationCookie.cpp */; };
A5840E1D187B74D500843B10 /* InspectorInstrumentationCookie.h in Headers */ = {isa = PBXBuildFile; fileRef = A5840E1B187B74D500843B10 /* InspectorInstrumentationCookie.h */; settings = {ATTRIBUTES = (Private, ); }; };
A5840E24187B8AC200843B10 /* PageInjectedScriptHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5840E22187B8AC200843B10 /* PageInjectedScriptHost.cpp */; };
@@ -4000,7 +4001,7 @@
A8C2280E11D4A59700D5A7D3 /* DocumentParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C2280D11D4A59700D5A7D3 /* DocumentParser.cpp */; };
A8C228A111D5722E00D5A7D3 /* DecodedDataDocumentParser.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C2289F11D5722E00D5A7D3 /* DecodedDataDocumentParser.h */; };
A8C228A211D5722E00D5A7D3 /* DecodedDataDocumentParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C228A011D5722E00D5A7D3 /* DecodedDataDocumentParser.cpp */; };
- A8C402931348B2220063F1E5 /* BidiRunList.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C402921348B2220063F1E5 /* BidiRunList.h */; };
+ A8C402931348B2220063F1E5 /* BidiRunList.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C402921348B2220063F1E5 /* BidiRunList.h */; settings = {ATTRIBUTES = (Private, ); }; };
A8C4A7FD09D563270003AC8D /* StyledElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C4A7EB09D563270003AC8D /* StyledElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
A8C4A7FE09D563270003AC8D /* StyledElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C4A7EC09D563270003AC8D /* StyledElement.cpp */; };
A8C4A80009D563270003AC8D /* Node.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C4A7EE09D563270003AC8D /* Node.cpp */; };
@@ -4197,7 +4198,7 @@
AB31C91E10AE1B8E000C7B92 /* LineClampValue.h in Headers */ = {isa = PBXBuildFile; fileRef = AB31C91D10AE1B8E000C7B92 /* LineClampValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
AB4CB4EB0B8BDA3D009F40B0 /* JSHTMLSelectElementCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = AB4CB4EA0B8BDA3D009F40B0 /* JSHTMLSelectElementCustom.h */; };
AB67D1A8097F3AE300F9392E /* RenderTextControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB67D1A6097F3AE300F9392E /* RenderTextControl.cpp */; };
- AB67D1A9097F3AE300F9392E /* RenderTextControl.h in Headers */ = {isa = PBXBuildFile; fileRef = AB67D1A7097F3AE300F9392E /* RenderTextControl.h */; };
+ AB67D1A9097F3AE300F9392E /* RenderTextControl.h in Headers */ = {isa = PBXBuildFile; fileRef = AB67D1A7097F3AE300F9392E /* RenderTextControl.h */; settings = {ATTRIBUTES = (Private, ); }; };
AB7170890B3118080017123E /* SearchPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = AB7170880B3118080017123E /* SearchPopupMenu.h */; settings = {ATTRIBUTES = (Private, ); }; };
ABAF22080C03B1C700B0BCF0 /* ChromeMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABAF22070C03B1C700B0BCF0 /* ChromeMac.mm */; };
ABB5419E0ACDDFE4002820EB /* RenderListBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB5419C0ACDDFE4002820EB /* RenderListBox.cpp */; };
@@ -5307,7 +5308,7 @@
BCEA4790097CAAC80094C9E4 /* CSSComputedStyleDeclaration.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA477D097CAAC80094C9E4 /* CSSComputedStyleDeclaration.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCEA4852097D93020094C9E4 /* RenderBlockLineLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA4813097D93020094C9E4 /* RenderBlockLineLayout.cpp */; };
BCEA4854097D93020094C9E4 /* break_lines.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA4815097D93020094C9E4 /* break_lines.cpp */; };
- BCEA4855097D93020094C9E4 /* break_lines.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4816097D93020094C9E4 /* break_lines.h */; };
+ BCEA4855097D93020094C9E4 /* break_lines.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4816097D93020094C9E4 /* break_lines.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCEA4859097D93020094C9E4 /* InlineTextBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA481A097D93020094C9E4 /* InlineTextBox.cpp */; };
BCEA485A097D93020094C9E4 /* InlineTextBox.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA481B097D93020094C9E4 /* InlineTextBox.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCEA485F097D93020094C9E4 /* RenderBlock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA4820097D93020094C9E4 /* RenderBlock.cpp */; };
@@ -25940,6 +25941,7 @@
2542F4DB1166C25A00E89A86 /* UserGestureIndicator.h in Headers */,
BCA2B061105047600043BD1C /* UserScript.h in Headers */,
BCA2B08B10505BCD0043BD1C /* UserScriptTypes.h in Headers */,
+ 0F03C0751884805500A5F8CA /* InspectorOverlay.h in Headers */,
BC8BF151105813BF00A40A07 /* UserStyleSheet.h in Headers */,
BC8BF15A1058141800A40A07 /* UserStyleSheetTypes.h in Headers */,
BCDF317C11F8D683003C5BF8 /* UserTypingGestureIndicator.h in Headers */,
Modified: trunk/Source/WebKit/mac/ChangeLog (161909 => 161910)
--- trunk/Source/WebKit/mac/ChangeLog 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-13 22:55:47 UTC (rev 161910)
@@ -1,3 +1,30 @@
+2014-01-13 Simon Fraser <[email protected]>
+
+ Various iOS WebKit1 build fixes.
+
+ * Configurations/WebKit.xcconfig: Add more Mac-only files
+ to the excluded files list for iOS.
+ * DefaultDelegates/WebDefaultUIDelegate.m: Don't include WebJavaScriptTextInputPanel.h
+ on iOS
+ * History/WebHistory.h: NSCalendarDate doesn't exist on iOS.
+ * Misc/WebDownload.h: Need WAKAppKitStubs.h
+ * Misc/WebNSViewExtras.m: No WebNSPasteboardExtras on iOS
+ * Storage/WebDatabaseManagerClient.mm: Need DatabaseTracker.h, no harm
+ in including it for all platforms.
+ * WebCoreSupport/WebEditorClient.h: Remove useless comment.
+ * WebCoreSupport/WebEditorClient.mm:
+ (nsStringWithoutCopying): Moved
+ (WebEditorClient::checkTextOfParagraph): Modernized.
+ * WebInspector/WebNodeHighlightView.mm: Need FloatQuad.h.
+ * WebView/WebDataSource.mm: Need WebFrameViewInternal.h
+ * WebView/WebDocument.h: Needs WAKView.h.
+ * WebView/WebFrameView.h: Ditto.
+ * WebView/WebHTMLView.h: Ditto.
+ * WebView/WebPDFDocumentExtras.mm:
+ (allScriptsInPDFDocument): No PDFDocument on iOS.
+ * WebView/WebPolicyDelegate.h:
+ * WebView/WebView.h: Fix incorrect #if.
+
2014-01-13 Daniel Bates <[email protected]>
[iOS] More build fixes for WebKit
Modified: trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig (161909 => 161910)
--- trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-01-13 22:55:47 UTC (rev 161910)
@@ -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.mm WebDashboardRegion.h WebDynamicScrollBarsView.h WebIconDatabase.h WebIconDatabasePrivate.h WebInspectorClient.mm WebJavaScriptTextInputPanel.h WebKeyGenerator.h WebNSEventExtras.h WebNSPasteboardExtras.h WebNSWindowExtras.h WebNetscapeContainerCheckContextInfo.mm WebNetscapeContainerCheckPrivate.mm WebPanelAuthenticationHandler.h WebPluginsPrivate.h WebRenderNode.mm WebStringTruncator.mm WebTextCompletionController.mm;
+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_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/DefaultDelegates/WebDefaultUIDelegate.m (161909 => 161910)
--- trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultUIDelegate.m 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultUIDelegate.m 2014-01-13 22:55:47 UTC (rev 161910)
@@ -28,11 +28,14 @@
#import "WebDefaultUIDelegate.h"
-#import "WebJavaScriptTextInputPanel.h"
#import "WebTypesInternal.h"
#import "WebUIDelegatePrivate.h"
#import "WebView.h"
+#if !PLATFORM(IOS)
+#import "WebJavaScriptTextInputPanel.h"
+#endif
+
#if PLATFORM(IOS)
#import <WebCore/WAKViewPrivate.h>
#import <WebCore/WAKWindow.h>
Modified: trunk/Source/WebKit/mac/History/WebHistory.h (161909 => 161910)
--- trunk/Source/WebKit/mac/History/WebHistory.h 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/History/WebHistory.h 2014-01-13 22:55:47 UTC (rev 161910)
@@ -120,6 +120,7 @@
*/
@property (nonatomic, readonly, copy) NSArray *orderedLastVisitedDays;
+#if !TARGET_OS_IPHONE
/*!
@method orderedItemsLastVisitedOnDay:
@discussion Get an array of WebHistoryItem that were last visited on the day represented by the
@@ -131,6 +132,7 @@
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (NSArray *)orderedItemsLastVisitedOnDay:(NSCalendarDate *)calendarDate;
#pragma clang diagnostic pop
+#endif
/*!
@method itemForURL:
Modified: trunk/Source/WebKit/mac/Misc/WebDownload.h (161909 => 161910)
--- trunk/Source/WebKit/mac/Misc/WebDownload.h 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/Misc/WebDownload.h 2014-01-13 22:55:47 UTC (rev 161910)
@@ -28,6 +28,10 @@
#import <Foundation/NSURLDownload.h>
+#if TARGET_OS_IPHONE
+#import <WebKit/WAKAppKitStubs.h>
+#endif
+
@class WebDownloadInternal;
/*!
Modified: trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m (161909 => 161910)
--- trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m 2014-01-13 22:55:47 UTC (rev 161910)
@@ -33,10 +33,13 @@
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebFrameViewInternal.h>
#import <WebKit/WebNSImageExtras.h>
-#import <WebKit/WebNSPasteboardExtras.h>
#import <WebKit/WebNSURLExtras.h>
#import <WebKit/WebView.h>
+#if !PLATFORM(IOS)
+#import <WebKit/WebNSPasteboardExtras.h>
+#endif
+
#if PLATFORM(IOS)
#import <WebCore/WAKViewPrivate.h>
#import <WebCore/WAKWindow.h>
Modified: trunk/Source/WebKit/mac/Storage/WebDatabaseManagerClient.mm (161909 => 161910)
--- trunk/Source/WebKit/mac/Storage/WebDatabaseManagerClient.mm 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/Storage/WebDatabaseManagerClient.mm 2014-01-13 22:55:47 UTC (rev 161910)
@@ -31,6 +31,7 @@
#import "WebSecurityOriginInternal.h"
#import <wtf/MainThread.h>
#import <wtf/RetainPtr.h>
+#import <WebCore/DatabaseTracker.h>
#import <WebCore/SecurityOrigin.h>
#if PLATFORM(IOS)
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h (161909 => 161910)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h 2014-01-13 22:55:47 UTC (rev 161910)
@@ -172,7 +172,6 @@
virtual void checkSpellingOfString(const UChar*, int length, int* misspellingLocation, int* misspellingLength) OVERRIDE { }
virtual WTF::String getAutoCorrectSuggestionForMisspelledWord(const WTF::String&) OVERRIDE { return ""; }
virtual void checkGrammarOfString(const UChar*, int length, WTF::Vector<WebCore::GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength) OVERRIDE { }
- // Note: checkTextOfParagraph() is implemented.
virtual Vector<WebCore::TextCheckingResult> checkTextOfParagraph(StringView, WebCore::TextCheckingTypeMask checkingTypes) OVERRIDE;
virtual void updateSpellingUIWithGrammarString(const WTF::String&, const WebCore::GrammarDetail&) OVERRIDE { }
virtual void updateSpellingUIWithMisspelledWord(const WTF::String&) OVERRIDE { }
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (161909 => 161910)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2014-01-13 22:55:47 UTC (rev 161910)
@@ -797,6 +797,14 @@
CallFormDelegate(m_webView, @selector(textDidChangeInTextArea:inFrame:), textAreaElement, kit(element->document().frame()));
}
+static RetainPtr<NSString> nsStringWithoutCopying(StringView stringView)
+{
+ if (stringView.is8Bit())
+ return adoptNS([[NSString alloc] initWithBytesNoCopy:const_cast<LChar*>(stringView.characters8()) length:stringView.length() encoding:NSISOLatin1StringEncoding freeWhenDone:NO]);
+
+ return adoptNS([[NSString alloc] initWithCharactersNoCopy:const_cast<unichar*>(stringView.characters16()) length:stringView.length() freeWhenDone:NO]);
+}
+
#if PLATFORM(IOS)
void WebEditorClient::suppressSelectionNotifications()
{
@@ -875,14 +883,15 @@
return 0;
}
-void WebEditorClient::checkTextOfParagraph(StringView string, TextCheckingTypeMask checkingTypes)
+Vector<TextCheckingResult> WebEditorClient::checkTextOfParagraph(StringView string, TextCheckingTypeMask checkingTypes)
{
ASSERT(checkingTypes & NSTextCheckingTypeSpelling);
- NSArray *incomingResults = [[m_webView _UIKitDelegateForwarder] checkSpellingOfString:nsStringWithoutCopying(string).get()];
-
Vector<TextCheckingResult> results;
+ auto textString = nsStringWithoutCopying(string);
+ NSArray *incomingResults = [[m_webView _UIKitDelegateForwarder] checkSpellingOfString:textString.get()];
+ [textString release];
for (NSValue *incomingResult in incomingResults) {
NSRange resultRange = [incomingResult rangeValue];
ASSERT(resultRange.location != NSNotFound && resultRange.length > 0);
@@ -897,14 +906,6 @@
}
#endif // PLATFORM(IOS)
-static RetainPtr<NSString> nsStringWithoutCopying(StringView stringView)
-{
- if (stringView.is8Bit())
- return adoptNS([[NSString alloc] initWithBytesNoCopy:const_cast<LChar*>(stringView.characters8()) length:stringView.length() encoding:NSISOLatin1StringEncoding freeWhenDone:NO]);
-
- return adoptNS([[NSString alloc] initWithCharactersNoCopy:const_cast<unichar*>(stringView.characters16()) length:stringView.length() freeWhenDone:NO]);
-}
-
#if !PLATFORM(IOS)
bool WebEditorClient::shouldEraseMarkersAfterChangeSelection(TextCheckingType type) const
{
Modified: trunk/Source/WebKit/mac/WebInspector/WebNodeHighlightView.mm (161909 => 161910)
--- trunk/Source/WebKit/mac/WebInspector/WebNodeHighlightView.mm 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/WebInspector/WebNodeHighlightView.mm 2014-01-13 22:55:47 UTC (rev 161910)
@@ -35,6 +35,7 @@
#if PLATFORM(IOS)
#import <CoreGraphics/CoreGraphics.h>
+#import <WebCore/FloatQuad.h>
#import <WebCore/InspectorOverlay.h>
#import <WebCore/WebCoreThread.h>
#endif
Modified: trunk/Source/WebKit/mac/WebView/WebDataSource.mm (161909 => 161910)
--- trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2014-01-13 22:55:47 UTC (rev 161910)
@@ -36,6 +36,7 @@
#import "WebFrameInternal.h"
#import "WebFrameLoadDelegate.h"
#import "WebFrameLoaderClient.h"
+#import "WebFrameViewInternal.h"
#import "WebHTMLRepresentation.h"
#import "WebKitErrorsPrivate.h"
#import "WebKitLogging.h"
Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.h (161909 => 161910)
--- trunk/Source/WebKit/mac/WebView/WebFrameView.h 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/WebView/WebFrameView.h 2014-01-13 22:55:47 UTC (rev 161910)
@@ -31,6 +31,7 @@
#if !TARGET_OS_IPHONE
#import <AppKit/AppKit.h>
#else
+#import <WebKit/WAKView.h>
#import <WebKit/WAKAppKitStubs.h>
#import <WebKit/WAKView.h>
#endif
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.h (161909 => 161910)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.h 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.h 2014-01-13 22:55:47 UTC (rev 161910)
@@ -28,6 +28,11 @@
#import <WebKit/WebDocument.h>
+#if TARGET_OS_IPHONE
+#import <WebKit/WAKView.h>
+#import <WebKit/WAKAppKitStubs.h>
+#endif
+
@class WebDataSource;
@class WebHTMLViewPrivate;
Modified: trunk/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm (161909 => 161910)
--- trunk/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm 2014-01-13 22:55:47 UTC (rev 161910)
@@ -64,10 +64,9 @@
appendValuesInPDFNameSubtreeToVector(tree, allValues);
}
-NSArray *allScriptsInPDFDocument(PDFDocument *document)
+NSArray *allScriptsInPDFDocument(CGPDFDocumentRef pdfDocument)
{
NSMutableArray *scripts = [NSMutableArray array];
- CGPDFDocumentRef pdfDocument = [document documentRef];
if (!pdfDocument)
return scripts;
@@ -130,3 +129,10 @@
return scripts;
}
+
+#if !PLATFORM(IOS)
+NSArray *allScriptsInPDFDocument(PDFDocument *document)
+{
+ return allScriptsInPDFDocument([document documentRef]);
+}
+#endif
Modified: trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h (161909 => 161910)
--- trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h 2014-01-13 22:55:47 UTC (rev 161910)
@@ -28,7 +28,7 @@
#import <Foundation/Foundation.h>
-#if TARGET_OS_IPHONE
+#if !TARGET_OS_IPHONE
#import <AppKit/AppKit.h>
#endif
Modified: trunk/Source/WebKit/mac/WebView/WebView.h (161909 => 161910)
--- trunk/Source/WebKit/mac/WebView/WebView.h 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/WebView/WebView.h 2014-01-13 22:55:47 UTC (rev 161910)
@@ -31,6 +31,7 @@
#if !TARGET_OS_IPHONE
#import <AppKit/AppKit.h>
#else
+#import <WebKit/WAKView.h>
#import <WebKit/WAKAppKitStubs.h>
#import <WebKit/WAKView.h>
#if !defined(IBAction)
