Title: [211321] trunk/Source/WebKit2
- Revision
- 211321
- Author
- m...@apple.com
- Date
- 2017-01-27 20:50:48 -0800 (Fri, 27 Jan 2017)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (211320 => 211321)
--- trunk/Source/WebKit2/ChangeLog 2017-01-28 03:12:21 UTC (rev 211320)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-28 04:50:48 UTC (rev 211321)
@@ -1,3 +1,20 @@
+2017-01-27 Dan Bernstein <m...@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 <achristen...@webkit.org>
Move smartInsertDeleteEnabled to WebPageCreationParameters
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInRangeHandle.h (211320 => 211321)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInRangeHandle.h 2017-01-28 03:12:21 UTC (rev 211320)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInRangeHandle.h 2017-01-28 04:50:48 UTC (rev 211321)
@@ -38,6 +38,7 @@
+ (WKWebProcessPlugInRangeHandle *)rangeHandleWithJSValue:(JSValue *)value inContext:(JSContext *)context;
@property (nonatomic, readonly) WKWebProcessPlugInFrame *frame;
+@property (nonatomic, readonly, copy) NSString *text WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
@end
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInRangeHandle.mm (211320 => 211321)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInRangeHandle.mm 2017-01-28 03:12:21 UTC (rev 211320)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInRangeHandle.mm 2017-01-28 04:50:48 UTC (rev 211321)
@@ -59,6 +59,11 @@
return [wrapper(*_rangeHandle->document()->documentFrame().leakRef()) autorelease];
}
+- (NSString *)text
+{
+ return _rangeHandle->text();
+}
+
- (InjectedBundleRangeHandle&)_rangeHandle
{
return *_rangeHandle;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp (211320 => 211321)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp 2017-01-28 03:12:21 UTC (rev 211320)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp 2017-01-28 04:50:48 UTC (rev 211321)
@@ -160,4 +160,9 @@
return WebImage::create(backingStore.releaseNonNull());
}
+String InjectedBundleRangeHandle::text() const
+{
+ return m_range->text();
+}
+
} // namespace WebKit
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h (211320 => 211321)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h 2017-01-28 03:12:21 UTC (rev 211320)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h 2017-01-28 04:50:48 UTC (rev 211321)
@@ -29,6 +29,7 @@
#include "APIObject.h"
#include "ImageOptions.h"
#include <_javascript_Core/JSBase.h>
+#include <wtf/Forward.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
@@ -54,6 +55,7 @@
WebCore::IntRect boundingRectInWindowCoordinates() const;
PassRefPtr<WebImage> renderedImage(SnapshotOptions);
+ String text() const;
WebCore::Range* coreRange() const;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
