<!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>[55933] trunk/WebKit/chromium</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/55933">55933</a></dd>
<dt>Author</dt> <dd>abarth@webkit.org</dd>
<dt>Date</dt> <dd>2010-03-12 13:15:02 -0800 (Fri, 12 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>2010-03-12  Garret Kelly  &lt;gdk@chromium.org&gt;

        Unreiviewed.

        Fix Chromium Mac build. Last patch did not apply properly.
        (Garret assures me this patch will actually work.)

        * src/WebInputEventConversion.cpp:
        (WebKit::toPlatformTouchEventType):
        (WebKit::toPlatformTouchPointState):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitchromiumChangeLog">trunk/WebKit/chromium/ChangeLog</a></li>
<li><a href="#trunkWebKitchromiumsrcWebInputEventConversioncpp">trunk/WebKit/chromium/src/WebInputEventConversion.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitchromiumChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/chromium/ChangeLog (55932 => 55933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/chromium/ChangeLog        2010-03-12 20:48:17 UTC (rev 55932)
+++ trunk/WebKit/chromium/ChangeLog        2010-03-12 21:15:02 UTC (rev 55933)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2010-03-12  Garret Kelly  &lt;gdk@chromium.org&gt;
</span><span class="cx"> 
</span><ins>+        Unreiviewed.
+
+        Fix Chromium Mac build. Last patch did not apply properly.
+        (Garret assures me this patch will actually work.)
+
+        * src/WebInputEventConversion.cpp:
+        (WebKit::toPlatformTouchEventType):
+        (WebKit::toPlatformTouchPointState):
+
+2010-03-12  Garret Kelly  &lt;gdk@chromium.org&gt;
+
</ins><span class="cx">         Unreviewed.
</span><span class="cx"> 
</span><span class="cx">         Fix Chromium Mac build. This time, with actual fixing goodness.
</span></span></pre></div>
<a id="trunkWebKitchromiumsrcWebInputEventConversioncpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/chromium/src/WebInputEventConversion.cpp (55932 => 55933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/chromium/src/WebInputEventConversion.cpp        2010-03-12 20:48:17 UTC (rev 55932)
+++ trunk/WebKit/chromium/src/WebInputEventConversion.cpp        2010-03-12 21:15:02 UTC (rev 55933)
</span><span class="lines">@@ -81,7 +81,6 @@
</span><span class="cx">     default:
</span><span class="cx">         ASSERT_NOT_REACHED();
</span><span class="cx">     }
</span><del>-    return TouchStart;
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // PlatformWheelEventBuilder --------------------------------------------------
</span><span class="lines">@@ -155,7 +154,6 @@
</span><span class="cx">         m_keyIdentifier = String();
</span><span class="cx">         m_windowsVirtualKeyCode = 0;
</span><span class="cx">     }
</span><del>-    return PlatformTouchPoint::TouchReleased;
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // Please refer to bug http://b/issue?id=961192, which talks about Webkit
</span><span class="lines">@@ -186,7 +184,7 @@
</span><span class="cx">     default:
</span><span class="cx">         ASSERT_NOT_REACHED();
</span><span class="cx">     }
</span><del>-    return WebInputEvent::Undefined;
</del><ins>+    return TouchStart;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static inline PlatformTouchPoint::State toPlatformTouchPointState(const WebTouchPoint::State state)
</span><span class="lines">@@ -205,7 +203,7 @@
</span><span class="cx">     case WebTouchPoint::StateUndefined:
</span><span class="cx">         ASSERT_NOT_REACHED();
</span><span class="cx">     }
</span><del>-    return WebTouchPoint::StateUndefined;
</del><ins>+    return PlatformTouchPoint::TouchReleased;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> PlatformTouchPointBuilder::PlatformTouchPointBuilder(Widget* widget, const WebTouchPoint&amp; point)
</span></span></pre>
</div>
</div>

</body>
</html>