<!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>[56188] 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/56188">56188</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2010-03-18 13:42:11 -0700 (Thu, 18 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove Geolocation.lastPosition, no longer in the spec.
https://bugs.webkit.org/show_bug.cgi?id=36255
rdar://problem/7746357

Reviewed by Kenneth Rohde Christiansen.

* WebCore.base.exp: Updated since Geolocation's destructor is now non-virtual.

* page/Geolocation.cpp:
(WebCore::Geolocation::lastPosition): Add an assertion; it's only legal to
call this if access to the location is allowed.

* page/Geolocation.h: Removed unneeded includes. Made destructor non-virtual,
although it will still be virtual if any of the base classes have a virtual
destructor. Made lastPosition, isAllowed, and isDenied functions private.
Removed unused suspend, resume, setShouldClearCache, shouldClearCache,
and frame functions.

* page/Geolocation.idl: Removed lastPosition read-only attribute. No longer in
the Geolocation specification.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreWebCorebaseexp">trunk/WebCore/WebCore.base.exp</a></li>
<li><a href="#trunkWebCorepageGeolocationcpp">trunk/WebCore/page/Geolocation.cpp</a></li>
<li><a href="#trunkWebCorepageGeolocationh">trunk/WebCore/page/Geolocation.h</a></li>
<li><a href="#trunkWebCorepageGeolocationidl">trunk/WebCore/page/Geolocation.idl</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (56187 => 56188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2010-03-18 20:37:47 UTC (rev 56187)
+++ trunk/WebCore/ChangeLog        2010-03-18 20:42:11 UTC (rev 56188)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2010-03-18  Darin Adler  &lt;darin@apple.com&gt;
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Remove Geolocation.lastPosition, no longer in the spec.
+        https://bugs.webkit.org/show_bug.cgi?id=36255
+        rdar://problem/7746357
+
+        * WebCore.base.exp: Updated since Geolocation's destructor is now non-virtual.
+
+        * page/Geolocation.cpp:
+        (WebCore::Geolocation::lastPosition): Add an assertion; it's only legal to
+        call this if access to the location is allowed.
+
+        * page/Geolocation.h: Removed unneeded includes. Made destructor non-virtual,
+        although it will still be virtual if any of the base classes have a virtual
+        destructor. Made lastPosition, isAllowed, and isDenied functions private.
+        Removed unused suspend, resume, setShouldClearCache, shouldClearCache,
+        and frame functions.
+
+        * page/Geolocation.idl: Removed lastPosition read-only attribute. No longer in
+        the Geolocation specification.
+
</ins><span class="cx"> 2010-03-18  David Hyatt  &lt;hyatt@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Simon Fraser.
</span></span></pre></div>
<a id="trunkWebCoreWebCorebaseexp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCore.base.exp (56187 => 56188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCore.base.exp        2010-03-18 20:37:47 UTC (rev 56187)
+++ trunk/WebCore/WebCore.base.exp        2010-03-18 20:42:11 UTC (rev 56188)
</span><span class="lines">@@ -173,6 +173,7 @@
</span><span class="cx"> __ZN7WebCore11FrameLoader6reloadEb
</span><span class="cx"> __ZN7WebCore11FrameLoader7addDataEPKci
</span><span class="cx"> __ZN7WebCore11Geolocation12setIsAllowedEb
</span><ins>+__ZN7WebCore11GeolocationD1Ev
</ins><span class="cx"> __ZN7WebCore11HistoryItem10targetItemEv
</span><span class="cx"> __ZN7WebCore11HistoryItem11setReferrerERKNS_6StringE
</span><span class="cx"> __ZN7WebCore11HistoryItem12addChildItemEN3WTF10PassRefPtrIS0_EE
</span></span></pre></div>
<a id="trunkWebCorepageGeolocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/Geolocation.cpp (56187 => 56188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/Geolocation.cpp        2010-03-18 20:37:47 UTC (rev 56187)
+++ trunk/WebCore/page/Geolocation.cpp        2010-03-18 20:42:11 UTC (rev 56188)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include &quot;Geolocation.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #include &quot;Chrome.h&quot;
</span><del>-#include &quot;Document.h&quot;
</del><span class="cx"> #include &quot;Frame.h&quot;
</span><span class="cx"> #include &quot;Page.h&quot;
</span><span class="cx"> #include &lt;wtf/CurrentTime.h&gt;
</span><span class="lines">@@ -232,6 +231,8 @@
</span><span class="cx"> 
</span><span class="cx"> Geoposition* Geolocation::lastPosition()
</span><span class="cx"> {
</span><ins>+    ASSERT(isAllowed());
+
</ins><span class="cx"> #if ENABLE(CLIENT_BASED_GEOLOCATION)
</span><span class="cx">     if (!m_frame)
</span><span class="cx">         return 0;
</span><span class="lines">@@ -379,22 +380,6 @@
</span><span class="cx">         stopUpdating();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Geolocation::suspend()
-{
-#if !ENABLE(CLIENT_BASED_GEOLOCATION)
-    if (hasListeners())
-        m_service-&gt;suspend();
-#endif
-}
-
-void Geolocation::resume()
-{
-#if !ENABLE(CLIENT_BASED_GEOLOCATION)
-    if (hasListeners())
-        m_service-&gt;resume();
-#endif
-}
-
</del><span class="cx"> void Geolocation::setIsAllowed(bool allowed)
</span><span class="cx"> {
</span><span class="cx">     // This may be due to either a new position from the service, or a cached
</span></span></pre></div>
<a id="trunkWebCorepageGeolocationh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/Geolocation.h (56187 => 56188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/Geolocation.h        2010-03-18 20:37:47 UTC (rev 56187)
+++ trunk/WebCore/page/Geolocation.h        2010-03-18 20:42:11 UTC (rev 56188)
</span><span class="lines">@@ -35,13 +35,6 @@
</span><span class="cx"> #include &quot;PositionErrorCallback.h&quot;
</span><span class="cx"> #include &quot;PositionOptions.h&quot;
</span><span class="cx"> #include &quot;Timer.h&quot;
</span><del>-#include &lt;wtf/HashMap.h&gt;
-#include &lt;wtf/HashSet.h&gt;
-#include &lt;wtf/OwnPtr.h&gt;
-#include &lt;wtf/PassRefPtr.h&gt;
-#include &lt;wtf/RefCounted.h&gt;
-#include &lt;wtf/RefPtr.h&gt;
-#include &lt;wtf/Vector.h&gt;
</del><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="lines">@@ -60,26 +53,15 @@
</span><span class="cx"> public:
</span><span class="cx">     static PassRefPtr&lt;Geolocation&gt; create(Frame* frame) { return adoptRef(new Geolocation(frame)); }
</span><span class="cx"> 
</span><del>-    virtual ~Geolocation();
</del><ins>+    ~Geolocation();
</ins><span class="cx"> 
</span><span class="cx">     void disconnectFrame();
</span><span class="cx">     
</span><del>-    Geoposition* lastPosition();
-
</del><span class="cx">     void getCurrentPosition(PassRefPtr&lt;PositionCallback&gt;, PassRefPtr&lt;PositionErrorCallback&gt;, PassRefPtr&lt;PositionOptions&gt;);
</span><span class="cx">     int watchPosition(PassRefPtr&lt;PositionCallback&gt;, PassRefPtr&lt;PositionErrorCallback&gt;, PassRefPtr&lt;PositionOptions&gt;);
</span><span class="cx">     void clearWatch(int watchId);
</span><span class="cx"> 
</span><del>-    void suspend();
-    void resume();
-
</del><span class="cx">     void setIsAllowed(bool);
</span><del>-    bool isAllowed() const { return m_allowGeolocation == Yes; }
-    bool isDenied() const { return m_allowGeolocation == No; }
-    
-    void setShouldClearCache(bool shouldClearCache) { m_shouldClearCache = shouldClearCache; }
-    bool shouldClearCache() const { return m_shouldClearCache; }
-    Frame* frame() const { return m_frame; }
</del><span class="cx"> 
</span><span class="cx"> #if ENABLE(CLIENT_BASED_GEOLOCATION)
</span><span class="cx">     void setPosition(GeolocationPosition*);
</span><span class="lines">@@ -89,6 +71,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> private:
</span><ins>+    Geoposition* lastPosition();
+
+    bool isAllowed() const { return m_allowGeolocation == Yes; }
+    bool isDenied() const { return m_allowGeolocation == No; }
+    
</ins><span class="cx">     Geolocation(Frame*);
</span><span class="cx"> 
</span><span class="cx">     class GeoNotifier : public RefCounted&lt;GeoNotifier&gt; {
</span></span></pre></div>
<a id="trunkWebCorepageGeolocationidl"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/Geolocation.idl (56187 => 56188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/Geolocation.idl        2010-03-18 20:37:47 UTC (rev 56187)
+++ trunk/WebCore/page/Geolocation.idl        2010-03-18 20:42:11 UTC (rev 56188)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> module core {
</span><span class="cx"> 
</span><span class="cx">     interface [OmitConstructor] Geolocation {
</span><del>-        readonly attribute Geoposition lastPosition;
-
</del><span class="cx">         [Custom] void getCurrentPosition(in PositionCallback successCallback, in PositionErrorCallback errorCallback, in PositionOptions options);
</span><span class="cx"> 
</span><span class="cx">         [Custom] long watchPosition(in PositionCallback successCallback, in PositionErrorCallback errorCallback, in PositionOptions options);
</span></span></pre>
</div>
</div>

</body>
</html>