Changeset 211321 in webkit

Timestamp:

Jan 27, 2017 8:50:48 PM (7 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] No way to get the text from a WKWebProcessPlugInRangeHandle
​https://bugs.webkit.org/show_bug.cgi?id=167535

Reviewed by Sam Weinig.

Added a text property to WKWebProcessPlugInRangeHandle.

• WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInRangeHandle.h: Declare new property.
• WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInRangeHandle.mm:

(-[WKWebProcessPlugInRangeHandle text]): Added. Calls InjectedBundleRangeHandle::text.

• WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp:

(WebKit::InjectedBundleRangeHandle::text): Added. Calls WebCore::Range::text.

• WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInRangeHandle.h (modified) (1 diff)
• WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInRangeHandle.mm (modified) (1 diff)
• WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp (modified) (1 diff)
• WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-01-27  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] No way to get the text from a WKWebProcessPlugInRangeHandle
+        https://bugs.webkit.org/show_bug.cgi?id=167535
+
+        Reviewed by Sam Weinig.
+
+        Added a text property to WKWebProcessPlugInRangeHandle.
+
+        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInRangeHandle.h: Declare new property.
+        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInRangeHandle.mm:
+        (-[WKWebProcessPlugInRangeHandle text]): Added. Calls InjectedBundleRangeHandle::text.
+
+        * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp:
+        (WebKit::InjectedBundleRangeHandle::text): Added. Calls WebCore::Range::text.
+        * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h:
+
 2017-01-27  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInRangeHandle.h

@@ -39 +39 @@
 
 @property (nonatomic, readonly) WKWebProcessPlugInFrame *frame;
+@property (nonatomic, readonly, copy) NSString *text WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
 
 @end

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInRangeHandle.mm

@@ -60 +60 @@
 }
 
+- (NSString *)text
+{
+    return _rangeHandle->text();
+}
+
 - (InjectedBundleRangeHandle&)_rangeHandle
 {

trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp

@@ -161 +161 @@
 }
 
+String InjectedBundleRangeHandle::text() const
+{
+    return m_range->text();
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h

@@ -30 +30 @@
 #include "ImageOptions.h"
 #include <JavaScriptCore/JSBase.h>
+#include <wtf/Forward.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
@@ -55 +56 @@
     WebCore::IntRect boundingRectInWindowCoordinates() const;
     PassRefPtr<WebImage> renderedImage(SnapshotOptions);
+    String text() const;
 
     WebCore::Range* coreRange() const;