<!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>[184106] trunk</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/184106">184106</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-05-11 10:38:51 -0700 (Mon, 11 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Page overlay action context override should indicate the source of the request
https://bugs.webkit.org/show_bug.cgi?id=144832
<rdar://problem/20562594>
Reviewed by Darin Adler.
* WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp:
* WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h:
* WebProcess/WebPage/WebPageOverlay.cpp:
(WebKit::WebPageOverlay::actionContextForResultAtPoint):
* WebProcess/WebPage/WebPageOverlay.h:
(WebKit::WebPageOverlay::Client::actionContextForResultAtPoint):
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::performActionMenuHitTestAtLocation):
Add a parameter to WKBundlePageOverlayActionContextForResultAtPoint so that
clients can tell whether the requested action context should be targetted
at an action menu or immediate action.
* TestWebKitAPI/Tests/WebKit2ObjC/ActionMenusBundle.mm:
(TestWebKitAPI::ActionMenuTest::actionContextForResultAtPoint):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageOverlaycpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageOverlayh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageOverlaycpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPageOverlay.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageOverlayh">trunk/Source/WebKit2/WebProcess/WebPage/WebPageOverlay.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2ObjCActionMenusBundlemm">trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/ActionMenusBundle.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (184105 => 184106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-11 17:27:13 UTC (rev 184105)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-11 17:38:51 UTC (rev 184106)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-05-11 Tim Horton <timothy_horton@apple.com>
+
+ Page overlay action context override should indicate the source of the request
+ https://bugs.webkit.org/show_bug.cgi?id=144832
+ <rdar://problem/20562594>
+
+ Reviewed by Darin Adler.
+
+ * WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h:
+ * WebProcess/WebPage/WebPageOverlay.cpp:
+ (WebKit::WebPageOverlay::actionContextForResultAtPoint):
+ * WebProcess/WebPage/WebPageOverlay.h:
+ (WebKit::WebPageOverlay::Client::actionContextForResultAtPoint):
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::performActionMenuHitTestAtLocation):
+ Add a parameter to WKBundlePageOverlayActionContextForResultAtPoint so that
+ clients can tell whether the requested action context should be targetted
+ at an action menu or immediate action.
+
</ins><span class="cx"> 2015-05-11 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Close all open databases in expiration handler of process assertion
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp (184105 => 184106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp 2015-05-11 17:27:13 UTC (rev 184105)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp 2015-05-11 17:38:51 UTC (rev 184106)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> namespace API {
</span><span class="cx">
</span><span class="cx"> template<> struct ClientTraits<WKBundlePageOverlayClientBase> {
</span><del>- typedef std::tuple<WKBundlePageOverlayClientV0, WKBundlePageOverlayClientV1> Versions;
</del><ins>+ typedef std::tuple<WKBundlePageOverlayClientV0, WKBundlePageOverlayClientV1, WKBundlePageOverlayClientV2> Versions;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct ClientTraits<WKBundlePageOverlayAccessibilityClientBase> {
</span><span class="lines">@@ -135,18 +135,29 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- virtual DDActionContext *actionContextForResultAtPoint(WebPageOverlay& pageOverlay, WebCore::FloatPoint location, RefPtr<WebCore::Range>& rangeHandle) override
</del><ins>+ virtual DDActionContext *actionContextForResultAtPoint(WebPageOverlay& pageOverlay, WebCore::FloatPoint location, RefPtr<WebCore::Range>& rangeHandle, bool forImmediateAction) override
</ins><span class="cx"> {
</span><del>- if (!m_client.actionContextForResultAtPoint)
- return nil;
</del><ins>+ if (m_client.actionContextForResultAtPoint) {
+ WKBundleRangeHandleRef apiRange = nullptr;
+ DDActionContext *actionContext = (DDActionContext *)m_client.actionContextForResultAtPoint(toAPI(&pageOverlay), WKPointMake(location.x(), location.y()), &apiRange, forImmediateAction ? kWKBundlePageOverlayActionContextForImmediateActionRequestType : kWKBundlePageOverlayActionContextForActionMenuRequestType, m_client.base.clientInfo);
</ins><span class="cx">
</span><del>- WKBundleRangeHandleRef apiRange = nullptr;
- DDActionContext *actionContext = (DDActionContext *)m_client.actionContextForResultAtPoint(toAPI(&pageOverlay), WKPointMake(location.x(), location.y()), &apiRange, m_client.base.clientInfo);
</del><ins>+ if (apiRange)
+ rangeHandle = toImpl(apiRange)->coreRange();
</ins><span class="cx">
</span><del>- if (apiRange)
- rangeHandle = toImpl(apiRange)->coreRange();
</del><ins>+ return actionContext;
+ }
</ins><span class="cx">
</span><del>- return actionContext;
</del><ins>+ if (m_client.actionContextForResultAtPoint_deprecatedForUseWithV1) {
+ WKBundleRangeHandleRef apiRange = nullptr;
+ DDActionContext *actionContext = (DDActionContext *)m_client.actionContextForResultAtPoint_deprecatedForUseWithV1(toAPI(&pageOverlay), WKPointMake(location.x(), location.y()), &apiRange, m_client.base.clientInfo);
+
+ if (apiRange)
+ rangeHandle = toImpl(apiRange)->coreRange();
+
+ return actionContext;
+ }
+
+ return nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual void dataDetectorsDidPresentUI(WebPageOverlay& pageOverlay) override
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageOverlayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h (184105 => 184106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h 2015-05-11 17:27:13 UTC (rev 184105)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h 2015-05-11 17:38:51 UTC (rev 184106)
</span><span class="lines">@@ -40,6 +40,12 @@
</span><span class="cx"> extern "C" {
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+enum {
+ kWKBundlePageOverlayActionContextForActionMenuRequestType = 0,
+ kWKBundlePageOverlayActionContextForImmediateActionRequestType,
+};
+typedef uint32_t _WKBundlePageOverlayActionContextRequestType;
+
</ins><span class="cx"> // Page overlay client.
</span><span class="cx"> typedef void (*WKBundlePageOverlayWillMoveToPageCallback)(WKBundlePageOverlayRef pageOverlay, WKBundlePageRef page, const void* clientInfo);
</span><span class="cx"> typedef void (*WKBundlePageOverlayDidMoveToPageCallback)(WKBundlePageOverlayRef pageOverlay, WKBundlePageRef page, const void* clientInfo);
</span><span class="lines">@@ -49,10 +55,11 @@
</span><span class="cx"> typedef bool (*WKBundlePageOverlayMouseMovedCallback)(WKBundlePageOverlayRef pageOverlay, WKPoint position, const void* clientInfo);
</span><span class="cx"> typedef bool (*WKBundlePageOverlayMouseDraggedCallback)(WKBundlePageOverlayRef pageOverlay, WKPoint position, WKEventMouseButton mouseButton, const void* clientInfo);
</span><span class="cx">
</span><del>-typedef void* (*WKBundlePageOverlayActionContextForResultAtPointCallback)(WKBundlePageOverlayRef pageOverlay, WKPoint position, WKBundleRangeHandleRef* rangeHandle, const void* clientInfo);
-typedef void (*WKBundlePageOverlayDatadetectorsDidPresentUI)(WKBundlePageOverlayRef pageOverlay, const void* clientInfo);
-typedef void (*WKBundlePageOverlayDatadetectorsDidChangeUI)(WKBundlePageOverlayRef pageOverlay, const void* clientInfo);
-typedef void (*WKBundlePageOverlayDatadetectorsDidHideUI)(WKBundlePageOverlayRef pageOverlay, const void* clientInfo);
</del><ins>+typedef void* (*WKBundlePageOverlayActionContextForResultAtPointCallback_deprecatedForUseWithV1)(WKBundlePageOverlayRef pageOverlay, WKPoint position, WKBundleRangeHandleRef* rangeHandle, const void* clientInfo);
+typedef void* (*WKBundlePageOverlayActionContextForResultAtPointCallback)(WKBundlePageOverlayRef pageOverlay, WKPoint position, WKBundleRangeHandleRef* rangeHandle, _WKBundlePageOverlayActionContextRequestType requestType, const void* clientInfo);
+typedef void (*WKBundlePageOverlayDataDetectorsDidPresentUI)(WKBundlePageOverlayRef pageOverlay, const void* clientInfo);
+typedef void (*WKBundlePageOverlayDataDetectorsDidChangeUI)(WKBundlePageOverlayRef pageOverlay, const void* clientInfo);
+typedef void (*WKBundlePageOverlayDataDetectorsDidHideUI)(WKBundlePageOverlayRef pageOverlay, const void* clientInfo);
</ins><span class="cx">
</span><span class="cx"> typedef struct WKBundlePageOverlayClientBase {
</span><span class="cx"> int version;
</span><span class="lines">@@ -83,11 +90,30 @@
</span><span class="cx"> WKBundlePageOverlayMouseDraggedCallback mouseDragged;
</span><span class="cx">
</span><span class="cx"> WKBundlePageOverlayActionContextForResultAtPointCallback actionContextForResultAtPoint;
</span><del>- WKBundlePageOverlayDatadetectorsDidPresentUI dataDetectorsDidPresentUI;
- WKBundlePageOverlayDatadetectorsDidChangeUI dataDetectorsDidChangeUI;
- WKBundlePageOverlayDatadetectorsDidHideUI dataDetectorsDidHideUI;
</del><ins>+ WKBundlePageOverlayDataDetectorsDidPresentUI dataDetectorsDidPresentUI;
+ WKBundlePageOverlayDataDetectorsDidChangeUI dataDetectorsDidChangeUI;
+ WKBundlePageOverlayDataDetectorsDidHideUI dataDetectorsDidHideUI;
</ins><span class="cx"> } WKBundlePageOverlayClientV1;
</span><span class="cx">
</span><ins>+typedef struct WKBundlePageOverlayClientV2 {
+ WKBundlePageOverlayClientBase base;
+
+ WKBundlePageOverlayWillMoveToPageCallback willMoveToPage;
+ WKBundlePageOverlayDidMoveToPageCallback didMoveToPage;
+ WKBundlePageOverlayDrawRectCallback drawRect;
+ WKBundlePageOverlayMouseDownCallback mouseDown;
+ WKBundlePageOverlayMouseUpCallback mouseUp;
+ WKBundlePageOverlayMouseMovedCallback mouseMoved;
+ WKBundlePageOverlayMouseDraggedCallback mouseDragged;
+
+ WKBundlePageOverlayActionContextForResultAtPointCallback_deprecatedForUseWithV1 actionContextForResultAtPoint_deprecatedForUseWithV1;
+ WKBundlePageOverlayDataDetectorsDidPresentUI dataDetectorsDidPresentUI;
+ WKBundlePageOverlayDataDetectorsDidChangeUI dataDetectorsDidChangeUI;
+ WKBundlePageOverlayDataDetectorsDidHideUI dataDetectorsDidHideUI;
+
+ WKBundlePageOverlayActionContextForResultAtPointCallback actionContextForResultAtPoint;
+} WKBundlePageOverlayClientV2;
+
</ins><span class="cx"> enum { kWKBundlePageOverlayClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
</span><span class="cx"> typedef struct WKBundlePageOverlayClient {
</span><span class="cx"> int version;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPageOverlay.cpp (184105 => 184106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPageOverlay.cpp 2015-05-11 17:27:13 UTC (rev 184105)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPageOverlay.cpp 2015-05-11 17:38:51 UTC (rev 184106)
</span><span class="lines">@@ -120,9 +120,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>-DDActionContext *WebPageOverlay::actionContextForResultAtPoint(FloatPoint location, RefPtr<WebCore::Range>& rangeHandle)
</del><ins>+DDActionContext *WebPageOverlay::actionContextForResultAtPoint(FloatPoint location, RefPtr<WebCore::Range>& rangeHandle, bool forImmediateAction)
</ins><span class="cx"> {
</span><del>- return m_client->actionContextForResultAtPoint(*this, location, rangeHandle);
</del><ins>+ return m_client->actionContextForResultAtPoint(*this, location, rangeHandle, forImmediateAction);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageOverlay::dataDetectorsDidPresentUI()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageOverlayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPageOverlay.h (184105 => 184106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPageOverlay.h 2015-05-11 17:27:13 UTC (rev 184105)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPageOverlay.h 2015-05-11 17:38:51 UTC (rev 184106)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> virtual void didScrollFrame(WebPageOverlay&, WebFrame*) { }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- virtual DDActionContext *actionContextForResultAtPoint(WebPageOverlay&, WebCore::FloatPoint location, RefPtr<WebCore::Range>& rangeHandle) { return nullptr; }
</del><ins>+ virtual DDActionContext *actionContextForResultAtPoint(WebPageOverlay&, WebCore::FloatPoint location, RefPtr<WebCore::Range>& rangeHandle, bool forImmediateAction) { return nullptr; }
</ins><span class="cx"> virtual void dataDetectorsDidPresentUI(WebPageOverlay&) { }
</span><span class="cx"> virtual void dataDetectorsDidChangeUI(WebPageOverlay&) { }
</span><span class="cx"> virtual void dataDetectorsDidHideUI(WebPageOverlay&) { }
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> Client& client() const { return *m_client; }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- DDActionContext *actionContextForResultAtPoint(WebCore::FloatPoint, RefPtr<WebCore::Range>&);
</del><ins>+ DDActionContext *actionContextForResultAtPoint(WebCore::FloatPoint, RefPtr<WebCore::Range>&, bool forImmediateAction);
</ins><span class="cx"> void dataDetectorsDidPresentUI();
</span><span class="cx"> void dataDetectorsDidChangeUI();
</span><span class="cx"> void dataDetectorsDidHideUI();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (184105 => 184106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2015-05-11 17:27:13 UTC (rev 184105)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2015-05-11 17:38:51 UTC (rev 184106)
</span><span class="lines">@@ -1133,7 +1133,7 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> RefPtr<Range> mainResultRange;
</span><del>- DDActionContext *actionContext = webOverlay->actionContextForResultAtPoint(locationInContentCoordinates, mainResultRange);
</del><ins>+ DDActionContext *actionContext = webOverlay->actionContextForResultAtPoint(locationInContentCoordinates, mainResultRange, forImmediateAction);
</ins><span class="cx"> if (!actionContext || !mainResultRange)
</span><span class="cx"> continue;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (184105 => 184106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-05-11 17:27:13 UTC (rev 184105)
+++ trunk/Tools/ChangeLog 2015-05-11 17:38:51 UTC (rev 184106)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-05-11 Tim Horton <timothy_horton@apple.com>
+
+ Page overlay action context override should indicate the source of the request
+ https://bugs.webkit.org/show_bug.cgi?id=144832
+ <rdar://problem/20562594>
+
+ Reviewed by Darin Adler.
+
+ * TestWebKitAPI/Tests/WebKit2ObjC/ActionMenusBundle.mm:
+ (TestWebKitAPI::ActionMenuTest::actionContextForResultAtPoint):
+
</ins><span class="cx"> 2015-05-10 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] fast/events/page-visibility-transition-test.html is timing out
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2ObjCActionMenusBundlemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/ActionMenusBundle.mm (184105 => 184106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/ActionMenusBundle.mm 2015-05-11 17:27:13 UTC (rev 184105)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/ActionMenusBundle.mm 2015-05-11 17:38:51 UTC (rev 184106)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> *userData = WKDictionaryCreate(keys, values, 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static void* actionContextForResultAtPoint(WKBundlePageOverlayRef pageOverlay, WKPoint position, WKBundleRangeHandleRef* rangeHandle, const void* clientInfo)
</del><ins>+ static void* actionContextForResultAtPoint(WKBundlePageOverlayRef pageOverlay, WKPoint position, WKBundleRangeHandleRef* rangeHandle, _WKBundlePageOverlayActionContextRequestType requestType, const void* clientInfo)
</ins><span class="cx"> {
</span><span class="cx"> if (position.x > 700) {
</span><span class="cx"> RetainPtr<DDActionContext> actionContext = createActionContextForPhoneNumber();
</span></span></pre>
</div>
</div>
</body>
</html>