<!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>[213954] trunk/Source/WebKit2</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/213954">213954</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2017-03-14 16:18:55 -0700 (Tue, 14 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Let PDFLayerController drive cursor updates so that it's correct more often
https://bugs.webkit.org/show_bug.cgi?id=169626
<rdar://problem/30762943>
Reviewed by Simon Fraser.
* WebProcess/Plugins/PDF/DeprecatedPDFLayerControllerSPI.h:
* WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h:
* WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm:
(-[WKPDFLayerControllerDelegate setMouseCursor:]):
(WebKit::PDFPlugin::handleMouseEvent):
(WebKit::PDFPlugin::handleMouseEnterEvent):
(WebKit::pdfLayerControllerCursorTypeToCursor):
(WebKit::PDFPlugin::notifyCursorChanged):
Disable updateCursor and use the setMouseCursor delegate method when possible.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFDeprecatedPDFLayerControllerSPIh">trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFLayerControllerSPI.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFDeprecatedPDFPluginh">trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFDeprecatedPDFPluginmm">trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (213953 => 213954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-03-14 23:17:55 UTC (rev 213953)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-14 23:18:55 UTC (rev 213954)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-03-14 Tim Horton <timothy_horton@apple.com>
+
+ Let PDFLayerController drive cursor updates so that it's correct more often
+ https://bugs.webkit.org/show_bug.cgi?id=169626
+ <rdar://problem/30762943>
+
+ Reviewed by Simon Fraser.
+
+ * WebProcess/Plugins/PDF/DeprecatedPDFLayerControllerSPI.h:
+ * WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h:
+ * WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm:
+ (-[WKPDFLayerControllerDelegate setMouseCursor:]):
+ (WebKit::PDFPlugin::handleMouseEvent):
+ (WebKit::PDFPlugin::handleMouseEnterEvent):
+ (WebKit::pdfLayerControllerCursorTypeToCursor):
+ (WebKit::PDFPlugin::notifyCursorChanged):
+ Disable updateCursor and use the setMouseCursor delegate method when possible.
+
</ins><span class="cx"> 2017-03-14 Andrew Gold <agold@apple.com>
</span><span class="cx">
</span><span class="cx"> Extend WKPreferences to include preferences for testing MediaCapture.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFDeprecatedPDFLayerControllerSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFLayerControllerSPI.h (213953 => 213954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFLayerControllerSPI.h 2017-03-14 23:17:55 UTC (rev 213953)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFLayerControllerSPI.h 2017-03-14 23:18:55 UTC (rev 213954)
</span><span class="lines">@@ -33,6 +33,12 @@
</span><span class="cx"> @class CPReadingModel;
</span><span class="cx"> @class PDFViewLayout;
</span><span class="cx">
</span><ins>+typedef NS_ENUM(NSInteger, PDFLayerControllerCursorType) {
+ kPDFLayerControllerCursorTypePointer = 0,
+ kPDFLayerControllerCursorTypeHand,
+ kPDFLayerControllerCursorTypeIBeam,
+};
+
</ins><span class="cx"> @protocol PDFLayerControllerDelegate <NSObject>
</span><span class="cx">
</span><span class="cx"> - (void)updateScrollPosition:(CGPoint)newPosition;
</span><span class="lines">@@ -49,6 +55,8 @@
</span><span class="cx"> - (void)pdfLayerController:(PDFLayerController *)pdfLayerController didChangeDisplayMode:(int)mode;
</span><span class="cx"> - (void)pdfLayerController:(PDFLayerController *)pdfLayerController didChangeSelection:(PDFSelection *)selection;
</span><span class="cx">
</span><ins>+- (void)setMouseCursor:(PDFLayerControllerCursorType)cursorType;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface PDFLayerController : NSObject
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFDeprecatedPDFPluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h (213953 => 213954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h 2017-03-14 23:17:55 UTC (rev 213953)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h 2017-03-14 23:18:55 UTC (rev 213954)
</span><span class="lines">@@ -87,6 +87,7 @@
</span><span class="cx"> void notifyDisplayModeChanged(int);
</span><span class="cx">
</span><span class="cx"> void notifySelectionChanged(PDFSelection *);
</span><ins>+ void notifyCursorChanged(uint64_t /* PDFLayerControllerCursorType */);
</ins><span class="cx">
</span><span class="cx"> void clickedLink(NSURL *);
</span><span class="cx"> void saveToPDF();
</span><span class="lines">@@ -249,6 +250,7 @@
</span><span class="cx">
</span><span class="cx"> WebFrame* webFrame() const { return m_frame; }
</span><span class="cx">
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101300
</ins><span class="cx"> enum UpdateCursorMode {
</span><span class="cx"> UpdateIfNeeded,
</span><span class="cx"> ForceUpdate
</span><span class="lines">@@ -260,6 +262,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> void updateCursor(const WebMouseEvent&, UpdateCursorMode = UpdateIfNeeded);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> JSObjectRef makeJSPDFDoc(JSContextRef);
</span><span class="cx"> static JSValueRef jsPDFDocPrint(JSContextRef, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception);
</span><span class="lines">@@ -297,8 +300,10 @@
</span><span class="cx">
</span><span class="cx"> String m_lastFoundString;
</span><span class="cx">
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101300
</ins><span class="cx"> HitTestResult m_lastHitTestResult;
</span><del>-
</del><ins>+#endif
+
</ins><span class="cx"> RetainPtr<WKPDFLayerControllerDelegate> m_pdfLayerControllerDelegate;
</span><span class="cx">
</span><span class="cx"> WebCore::IntSize m_size;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFDeprecatedPDFPluginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm (213953 => 213954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm 2017-03-14 23:17:55 UTC (rev 213953)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm 2017-03-14 23:18:55 UTC (rev 213954)
</span><span class="lines">@@ -396,6 +396,11 @@
</span><span class="cx"> _pdfPlugin->notifySelectionChanged(selection);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)setMouseCursor:(PDFLayerControllerCursorType)cursorType
+{
+ _pdfPlugin->notifyCursorChanged(cursorType);
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface PDFViewLayout
</span><span class="lines">@@ -1353,6 +1358,7 @@
</span><span class="cx"> return [NSEvent mouseEventWithType:eventType location:positionInPDFViewCoordinates modifierFlags:modifierFlags timestamp:0 windowNumber:0 context:nil eventNumber:0 clickCount:event.clickCount() pressure:0];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101300
</ins><span class="cx"> void PDFPlugin::updateCursor(const WebMouseEvent& event, UpdateCursorMode mode)
</span><span class="cx"> {
</span><span class="cx"> HitTestResult hitTestResult = None;
</span><span class="lines">@@ -1367,6 +1373,7 @@
</span><span class="cx"> webFrame()->page()->send(Messages::WebPageProxy::SetCursor(hitTestResult == Text ? iBeamCursor() : pointerCursor()));
</span><span class="cx"> m_lastHitTestResult = hitTestResult;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> bool PDFPlugin::handleMouseEvent(const WebMouseEvent& event)
</span><span class="cx"> {
</span><span class="lines">@@ -1409,7 +1416,9 @@
</span><span class="cx"> switch (event.type()) {
</span><span class="cx"> case WebEvent::MouseMove:
</span><span class="cx"> mouseMovedInContentArea();
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101300
</ins><span class="cx"> updateCursor(event);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> if (targetScrollbar) {
</span><span class="cx"> if (!targetScrollbarForLastMousePosition) {
</span><span class="lines">@@ -1474,7 +1483,9 @@
</span><span class="cx"> bool PDFPlugin::handleMouseEnterEvent(const WebMouseEvent& event)
</span><span class="cx"> {
</span><span class="cx"> mouseEnteredContentArea();
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101300
</ins><span class="cx"> updateCursor(event, ForceUpdate);
</span><ins>+#endif
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1861,6 +1872,24 @@
</span><span class="cx"> webFrame()->page()->didChangeSelection();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static const Cursor& pdfLayerControllerCursorTypeToCursor(PDFLayerControllerCursorType type)
+{
+ switch (type) {
+ case kPDFLayerControllerCursorTypeHand:
+ return handCursor();
+ case kPDFLayerControllerCursorTypeIBeam:
+ return iBeamCursor();
+ case kPDFLayerControllerCursorTypePointer:
+ default:
+ return pointerCursor();
+ }
+}
+
+void PDFPlugin::notifyCursorChanged(uint64_t type)
+{
+ webFrame()->page()->send(Messages::WebPageProxy::SetCursor(pdfLayerControllerCursorTypeToCursor(static_cast<PDFLayerControllerCursorType>(type))));
+}
+
</ins><span class="cx"> String PDFPlugin::getSelectionString() const
</span><span class="cx"> {
</span><span class="cx"> return [[m_pdfLayerController currentSelection] string];
</span></span></pre>
</div>
</div>
</body>
</html>