<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[172780] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/172780">172780</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-19 16:33:33 -0700 (Tue, 19 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Expose injected bundle SPI to get a node's URL element, get the visible selection range of that
element, and snapshot that range
https://bugs.webkit.org/show_bug.cgi?id=136076
Patch by Peyton Randolph <prandolph@apple.com> on 2014-08-19
Reviewed by Tim Horton.
* WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp:
(WKBundleHitTestResultCopyURLElementHandle): Added.
* WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h:
* WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp:
(WKBundleNodeHandleCopyVisibleRange): Added.
* WebProcess/InjectedBundle/API/c/WKBundleNodeHandlePrivate.h:
* WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.cpp:
(WKBundleRangeHandleGetBoundingRectInWindowCoordinates): Added.
(WKBundleRangeHandleCopySnapshotWithOptions): Added.
* WebProcess/InjectedBundle/API/c/WKBundleRangeHandlePrivate.h:
* WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp:
(WebKit::InjectedBundleNodeHandle::visibleRange): Added.
* WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h:
* WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp:
(WebKit::InjectedBundleRangeHandle::boundingRectInWindowCoordinates): Added.
(WebKit::InjectedBundleRangeHandle::renderedImage): Added.
* WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h:
* WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:
(WebKit::InjectedBundleHitTestResult::urlElementHandle): Added.
* WebProcess/InjectedBundle/InjectedBundleHitTestResult.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleHitTestResultcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleHitTestResulth">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleNodeHandlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleNodeHandlePrivateh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandlePrivate.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleRangeHandlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleRangeHandlePrivateh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleRangeHandlePrivate.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleDOMInjectedBundleNodeHandlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleDOMInjectedBundleNodeHandleh">trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleDOMInjectedBundleRangeHandlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleDOMInjectedBundleRangeHandleh">trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundleHitTestResultcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundleHitTestResulth">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (172779 => 172780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-08-19 23:29:15 UTC (rev 172779)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-08-19 23:33:33 UTC (rev 172780)
</span><span class="lines">@@ -1321,6 +1321,7 @@
</span><span class="cx"> __ZN7WebCore8Gradient12addColorStopEfRKNS_5ColorE
</span><span class="cx"> __ZN7WebCore8GradientC1ERKNS_10FloatPointES3_
</span><span class="cx"> __ZN7WebCore8GradientD1Ev
</span><ins>+__ZN7WebCore8PositionC1EN3WTF10PassRefPtrINS_4NodeEEENS0_10AnchorTypeE
</ins><span class="cx"> __ZN7WebCore8PositionC1EN3WTF10PassRefPtrINS_4NodeEEEiNS0_10AnchorTypeE
</span><span class="cx"> __ZN7WebCore8Settings13gQTKitEnabledE
</span><span class="cx"> __ZN7WebCore8Settings14setJavaEnabledEb
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (172779 => 172780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-08-19 23:29:15 UTC (rev 172779)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-19 23:33:33 UTC (rev 172780)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-08-19 Peyton Randolph <prandolph@apple.com>
+
+ Expose injected bundle SPI to get a node's URL element, get the visible selection range of that
+ element, and snapshot that range
+ https://bugs.webkit.org/show_bug.cgi?id=136076
+
+ Reviewed by Tim Horton.
+
+ * WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp:
+ (WKBundleHitTestResultCopyURLElementHandle): Added.
+ * WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h:
+ * WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp:
+ (WKBundleNodeHandleCopyVisibleRange): Added.
+ * WebProcess/InjectedBundle/API/c/WKBundleNodeHandlePrivate.h:
+ * WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.cpp:
+ (WKBundleRangeHandleGetBoundingRectInWindowCoordinates): Added.
+ (WKBundleRangeHandleCopySnapshotWithOptions): Added.
+ * WebProcess/InjectedBundle/API/c/WKBundleRangeHandlePrivate.h:
+ * WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp:
+ (WebKit::InjectedBundleNodeHandle::visibleRange): Added.
+ * WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h:
+ * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp:
+ (WebKit::InjectedBundleRangeHandle::boundingRectInWindowCoordinates): Added.
+ (WebKit::InjectedBundleRangeHandle::renderedImage): Added.
+ * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h:
+ * WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:
+ (WebKit::InjectedBundleHitTestResult::urlElementHandle): Added.
+ * WebProcess/InjectedBundle/InjectedBundleHitTestResult.h:
+
</ins><span class="cx"> 2014-08-19 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE(SUBPIXEL_LAYOUT).
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp (172779 => 172780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp 2014-08-19 23:29:15 UTC (rev 172779)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp 2014-08-19 23:33:33 UTC (rev 172780)
</span><span class="lines">@@ -44,6 +44,12 @@
</span><span class="cx"> return toAPI(nodeHandle.release().leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WKBundleNodeHandleRef WKBundleHitTestResultCopyURLElementHandle(WKBundleHitTestResultRef hitTestResultRef)
+{
+ RefPtr<InjectedBundleNodeHandle> urlElementNodeHandle = toImpl(hitTestResultRef)->urlElementHandle();
+ return toAPI(urlElementNodeHandle.release().leakRef());
+}
+
</ins><span class="cx"> WKBundleFrameRef WKBundleHitTestResultGetFrame(WKBundleHitTestResultRef hitTestResultRef)
</span><span class="cx"> {
</span><span class="cx"> return toAPI(toImpl(hitTestResultRef)->frame());
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleHitTestResulth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h (172779 => 172780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h 2014-08-19 23:29:15 UTC (rev 172779)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h 2014-08-19 23:33:33 UTC (rev 172780)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> WK_EXPORT WKTypeID WKBundleHitTestResultGetTypeID();
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKBundleNodeHandleRef WKBundleHitTestResultCopyNodeHandle(WKBundleHitTestResultRef hitTestResult);
</span><ins>+WK_EXPORT WKBundleNodeHandleRef WKBundleHitTestResultCopyURLElementHandle(WKBundleHitTestResultRef hitTestResult);
</ins><span class="cx">
</span><span class="cx"> WK_EXPORT WKBundleFrameRef WKBundleHitTestResultGetFrame(WKBundleHitTestResultRef hitTestResult);
</span><span class="cx"> WK_EXPORT WKBundleFrameRef WKBundleHitTestResultGetTargetFrame(WKBundleHitTestResultRef hitTestResult);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleNodeHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp (172779 => 172780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp 2014-08-19 23:29:15 UTC (rev 172779)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp 2014-08-19 23:33:33 UTC (rev 172780)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "WKBundleNodeHandlePrivate.h"
</span><span class="cx">
</span><span class="cx"> #include "InjectedBundleNodeHandle.h"
</span><ins>+#include "InjectedBundleRangeHandle.h"
</ins><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WKBundleAPICast.h"
</span><span class="cx"> #include "WebFrame.h"
</span><span class="lines">@@ -63,6 +64,12 @@
</span><span class="cx"> return toAPI(image.release().leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WKBundleRangeHandleRef WKBundleNodeHandleCopyVisibleRange(WKBundleNodeHandleRef nodeHandleRef)
+{
+ RefPtr<InjectedBundleRangeHandle> rangeHandle = toImpl(nodeHandleRef)->visibleRange();
+ return toAPI(rangeHandle.release().leakRef());
+}
+
</ins><span class="cx"> WKRect WKBundleNodeHandleGetElementBounds(WKBundleNodeHandleRef elementHandleRef)
</span><span class="cx"> {
</span><span class="cx"> return toAPI(toImpl(elementHandleRef)->elementBounds());
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleNodeHandlePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandlePrivate.h (172779 => 172780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandlePrivate.h 2014-08-19 23:29:15 UTC (rev 172779)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandlePrivate.h 2014-08-19 23:33:33 UTC (rev 172780)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKRect WKBundleNodeHandleGetRenderRect(WKBundleNodeHandleRef nodeHandle, bool* isReplaced);
</span><span class="cx"> WK_EXPORT WKImageRef WKBundleNodeHandleCopySnapshotWithOptions(WKBundleNodeHandleRef nodeHandle, WKSnapshotOptions options);
</span><ins>+WK_EXPORT WKBundleRangeHandleRef WKBundleNodeHandleCopyVisibleRange(WKBundleNodeHandleRef nodeHandle);
</ins><span class="cx">
</span><span class="cx"> /* Element Specific Operations */
</span><span class="cx"> WK_EXPORT WKRect WKBundleNodeHandleGetElementBounds(WKBundleNodeHandleRef elementHandle);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleRangeHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.cpp (172779 => 172780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.cpp 2014-08-19 23:29:15 UTC (rev 172779)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.cpp 2014-08-19 23:33:33 UTC (rev 172780)
</span><span class="lines">@@ -30,6 +30,8 @@
</span><span class="cx"> #include "InjectedBundleRangeHandle.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WKBundleAPICast.h"
</span><ins>+#include "WebImage.h"
+#include <WebCore/IntRect.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="lines">@@ -43,3 +45,15 @@
</span><span class="cx"> RefPtr<InjectedBundleRangeHandle> rangeHandle = InjectedBundleRangeHandle::getOrCreate(contextRef, objectRef);
</span><span class="cx"> return toAPI(rangeHandle.release().leakRef());
</span><span class="cx"> }
</span><ins>+
+WKRect WKBundleRangeHandleGetBoundingRectInWindowCoordinates(WKBundleRangeHandleRef rangeHandleRef)
+{
+ WebCore::IntRect boundingRect = toImpl(rangeHandleRef)->boundingRectInWindowCoordinates();
+ return WKRectMake(boundingRect.x(), boundingRect.y(), boundingRect.width(), boundingRect.height());
+}
+
+WKImageRef WKBundleRangeHandleCopySnapshotWithOptions(WKBundleRangeHandleRef rangeHandleRef, WKSnapshotOptions options)
+{
+ RefPtr<WebImage> image = toImpl(rangeHandleRef)->renderedImage(toSnapshotOptions(options));
+ return toAPI(image.release().leakRef());
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleRangeHandlePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleRangeHandlePrivate.h (172779 => 172780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleRangeHandlePrivate.h 2014-08-19 23:29:15 UTC (rev 172779)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleRangeHandlePrivate.h 2014-08-19 23:33:33 UTC (rev 172780)
</span><span class="lines">@@ -28,6 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #include <JavaScriptCore/JavaScript.h>
</span><span class="cx"> #include <WebKit/WKBase.h>
</span><ins>+#include <WebKit/WKGeometry.h>
+#include <WebKit/WKImage.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span><span class="lines">@@ -35,6 +37,9 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKBundleRangeHandleRef WKBundleRangeHandleCreate(JSContextRef context, JSObjectRef object);
</span><span class="cx">
</span><ins>+WK_EXPORT WKRect WKBundleRangeHandleGetBoundingRectInWindowCoordinates(WKBundleRangeHandleRef rangeHandle);
+WK_EXPORT WKImageRef WKBundleRangeHandleCopySnapshotWithOptions(WKBundleRangeHandleRef rangeHandle, WKSnapshotOptions options);
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleDOMInjectedBundleNodeHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp (172779 => 172780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp 2014-08-19 23:29:15 UTC (rev 172779)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp 2014-08-19 23:33:33 UTC (rev 172780)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InjectedBundleNodeHandle.h"
</span><span class="cx">
</span><ins>+#include "InjectedBundleRangeHandle.h"
</ins><span class="cx"> #include "ShareableBitmap.h"
</span><span class="cx"> #include "WebFrame.h"
</span><span class="cx"> #include "WebFrameLoaderClient.h"
</span><span class="lines">@@ -46,7 +47,10 @@
</span><span class="cx"> #include <WebCore/JSNode.h>
</span><span class="cx"> #include <WebCore/Node.h>
</span><span class="cx"> #include <WebCore/Page.h>
</span><ins>+#include <WebCore/Position.h>
+#include <WebCore/Range.h>
</ins><span class="cx"> #include <WebCore/RenderObject.h>
</span><ins>+#include <WebCore/VisiblePosition.h>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -184,6 +188,15 @@
</span><span class="cx"> return image.release();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+PassRefPtr<InjectedBundleRangeHandle> InjectedBundleNodeHandle::visibleRange() const
+{
+ VisiblePosition start = firstPositionInNode(m_node.get());
+ VisiblePosition end = lastPositionInNode(m_node.get());
+
+ RefPtr<Range> range = makeRange(start, end);
+ return InjectedBundleRangeHandle::getOrCreate(range.get());
+}
+
</ins><span class="cx"> void InjectedBundleNodeHandle::setHTMLInputElementValueForUser(const String& value)
</span><span class="cx"> {
</span><span class="cx"> if (!isHTMLInputElement(m_node.get()))
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleDOMInjectedBundleNodeHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h (172779 => 172780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h 2014-08-19 23:29:15 UTC (rev 172779)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h 2014-08-19 23:33:33 UTC (rev 172780)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+class InjectedBundleRangeHandle;
</ins><span class="cx"> class InjectedBundleScriptWorld;
</span><span class="cx"> class WebFrame;
</span><span class="cx"> class WebImage;
</span><span class="lines">@@ -61,6 +62,7 @@
</span><span class="cx"> WebCore::IntRect elementBounds() const;
</span><span class="cx"> WebCore::IntRect renderRect(bool*) const;
</span><span class="cx"> PassRefPtr<WebImage> renderedImage(SnapshotOptions);
</span><ins>+ PassRefPtr<InjectedBundleRangeHandle> visibleRange() const;
</ins><span class="cx"> void setHTMLInputElementValueForUser(const String&);
</span><span class="cx"> bool isHTMLInputElementAutofilled() const;
</span><span class="cx"> void setHTMLInputElementAutofilled(bool);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleDOMInjectedBundleRangeHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp (172779 => 172780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp 2014-08-19 23:29:15 UTC (rev 172779)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp 2014-08-19 23:33:33 UTC (rev 172780)
</span><span class="lines">@@ -26,9 +26,20 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InjectedBundleRangeHandle.h"
</span><span class="cx">
</span><ins>+#include "ShareableBitmap.h"
+#include "WebImage.h"
</ins><span class="cx"> #include <JavaScriptCore/APICast.h>
</span><ins>+#include <WebCore/Document.h>
+#include <WebCore/FloatRect.h>
+#include <WebCore/Frame.h>
+#include <WebCore/FrameSelection.h>
+#include <WebCore/FrameView.h>
+#include <WebCore/GraphicsContext.h>
+#include <WebCore/IntRect.h>
</ins><span class="cx"> #include <WebCore/JSRange.h>
</span><ins>+#include <WebCore/Page.h>
</ins><span class="cx"> #include <WebCore/Range.h>
</span><ins>+#include <WebCore/VisibleSelection.h>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="lines">@@ -84,4 +95,60 @@
</span><span class="cx"> return m_range.get();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WebCore::IntRect InjectedBundleRangeHandle::boundingRectInWindowCoordinates() const
+{
+ FloatRect boundingRect = m_range->boundingRect();
+ Frame* frame = m_range->ownerDocument().frame();
+ return frame->view()->contentsToWindow(enclosingIntRect(boundingRect));
+}
+
+PassRefPtr<WebImage> InjectedBundleRangeHandle::renderedImage(SnapshotOptions options)
+{
+ Document& ownerDocument = m_range->ownerDocument();
+ Frame* frame = ownerDocument.frame();
+ if (!frame)
+ return nullptr;
+
+ FrameView* frameView = frame->view();
+ if (!frameView)
+ return nullptr;
+
+ VisibleSelection oldSelection = frame->selection().selection();
+ frame->selection().setSelection(VisibleSelection(m_range.get()));
+
+ float scaleFactor = (options & SnapshotOptionsExcludeDeviceScaleFactor) ? 1 : frame->page()->deviceScaleFactor();
+ IntRect paintRect = enclosingIntRect(m_range->boundingRect());
+ IntSize backingStoreSize = paintRect.size();
+ backingStoreSize.scale(scaleFactor);
+
+ RefPtr<ShareableBitmap> backingStore = ShareableBitmap::createShareable(backingStoreSize, ShareableBitmap::SupportsAlpha);
+ if (!backingStore)
+ return nullptr;
+
+ auto graphicsContext = backingStore->createGraphicsContext();
+ graphicsContext->scale(FloatSize(scaleFactor, scaleFactor));
+
+ paintRect.move(frameView->frameRect().x(), frameView->frameRect().y());
+ paintRect.move(-frameView->scrollOffset());
+
+ graphicsContext->translate(-paintRect.x(), -paintRect.y());
+
+ PaintBehavior oldPaintBehavior = frameView->paintBehavior();
+ PaintBehavior paintBehavior = oldPaintBehavior | PaintBehaviorSelectionOnly | PaintBehaviorFlattenCompositingLayers;
+ if (options & SnapshotOptionsForceBlackText)
+ paintBehavior |= PaintBehaviorForceBlackText;
+ if (options & SnapshotOptionsForceWhiteText)
+ paintBehavior |= PaintBehaviorForceWhiteText;
+
+ frameView->setPaintBehavior(paintBehavior);
+ ownerDocument.updateLayout();
+
+ frameView->paint(graphicsContext.get(), paintRect);
+ frameView->setPaintBehavior(oldPaintBehavior);
+
+ frame->selection().setSelection(oldSelection);
+
+ return WebImage::create(backingStore);
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleDOMInjectedBundleRangeHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h (172779 => 172780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h 2014-08-19 23:29:15 UTC (rev 172779)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h 2014-08-19 23:33:33 UTC (rev 172780)
</span><span class="lines">@@ -27,17 +27,20 @@
</span><span class="cx"> #define InjectedBundleRangeHandle_h
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><ins>+#include "ImageOptions.h"
</ins><span class="cx"> #include <JavaScriptCore/JSBase.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>- class Range;
</del><ins>+class IntRect;
+class Range;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class InjectedBundleScriptWorld;
</span><ins>+class WebImage;
</ins><span class="cx">
</span><span class="cx"> class InjectedBundleRangeHandle : public API::ObjectImpl<API::Object::Type::BundleRangeHandle> {
</span><span class="cx"> public:
</span><span class="lines">@@ -46,6 +49,9 @@
</span><span class="cx">
</span><span class="cx"> virtual ~InjectedBundleRangeHandle();
</span><span class="cx">
</span><ins>+ WebCore::IntRect boundingRectInWindowCoordinates() const;
+ PassRefPtr<WebImage> renderedImage(SnapshotOptions);
+
</ins><span class="cx"> WebCore::Range* coreRange() const;
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundleHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp (172779 => 172780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp 2014-08-19 23:29:15 UTC (rev 172779)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp 2014-08-19 23:33:33 UTC (rev 172780)
</span><span class="lines">@@ -51,6 +51,11 @@
</span><span class="cx"> return InjectedBundleNodeHandle::getOrCreate(m_hitTestResult.innerNonSharedNode());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+PassRefPtr<InjectedBundleNodeHandle> InjectedBundleHitTestResult::urlElementHandle() const
+{
+ return InjectedBundleNodeHandle::getOrCreate(m_hitTestResult.URLElement());
+}
+
</ins><span class="cx"> WebFrame* InjectedBundleHitTestResult::frame() const
</span><span class="cx"> {
</span><span class="cx"> Node* node = m_hitTestResult.innerNonSharedNode();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundleHitTestResulth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h (172779 => 172780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h 2014-08-19 23:29:15 UTC (rev 172779)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h 2014-08-19 23:33:33 UTC (rev 172780)
</span><span class="lines">@@ -44,7 +44,8 @@
</span><span class="cx">
</span><span class="cx"> const WebCore::HitTestResult& coreHitTestResult() const { return m_hitTestResult; }
</span><span class="cx">
</span><del>- PassRefPtr<InjectedBundleNodeHandle> nodeHandle() const;
</del><ins>+ PassRefPtr<InjectedBundleNodeHandle> nodeHandle() const;
+ PassRefPtr<InjectedBundleNodeHandle> urlElementHandle() const;
</ins><span class="cx"> WebFrame* frame() const;
</span><span class="cx"> WebFrame* targetFrame() const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>