- Revision
- 174250
- Author
- [email protected]
- Date
- 2014-10-02 16:56:32 -0700 (Thu, 02 Oct 2014)
Log Message
[iOS] Create an SPI wrapper for _UIHighlightView and use it in WKContentView
https://bugs.webkit.org/show_bug.cgi?id=137370
Reviewed by Tim Horton.
Source/WebCore:
Added _UIHighlightViewSPI.h. When building against the internal SDK it imports <UIKit/_UIHighlightView.h>. Otherwise, it redeclares the SPI we use in WebKit2.
* WebCore.xcodeproj/project.pbxproj:
* platform/spi/ios/_UIHighlightViewSPI.h: Added.
Source/WebKit2:
* UIProcess/ios/WKContentViewInteraction.mm: Included <WebCore/_UIHighlightViewSPI.h> instead of <UIKit/_UIHighlightView.h>.
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (174249 => 174250)
--- trunk/Source/WebCore/ChangeLog 2014-10-02 23:50:08 UTC (rev 174249)
+++ trunk/Source/WebCore/ChangeLog 2014-10-02 23:56:32 UTC (rev 174250)
@@ -1,3 +1,15 @@
+2014-10-02 Andy Estes <[email protected]>
+
+ [iOS] Create an SPI wrapper for _UIHighlightView and use it in WKContentView
+ https://bugs.webkit.org/show_bug.cgi?id=137370
+
+ Reviewed by Tim Horton.
+
+ Added _UIHighlightViewSPI.h. When building against the internal SDK it imports <UIKit/_UIHighlightView.h>. Otherwise, it redeclares the SPI we use in WebKit2.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/spi/ios/_UIHighlightViewSPI.h: Added.
+
2014-10-02 Benjamin Poulain <[email protected]>
CSS JIT: add the initial implementation of :nth-child(An+B of selector)
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (174249 => 174250)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-10-02 23:50:08 UTC (rev 174249)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-10-02 23:56:32 UTC (rev 174250)
@@ -3720,6 +3720,7 @@
A14832CD187F682E00DA63A6 /* WebCoreThreadSafe.h in Headers */ = {isa = PBXBuildFile; fileRef = A148329F187F508700DA63A6 /* WebCoreThreadSafe.h */; };
A14832CE187F683400DA63A6 /* WebCoreThreadSystemInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A14832A0187F508700DA63A6 /* WebCoreThreadSystemInterface.cpp */; };
A14832CF187F684700DA63A6 /* WebCoreThreadSystemInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = A14832A1187F508700DA63A6 /* WebCoreThreadSystemInterface.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ A172182619DE183F00464D17 /* _UIHighlightViewSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A172182519DE183F00464D17 /* _UIHighlightViewSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
A17C81220F2A5CF7005DAAEB /* HTMLElementFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */; };
A17C81230F2A5CF7005DAAEB /* HTMLElementFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */; };
A1C797181883DD82000F5E1F /* DOMGestureEvent.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 0F54DCDD1880F901003EEDBB /* DOMGestureEvent.h */; };
@@ -10889,6 +10890,7 @@
A14832A9187F508700DA63A6 /* WKView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKView.h; path = ios/wak/WKView.h; sourceTree = "<group>"; };
A14832AA187F508700DA63A6 /* WKView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKView.mm; path = ios/wak/WKView.mm; sourceTree = "<group>"; };
A14832AB187F508700DA63A6 /* WKViewPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKViewPrivate.h; path = ios/wak/WKViewPrivate.h; sourceTree = "<group>"; };
+ A172182519DE183F00464D17 /* _UIHighlightViewSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = _UIHighlightViewSPI.h; path = ios/_UIHighlightViewSPI.h; sourceTree = "<group>"; };
A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLElementFactory.cpp; sourceTree = "<group>"; };
A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLElementFactory.h; sourceTree = "<group>"; };
A1C7971C1883E51F000F5E1F /* DOMHTMLTextAreaElementPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMHTMLTextAreaElementPrivate.h; sourceTree = "<group>"; };
@@ -16176,6 +16178,7 @@
children = (
65086DA619AC1719009AF46B /* cf */,
653EF83719A043AE0052202C /* cocoa */,
+ A172182419DE182B00464D17 /* ios */,
);
path = spi;
sourceTree = "<group>";
@@ -18426,6 +18429,14 @@
name = wak;
sourceTree = "<group>";
};
+ A172182419DE182B00464D17 /* ios */ = {
+ isa = PBXGroup;
+ children = (
+ A172182519DE183F00464D17 /* _UIHighlightViewSPI.h */,
+ );
+ name = ios;
+ sourceTree = "<group>";
+ };
A516E8B2136E04C00076C3C0 /* ios */ = {
isa = PBXGroup;
children = (
@@ -23335,6 +23346,7 @@
FD31608012B026F700C1A359 /* AudioDSPKernel.h in Headers */,
FD31608212B026F700C1A359 /* AudioDSPKernelProcessor.h in Headers */,
FD31608312B026F700C1A359 /* AudioFileReader.h in Headers */,
+ A172182619DE183F00464D17 /* _UIHighlightViewSPI.h in Headers */,
CD5596921475B678001D0BD0 /* AudioFileReaderIOS.h in Headers */,
FD3160BF12B0272A00C1A359 /* AudioFileReaderMac.h in Headers */,
FDE2D55B159E66EB00DCCCF8 /* AudioIOCallback.h in Headers */,
Added: trunk/Source/WebCore/platform/spi/ios/_UIHighlightViewSPI.h (0 => 174250)
--- trunk/Source/WebCore/platform/spi/ios/_UIHighlightViewSPI.h (rev 0)
+++ trunk/Source/WebCore/platform/spi/ios/_UIHighlightViewSPI.h 2014-10-02 23:56:32 UTC (rev 174250)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <UIKit/_UIHighlightView.h>
+
+#else
+
+#import <UIKit/UIView.h>
+
+@class UIColor;
+
+@interface _UIHighlightView : UIView
+@end
+
+@interface _UIHighlightView (Private)
+- (void)setColor:(UIColor *)color;
+- (void)setCornerRadius:(CGFloat)cornerRadius;
+- (void)setCornerRadii:(NSArray *)cornerRadii;
+- (void)setFrames:(NSArray *)frames boundaryRect:(CGRect)boundaryRect;
+- (void)setQuads:(NSArray *)quads boundaryRect:(CGRect)boundaryRect;
+@end
+
+#endif
Modified: trunk/Source/WebKit2/ChangeLog (174249 => 174250)
--- trunk/Source/WebKit2/ChangeLog 2014-10-02 23:50:08 UTC (rev 174249)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-02 23:56:32 UTC (rev 174250)
@@ -1,5 +1,14 @@
2014-10-02 Andy Estes <[email protected]>
+ [iOS] Create an SPI wrapper for _UIHighlightView and use it in WKContentView
+ https://bugs.webkit.org/show_bug.cgi?id=137370
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/ios/WKContentViewInteraction.mm: Included <WebCore/_UIHighlightViewSPI.h> instead of <UIKit/_UIHighlightView.h>.
+
+2014-10-02 Andy Estes <[email protected]>
+
Fix the iOS build.
* WebProcess/WebPage/ios/WebPageIOS.mm:
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (174249 => 174250)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-10-02 23:50:08 UTC (rev 174249)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-10-02 23:56:32 UTC (rev 174250)
@@ -57,12 +57,12 @@
#import <UIKit/UITapGestureRecognizer_Private.h>
#import <UIKit/UITextInteractionAssistant_Private.h>
#import <UIKit/UIWebDocumentView.h> // FIXME: should not include this header.
-#import <UIKit/_UIHighlightView.h>
#import <UIKit/_UIWebHighlightLongPressGestureRecognizer.h>
#import <WebCore/Color.h>
#import <WebCore/FloatQuad.h>
#import <WebCore/SoftLinking.h>
#import <WebCore/WebEvent.h>
+#import <WebCore/_UIHighlightViewSPI.h>
#import <WebKit/WebSelectionRect.h> // FIXME: WK2 should not include WebKit headers!
#import <wtf/RetainPtr.h>
