Title: [187392] trunk/Source/WebCore
- Revision
- 187392
- Author
- [email protected]
- Date
- 2015-07-25 16:28:18 -0700 (Sat, 25 Jul 2015)
Log Message
Expose TextIndicator-backed snapshot and rect gathering on DOMNode
https://bugs.webkit.org/show_bug.cgi?id=147298
<rdar://problem/21905839>
* bindings/objc/DOM.mm:
(-[DOMNode getPreviewSnapshotImage:andRects:]):
* bindings/objc/DOMExtensions.h:
* bindings/objc/DOMPrivate.h:
Move this to a private header.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (187391 => 187392)
--- trunk/Source/WebCore/ChangeLog 2015-07-25 23:11:16 UTC (rev 187391)
+++ trunk/Source/WebCore/ChangeLog 2015-07-25 23:28:18 UTC (rev 187392)
@@ -4,6 +4,18 @@
https://bugs.webkit.org/show_bug.cgi?id=147298
<rdar://problem/21905839>
+ * bindings/objc/DOM.mm:
+ (-[DOMNode getPreviewSnapshotImage:andRects:]):
+ * bindings/objc/DOMExtensions.h:
+ * bindings/objc/DOMPrivate.h:
+ Move this to a private header.
+
+2015-07-25 Tim Horton <[email protected]>
+
+ Expose TextIndicator-backed snapshot and rect gathering on DOMNode
+ https://bugs.webkit.org/show_bug.cgi?id=147298
+ <rdar://problem/21905839>
+
Reviewed by Sam Weinig.
* bindings/objc/DOM.mm:
Modified: trunk/Source/WebCore/bindings/objc/DOM.mm (187391 => 187392)
--- trunk/Source/WebCore/bindings/objc/DOM.mm 2015-07-25 23:11:16 UTC (rev 187391)
+++ trunk/Source/WebCore/bindings/objc/DOM.mm 2015-07-25 23:28:18 UTC (rev 187392)
@@ -542,6 +542,47 @@
#endif // PLATFORM(IOS)
+@end
+
+@implementation DOMNode (DOMNodeExtensionsPendingPublic)
+
+#if !PLATFORM(IOS)
+- (NSImage *)renderedImage
+{
+ // FIXME: Could we move this function to WebCore::Node and autogenerate?
+ WebCore::Node* node = core(self);
+ WebCore::Frame* frame = node->document().frame();
+ if (!frame)
+ return nil;
+ return createDragImageForNode(*frame, *node).autorelease();
+}
+#endif
+
+- (NSArray *)textRects
+{
+ core(self)->document().updateLayoutIgnorePendingStylesheets();
+ if (!core(self)->renderer())
+ return nil;
+ Vector<WebCore::IntRect> rects;
+ core(self)->textRects(rects);
+ return kit(rects);
+}
+
+@end
+
+@implementation DOMNode (WebPrivate)
+
++ (id)_nodeFromJSWrapper:(JSObjectRef)jsWrapper
+{
+ JSObject* object = toJS(jsWrapper);
+
+ if (!object->inherits(JSNode::info()))
+ return nil;
+
+ WebCore::Node& node = jsCast<JSNode*>(object)->impl();
+ return kit(&node);
+}
+
- (void)getPreviewSnapshotImage:(CGImageRef*)cgImage andRects:(NSArray **)rects
{
if (!cgImage || !rects)
@@ -586,47 +627,6 @@
@end
-@implementation DOMNode (DOMNodeExtensionsPendingPublic)
-
-#if !PLATFORM(IOS)
-- (NSImage *)renderedImage
-{
- // FIXME: Could we move this function to WebCore::Node and autogenerate?
- WebCore::Node* node = core(self);
- WebCore::Frame* frame = node->document().frame();
- if (!frame)
- return nil;
- return createDragImageForNode(*frame, *node).autorelease();
-}
-#endif
-
-- (NSArray *)textRects
-{
- core(self)->document().updateLayoutIgnorePendingStylesheets();
- if (!core(self)->renderer())
- return nil;
- Vector<WebCore::IntRect> rects;
- core(self)->textRects(rects);
- return kit(rects);
-}
-
-@end
-
-@implementation DOMNode (WebPrivate)
-
-+ (id)_nodeFromJSWrapper:(JSObjectRef)jsWrapper
-{
- JSObject* object = toJS(jsWrapper);
-
- if (!object->inherits(JSNode::info()))
- return nil;
-
- WebCore::Node& node = jsCast<JSNode*>(object)->impl();
- return kit(&node);
-}
-
-@end
-
@implementation DOMRange (DOMRangeExtensions)
#if PLATFORM(IOS)
Modified: trunk/Source/WebCore/bindings/objc/DOMExtensions.h (187391 => 187392)
--- trunk/Source/WebCore/bindings/objc/DOMExtensions.h 2015-07-25 23:11:16 UTC (rev 187391)
+++ trunk/Source/WebCore/bindings/objc/DOMExtensions.h 2015-07-25 23:28:18 UTC (rev 187392)
@@ -109,8 +109,6 @@
- (DOMNode *)nextFocusNode;
- (DOMNode *)previousFocusNode;
#endif
-
-- (void)getPreviewSnapshotImage:(CGImageRef*)cgImage andRects:(NSArray **)rects;
@end
@interface DOMElement (DOMElementAppKitExtensions)
Modified: trunk/Source/WebCore/bindings/objc/DOMPrivate.h (187391 => 187392)
--- trunk/Source/WebCore/bindings/objc/DOMPrivate.h 2015-07-25 23:11:16 UTC (rev 187391)
+++ trunk/Source/WebCore/bindings/objc/DOMPrivate.h 2015-07-25 23:28:18 UTC (rev 187392)
@@ -40,6 +40,7 @@
@interface DOMNode (WebPrivate)
+ (id)_nodeFromJSWrapper:(JSObjectRef)jsWrapper;
+- (void)getPreviewSnapshotImage:(CGImageRef*)cgImage andRects:(NSArray **)rects;
@end
// FIXME: this should be removed as soon as all internal Apple uses of it have been replaced with
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
