<!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>[38409] trunk/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/38409">38409</a></dd>
<dt>Author</dt> <dd>bolsinga@apple.com</dd>
<dt>Date</dt> <dd>2008-11-14 15:48:26 -0800 (Fri, 14 Nov 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>        Reviewed by Darin Adler.

        https://bugs.webkit.org/show_bug.cgi?id=22264
        Need to update to latest Geolocation spec (13 November 2008)
        
        Update to new error code constants and values.

        * page/Geolocation.cpp: Use new named ErrorCode enums
        (WebCore::Geolocation::GeoNotifier::timerFired):
        (WebCore::Geolocation::getCurrentPosition):
        (WebCore::Geolocation::watchPosition):
        * page/PositionError.h: Have ErrorCode enum names match new error constant names and values
        (WebCore::PositionError::):
        * page/PositionError.idl: Add new named error constants</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorepageGeolocationcpp">trunk/WebCore/page/Geolocation.cpp</a></li>
<li><a href="#trunkWebCorepagePositionErrorh">trunk/WebCore/page/PositionError.h</a></li>
<li><a href="#trunkWebCorepagePositionErroridl">trunk/WebCore/page/PositionError.idl</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (38408 => 38409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-11-14 23:37:50 UTC (rev 38408)
+++ trunk/WebCore/ChangeLog        2008-11-14 23:48:26 UTC (rev 38409)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2008-11-14  Greg Bolsinga  &lt;bolsinga@apple.com&gt;
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=22264
+        Need to update to latest Geolocation spec (13 November 2008)
+        
+        Update to new error code constants and values.
+
+        * page/Geolocation.cpp: Use new named ErrorCode enums
+        (WebCore::Geolocation::GeoNotifier::timerFired):
+        (WebCore::Geolocation::getCurrentPosition):
+        (WebCore::Geolocation::watchPosition):
+        * page/PositionError.h: Have ErrorCode enum names match new error constant names and values
+        (WebCore::PositionError::):
+        * page/PositionError.idl: Add new named error constants
+
</ins><span class="cx"> 2008-11-14  Beth Dakin  &lt;bdakin@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Justin Garcia.
</span></span></pre></div>
<a id="trunkWebCorepageGeolocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/Geolocation.cpp (38408 => 38409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/Geolocation.cpp        2008-11-14 23:37:50 UTC (rev 38408)
+++ trunk/WebCore/page/Geolocation.cpp        2008-11-14 23:48:26 UTC (rev 38409)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">     
</span><span class="cx">     m_timer.stop();
</span><span class="cx"> 
</span><del>-    RefPtr&lt;PositionError&gt; error = PositionError::create(PositionError::TIMEOUT_ERROR, &quot;Timed out&quot;);
</del><ins>+    RefPtr&lt;PositionError&gt; error = PositionError::create(PositionError::TIMEOUT, &quot;Timed out&quot;);
</ins><span class="cx">     m_errorCallback-&gt;handleEvent(error.get());
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> 
</span><span class="cx">     if (!m_service-&gt;startUpdating(options)) {
</span><span class="cx">         if (notifier-&gt;m_errorCallback) {
</span><del>-            RefPtr&lt;PositionError&gt; error = PositionError::create(PositionError::PERMISSION_ERROR, &quot;Unable to Start&quot;);
</del><ins>+            RefPtr&lt;PositionError&gt; error = PositionError::create(PositionError::PERMISSION_DENIED, &quot;Unable to Start&quot;);
</ins><span class="cx">             notifier-&gt;m_errorCallback-&gt;handleEvent(error.get());
</span><span class="cx">         }
</span><span class="cx">         return;
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> 
</span><span class="cx">     if (!m_service-&gt;startUpdating(options)) {
</span><span class="cx">         if (notifier-&gt;m_errorCallback) {
</span><del>-            RefPtr&lt;PositionError&gt; error = PositionError::create(PositionError::PERMISSION_ERROR, &quot;Unable to Start&quot;);
</del><ins>+            RefPtr&lt;PositionError&gt; error = PositionError::create(PositionError::PERMISSION_DENIED, &quot;Unable to Start&quot;);
</ins><span class="cx">             notifier-&gt;m_errorCallback-&gt;handleEvent(error.get());
</span><span class="cx">         }
</span><span class="cx">         return 0;
</span></span></pre></div>
<a id="trunkWebCorepagePositionErrorh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/PositionError.h (38408 => 38409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/PositionError.h        2008-11-14 23:37:50 UTC (rev 38408)
+++ trunk/WebCore/page/PositionError.h        2008-11-14 23:48:26 UTC (rev 38409)
</span><span class="lines">@@ -35,11 +35,10 @@
</span><span class="cx"> class PositionError : public RefCounted&lt;PositionError&gt; {
</span><span class="cx"> public:
</span><span class="cx">     enum ErrorCode {
</span><del>-        PERMISSION_ERROR = 1,
-        LOCATION_PROVIDER_ERROR,
-        POSITION_NOT_FOUND_ERROR,
-        TIMEOUT_ERROR,
-        UNKNOWN_ERROR
</del><ins>+        UNKNOWN_ERROR = 0,
+        PERMISSION_DENIED = 1,
+        POSITION_UNAVAILABLE = 2,
+        TIMEOUT = 3
</ins><span class="cx">     };
</span><span class="cx">     
</span><span class="cx">     static PassRefPtr&lt;PositionError&gt; create(ErrorCode code, const String&amp; message) { return adoptRef(new PositionError(code, message)); }
</span></span></pre></div>
<a id="trunkWebCorepagePositionErroridl"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/PositionError.idl (38408 => 38409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/PositionError.idl        2008-11-14 23:37:50 UTC (rev 38408)
+++ trunk/WebCore/page/PositionError.idl        2008-11-14 23:48:26 UTC (rev 38409)
</span><span class="lines">@@ -28,8 +28,13 @@
</span><span class="cx">     interface [
</span><span class="cx">         GenerateConstructor
</span><span class="cx">     ] PositionError {
</span><del>-        readonly attribute long code;
</del><ins>+        readonly attribute unsigned short code;
</ins><span class="cx">         readonly attribute DOMString message;
</span><ins>+
+        const unsigned short UNKNOWN_ERROR = 0;
+        const unsigned short PERMISSION_DENIED = 1;
+        const unsigned short POSITION_UNAVAILABLE = 2;
+        const unsigned short TIMEOUT = 3;
</ins><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>