Title: [206012] branches/safari-602-branch/Source/WebKit/mac
Revision
206012
Author
bshaf...@apple.com
Date
2016-09-16 00:56:07 -0700 (Fri, 16 Sep 2016)

Log Message

Merge r205991. rdar://problem/28272353

Modified Paths

Diff

Modified: branches/safari-602-branch/Source/WebKit/mac/ChangeLog (206011 => 206012)


--- branches/safari-602-branch/Source/WebKit/mac/ChangeLog	2016-09-16 07:51:37 UTC (rev 206011)
+++ branches/safari-602-branch/Source/WebKit/mac/ChangeLog	2016-09-16 07:56:07 UTC (rev 206012)
@@ -1,3 +1,18 @@
+2016-09-16  Babak Shafiei  <bshaf...@apple.com>
+
+        Merge r205991. rdar://problem/28272353
+
+    2016-09-15  Beth Dakin  <bda...@apple.com>
+
+            Need hasMarkedText on Mac
+            https://bugs.webkit.org/show_bug.cgi?id=162026
+            -and corresponding-
+            rdar://problem/28272353
+
+            Reviewed by Anders Carlsson.
+
+            * WebView/WebHTMLViewInternal.h:
+
 2016-09-12  Babak Shafiei  <bshaf...@apple.com>
 
         Merge r205765. rdar://problem/28033492

Modified: branches/safari-602-branch/Source/WebKit/mac/WebView/WebHTMLViewInternal.h (206011 => 206012)


--- branches/safari-602-branch/Source/WebKit/mac/WebView/WebHTMLViewInternal.h	2016-09-16 07:51:37 UTC (rev 206011)
+++ branches/safari-602-branch/Source/WebKit/mac/WebView/WebHTMLViewInternal.h	2016-09-16 07:56:07 UTC (rev 206012)
@@ -76,10 +76,10 @@
 #endif
 @end
 
+@interface WebHTMLView (RemovedAppKitSuperclassMethods)
 #if PLATFORM(IOS)
-@interface WebHTMLView (RemovedAppKitSuperclassMethods)
 - (void)delete:(id)sender;
 - (void)transpose:(id)sender;
+#endif
 - (BOOL)hasMarkedText;
 @end
-#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to