<!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>[160801] 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/160801">160801</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2013-12-18 15:25:56 -0800 (Wed, 18 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>PDFPlugin: Never make a NSEventType = 0
https://bugs.webkit.org/show_bug.cgi?id=125955
Reviewed by Dan Bernstein.
* WebProcess/Plugins/PDF/PDFPlugin.mm:
(WebKit::getEventTypeFromWebEvent):
Make getEventTypeFromWebEvent return its NSEventType as an out arg, and
make the return value represent whether or not we set it.
(WebKit::PDFPlugin::nsEventForWebMouseEvent):
(WebKit::PDFPlugin::handleKeyboardEvent):
Make use of getEventTypeFromWebEvent.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160800 => 160801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-18 23:23:53 UTC (rev 160800)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-18 23:25:56 UTC (rev 160801)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2013-12-18 Tim Horton <timothy_horton@apple.com>
+
+ PDFPlugin: Never make a NSEventType = 0
+ https://bugs.webkit.org/show_bug.cgi?id=125955
+
+ Reviewed by Dan Bernstein.
+
+ * WebProcess/Plugins/PDF/PDFPlugin.mm:
+ (WebKit::getEventTypeFromWebEvent):
+ Make getEventTypeFromWebEvent return its NSEventType as an out arg, and
+ make the return value represent whether or not we set it.
+
+ (WebKit::PDFPlugin::nsEventForWebMouseEvent):
+ (WebKit::PDFPlugin::handleKeyboardEvent):
+ Make use of getEventTypeFromWebEvent.
+
</ins><span class="cx"> 2013-12-18 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> WKRemoteObjectRegistry should invoke invocations
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (160800 => 160801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2013-12-18 23:23:53 UTC (rev 160800)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2013-12-18 23:25:56 UTC (rev 160801)
</span><span class="lines">@@ -1249,49 +1249,53 @@
</span><span class="cx"> | (event.metaKey() ? NSCommandKeyMask : 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static NSEventType eventTypeFromWebEvent(const WebEvent& event)
</del><ins>+static bool getEventTypeFromWebEvent(const WebEvent& event, NSEventType& eventType)
</ins><span class="cx"> {
</span><span class="cx"> switch (event.type()) {
</span><span class="cx"> case WebEvent::KeyDown:
</span><del>- return NSKeyDown;
</del><ins>+ eventType = NSKeyDown;
+ return true;
</ins><span class="cx"> case WebEvent::KeyUp:
</span><del>- return NSKeyUp;
-
</del><ins>+ eventType = NSKeyUp;
+ return true;
</ins><span class="cx"> case WebEvent::MouseDown:
</span><span class="cx"> switch (static_cast<const WebMouseEvent&>(event).button()) {
</span><span class="cx"> case WebMouseEvent::LeftButton:
</span><del>- return NSLeftMouseDown;
</del><ins>+ eventType = NSLeftMouseDown;
+ return true;
</ins><span class="cx"> case WebMouseEvent::RightButton:
</span><del>- return NSRightMouseDown;
</del><ins>+ eventType = NSRightMouseDown;
+ return true;
</ins><span class="cx"> default:
</span><del>- return 0;
</del><ins>+ return false;
</ins><span class="cx"> }
</span><del>- break;
</del><span class="cx"> case WebEvent::MouseUp:
</span><span class="cx"> switch (static_cast<const WebMouseEvent&>(event).button()) {
</span><span class="cx"> case WebMouseEvent::LeftButton:
</span><del>- return NSLeftMouseUp;
</del><ins>+ eventType = NSLeftMouseUp;
+ return true;
</ins><span class="cx"> case WebMouseEvent::RightButton:
</span><del>- return NSRightMouseUp;
</del><ins>+ eventType = NSRightMouseUp;
+ return true;
</ins><span class="cx"> default:
</span><del>- return 0;
</del><ins>+ return false;
</ins><span class="cx"> }
</span><del>- break;
</del><span class="cx"> case WebEvent::MouseMove:
</span><span class="cx"> switch (static_cast<const WebMouseEvent&>(event).button()) {
</span><span class="cx"> case WebMouseEvent::LeftButton:
</span><del>- return NSLeftMouseDragged;
</del><ins>+ eventType = NSLeftMouseDragged;
+ return true;
</ins><span class="cx"> case WebMouseEvent::RightButton:
</span><del>- return NSRightMouseDragged;
</del><ins>+ eventType = NSRightMouseDragged;
+ return true;
</ins><span class="cx"> case WebMouseEvent::NoButton:
</span><del>- return NSMouseMoved;
</del><ins>+ eventType = NSMouseMoved;
+ return true;
</ins><span class="cx"> default:
</span><del>- return 0;
</del><ins>+ return false;
</ins><span class="cx"> }
</span><del>- break;
-
</del><span class="cx"> default:
</span><del>- return 0;
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1301,9 +1305,9 @@
</span><span class="cx">
</span><span class="cx"> IntPoint positionInPDFViewCoordinates(convertFromPluginToPDFView(m_lastMousePositionInPluginCoordinates));
</span><span class="cx">
</span><del>- NSEventType eventType = eventTypeFromWebEvent(event);
</del><ins>+ NSEventType eventType;
</ins><span class="cx">
</span><del>- if (!eventType)
</del><ins>+ if (!getEventTypeFromWebEvent(event, eventType))
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> NSUInteger modifierFlags = modifierFlagsFromWebEvent(event);
</span><span class="lines">@@ -1462,7 +1466,11 @@
</span><span class="cx">
</span><span class="cx"> bool PDFPlugin::handleKeyboardEvent(const WebKeyboardEvent& event)
</span><span class="cx"> {
</span><del>- NSEventType eventType = eventTypeFromWebEvent(event);
</del><ins>+ NSEventType eventType;
+
+ if (!getEventTypeFromWebEvent(event, eventType))
+ return false;
+
</ins><span class="cx"> NSUInteger modifierFlags = modifierFlagsFromWebEvent(event);
</span><span class="cx">
</span><span class="cx"> NSEvent *fakeEvent = [NSEvent keyEventWithType:eventType location:NSZeroPoint modifierFlags:modifierFlags timestamp:0 windowNumber:0 context:0 characters:event.text() charactersIgnoringModifiers:event.unmodifiedText() isARepeat:event.isAutoRepeat() keyCode:event.nativeVirtualKeyCode()];
</span></span></pre>
</div>
</div>
</body>
</html>