Title: [143255] tags/Safari-537.31.3/Source/WebKit2
- Revision
- 143255
- Author
- lforsch...@apple.com
- Date
- 2013-02-18 12:25:51 -0800 (Mon, 18 Feb 2013)
Log Message
Merged r143111. <rdar://problem/13205468>
Modified Paths
Diff
Modified: tags/Safari-537.31.3/Source/WebKit2/ChangeLog (143254 => 143255)
--- tags/Safari-537.31.3/Source/WebKit2/ChangeLog 2013-02-18 20:25:41 UTC (rev 143254)
+++ tags/Safari-537.31.3/Source/WebKit2/ChangeLog 2013-02-18 20:25:51 UTC (rev 143255)
@@ -1,5 +1,24 @@
2013-02-18 Lucas Forschler <lforsch...@apple.com>
+ Merge r143111
+
+ 2013-02-16 Darin Adler <da...@apple.com>
+
+ Fix WKDOMRangePrivate.h mistakes
+ https://bugs.webkit.org/show_bug.cgi?id=110028
+
+ Reviewed by Ryosuke Niwa.
+
+ * WebProcess/InjectedBundle/API/mac/WKDOMRange.mm:
+ Added include of WKDOMRangePrivate.h.
+
+ * WebProcess/InjectedBundle/API/mac/WKDOMRangePrivate.h:
+ Fixed class name and include to be WKDOMRange.
+ Fixed method name, _copyBundleRangeHandleRef, to match the
+ name in the source file.
+
+2013-02-18 Lucas Forschler <lforsch...@apple.com>
+
Merge r143091
2013-02-15 Kiran Muppala <cmupp...@apple.com>
Modified: tags/Safari-537.31.3/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRange.mm (143254 => 143255)
--- tags/Safari-537.31.3/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRange.mm 2013-02-18 20:25:41 UTC (rev 143254)
+++ tags/Safari-537.31.3/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRange.mm 2013-02-18 20:25:51 UTC (rev 143255)
@@ -28,6 +28,7 @@
#if defined(__LP64__) && defined(__clang__)
#import "WKDOMRange.h"
+#import "WKDOMRangePrivate.h"
#import "InjectedBundleRangeHandle.h"
#import "WKBundleAPICast.h"
Modified: tags/Safari-537.31.3/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRangePrivate.h (143254 => 143255)
--- tags/Safari-537.31.3/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRangePrivate.h 2013-02-18 20:25:41 UTC (rev 143254)
+++ tags/Safari-537.31.3/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRangePrivate.h 2013-02-18 20:25:51 UTC (rev 143255)
@@ -25,11 +25,11 @@
#if defined(__LP64__) && defined(__clang__)
-#import <WebKit2/WKRangeNode.h>
+#import <WebKit2/WKDOMRange.h>
-@interface WKRangeNode (WKPrivate)
+@interface WKDOMRange (WKPrivate)
-- (WKBundleRangeHandleRef)_copyWKBundleRangeHandleRef;
+- (WKBundleRangeHandleRef)_copyBundleRangeHandleRef;
@end
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
