Title: [216854] tags/Safari-604.1.22.0.1/Source/WebCore
- Revision
- 216854
- Author
- bshaf...@apple.com
- Date
- 2017-05-14 20:45:30 -0700 (Sun, 14 May 2017)
Log Message
Merged r216807. rdar://problem/32169232
Modified Paths
Diff
Modified: tags/Safari-604.1.22.0.1/Source/WebCore/ChangeLog (216853 => 216854)
--- tags/Safari-604.1.22.0.1/Source/WebCore/ChangeLog 2017-05-15 03:44:31 UTC (rev 216853)
+++ tags/Safari-604.1.22.0.1/Source/WebCore/ChangeLog 2017-05-15 03:45:30 UTC (rev 216854)
@@ -1,3 +1,19 @@
+2017-05-14 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r216807.
+
+ 2017-05-12 Timothy Horton <timothy_hor...@apple.com>
+
+ Don't use LinkPresentation URL shortening if it's not available
+ https://bugs.webkit.org/show_bug.cgi?id=172064
+ <rdar://problem/32169232>
+
+ Rubber-stamped by Wenson Hsieh.
+
+ * platform/mac/DragImageMac.mm:
+ (WebCore::LinkImageLayout::LinkImageLayout):
+ * platform/spi/cocoa/LinkPresentationSPI.h:
+
2017-05-10 Andy Estes <aes...@apple.com>
REGRESSION (r167845): ASSERT(!m_renderView.needsLayout()) in svg/custom/bug79798.html
Modified: tags/Safari-604.1.22.0.1/Source/WebCore/platform/mac/DragImageMac.mm (216853 => 216854)
--- tags/Safari-604.1.22.0.1/Source/WebCore/platform/mac/DragImageMac.mm 2017-05-15 03:44:31 UTC (rev 216853)
+++ tags/Safari-604.1.22.0.1/Source/WebCore/platform/mac/DragImageMac.mm 2017-05-15 03:45:30 UTC (rev 216854)
@@ -45,7 +45,7 @@
#import "URL.h"
#import <wtf/NeverDestroyed.h>
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
SOFT_LINK_PRIVATE_FRAMEWORK(LinkPresentation)
#endif
@@ -196,7 +196,7 @@
NSURL *cocoaURL = url;
NSString *absoluteURLString = [cocoaURL absoluteString];
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
LinkPresentationLibrary();
NSString *domain = [cocoaURL _lp_simplifiedDisplayString];
#else
Modified: tags/Safari-604.1.22.0.1/Source/WebCore/platform/spi/cocoa/LinkPresentationSPI.h (216853 => 216854)
--- tags/Safari-604.1.22.0.1/Source/WebCore/platform/spi/cocoa/LinkPresentationSPI.h 2017-05-15 03:44:31 UTC (rev 216853)
+++ tags/Safari-604.1.22.0.1/Source/WebCore/platform/spi/cocoa/LinkPresentationSPI.h 2017-05-15 03:45:30 UTC (rev 216854)
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
#if USE(APPLE_INTERNAL_SDK)
@@ -37,4 +37,4 @@
#endif
-#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
