<!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>[173034] trunk/Source/WebCore</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/173034">173034</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2014-08-27 16:29:28 -0700 (Wed, 27 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enums in ScrollTypes and PlatformWheelEvent should not use uint64_t storage
https://bugs.webkit.org/show_bug.cgi?id=136318
Reviewed by Simon Fraser.
This regressed in a replay-related patch. Revert back to uint8_t storage size.
* platform/PlatformWheelEvent.h:
* platform/ScrollTypes.h:
* replay/WebInputs.json:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformWheelEventh">trunk/Source/WebCore/platform/PlatformWheelEvent.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollTypesh">trunk/Source/WebCore/platform/ScrollTypes.h</a></li>
<li><a href="#trunkSourceWebCorereplayWebInputsjson">trunk/Source/WebCore/replay/WebInputs.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173033 => 173034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-08-27 23:24:19 UTC (rev 173033)
+++ trunk/Source/WebCore/ChangeLog        2014-08-27 23:29:28 UTC (rev 173034)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-08-27 Brian J. Burg <burg@cs.washington.edu>
+
+ Enums in ScrollTypes and PlatformWheelEvent should not use uint64_t storage
+ https://bugs.webkit.org/show_bug.cgi?id=136318
+
+ Reviewed by Simon Fraser.
+
+ This regressed in a replay-related patch. Revert back to uint8_t storage size.
+
+ * platform/PlatformWheelEvent.h:
+ * platform/ScrollTypes.h:
+ * replay/WebInputs.json:
+
</ins><span class="cx"> 2014-08-27 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Speling is hard.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformWheelEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformWheelEvent.h (173033 => 173034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformWheelEvent.h        2014-08-27 23:24:19 UTC (rev 173033)
+++ trunk/Source/WebCore/platform/PlatformWheelEvent.h        2014-08-27 23:29:28 UTC (rev 173034)
</span><span class="lines">@@ -48,13 +48,13 @@
</span><span class="cx"> // and synthesized in other cases where platforms generate line-by-line scrolling events.
</span><span class="cx"> // The ScrollByPageWheelEvent indicates that the wheel event should scroll an entire page. In this case WebCore's built in paging behavior is used to page
</span><span class="cx"> // up and down (you get the same behavior as if the user was clicking in a scrollbar track to page up or page down).
</span><del>- enum PlatformWheelEventGranularity : uint64_t {
</del><ins>+ enum PlatformWheelEventGranularity : uint8_t {
</ins><span class="cx"> ScrollByPageWheelEvent,
</span><span class="cx"> ScrollByPixelWheelEvent,
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- enum PlatformWheelEventPhase : uint64_t {
</del><ins>+ enum PlatformWheelEventPhase : uint8_t {
</ins><span class="cx"> PlatformWheelEventPhaseNone = 0,
</span><span class="cx"> PlatformWheelEventPhaseBegan = 1 << 0,
</span><span class="cx"> PlatformWheelEventPhaseStationary = 1 << 1,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollTypes.h (173033 => 173034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollTypes.h        2014-08-27 23:24:19 UTC (rev 173033)
+++ trunk/Source/WebCore/platform/ScrollTypes.h        2014-08-27 23:29:28 UTC (rev 173034)
</span><span class="lines">@@ -30,14 +30,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- enum ScrollDirection : uint64_t {
</del><ins>+ enum ScrollDirection : uint8_t {
</ins><span class="cx"> ScrollUp,
</span><span class="cx"> ScrollDown,
</span><span class="cx"> ScrollLeft,
</span><span class="cx"> ScrollRight
</span><span class="cx"> };
</span><span class="cx">
</span><del>- enum ScrollLogicalDirection : uint64_t {
</del><ins>+ enum ScrollLogicalDirection : uint8_t {
</ins><span class="cx"> ScrollBlockDirectionBackward,
</span><span class="cx"> ScrollBlockDirectionForward,
</span><span class="cx"> ScrollInlineDirectionBackward,
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> return ScrollUp;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- enum ScrollGranularity : uint64_t {
</del><ins>+ enum ScrollGranularity : uint8_t {
</ins><span class="cx"> ScrollByLine,
</span><span class="cx"> ScrollByPage,
</span><span class="cx"> ScrollByDocument,
</span></span></pre></div>
<a id="trunkSourceWebCorereplayWebInputsjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/WebInputs.json (173033 => 173034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/WebInputs.json        2014-08-27 23:24:19 UTC (rev 173033)
+++ trunk/Source/WebCore/replay/WebInputs.json        2014-08-27 23:29:28 UTC (rev 173034)
</span><span class="lines">@@ -67,13 +67,13 @@
</span><span class="cx"> "header": "platform/PlatformWheelEvent.h"
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "PlatformWheelEventGranularity", "mode": "SCALAR", "storage": "uint64_t",
</del><ins>+ "name": "PlatformWheelEventGranularity", "mode": "SCALAR", "storage": "uint8_t",
</ins><span class="cx"> "flags": ["ENUM"],
</span><span class="cx"> "values": ["ScrollByPageWheelEvent", "ScrollByPixelWheelEvent"],
</span><span class="cx"> "header": "platform/PlatformWheelEvent.h"
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "PlatformWheelEventPhase", "mode": "SCALAR", "storage": "uint64_t",
</del><ins>+ "name": "PlatformWheelEventPhase", "mode": "SCALAR", "storage": "uint8_t",
</ins><span class="cx"> "flags": ["ENUM"],
</span><span class="cx"> "guard": "PLATFORM(COCOA)",
</span><span class="cx"> "values": [
</span><span class="lines">@@ -92,13 +92,13 @@
</span><span class="cx"> "header": "plugins/PluginData.h"
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "ScrollDirection", "mode": "SCALAR", "storage": "uint64_t",
</del><ins>+ "name": "ScrollDirection", "mode": "SCALAR", "storage": "uint8_t",
</ins><span class="cx"> "flags": ["ENUM"],
</span><span class="cx"> "values": ["ScrollUp", "ScrollDown", "ScrollLeft", "ScrollRight"],
</span><span class="cx"> "header": "platform/ScrollTypes.h"
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "ScrollGranularity", "mode": "SCALAR", "storage": "uint64_t",
</del><ins>+ "name": "ScrollGranularity", "mode": "SCALAR", "storage": "uint8_t",
</ins><span class="cx"> "flags": ["ENUM"],
</span><span class="cx"> "values": [
</span><span class="cx"> "ScrollByLine",
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> "header": "platform/ScrollTypes.h"
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "ScrollLogicalDirection", "mode": "SCALAR", "storage": "uint64_t",
</del><ins>+ "name": "ScrollLogicalDirection", "mode": "SCALAR", "storage": "uint8_t",
</ins><span class="cx"> "flags": ["ENUM"],
</span><span class="cx"> "values": [
</span><span class="cx"> "ScrollBlockDirectionBackward",
</span></span></pre>
</div>
</div>
</body>
</html>