<!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>[37842] trunk</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/37842">37842</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2008-10-24 00:39:15 -0700 (Fri, 24 Oct 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>Rolled out r37840 and r37841.

JavaScriptCore:

        Rolled out r37840.

        * wtf/Platform.h:

WebCore:

        Rolled out r37840 and r37841.

        * DerivedSources.make:
        * GNUmakefile.am:
        * WebCore.pro:
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * WebCoreSources.bkl:
        * bindings/js/JSCustomPositionCallback.cpp: Removed.
        * bindings/js/JSCustomPositionCallback.h: Removed.
        * bindings/js/JSCustomPositionErrorCallback.cpp: Removed.
        * bindings/js/JSCustomPositionErrorCallback.h: Removed.
        * bindings/js/JSDOMBinding.cpp:
        * bindings/js/JSDOMBinding.h:
        * bindings/js/JSDOMWindowCustom.cpp:
        (WebCore::markDOMObjectWrapper):
        * bindings/js/JSGeolocationCustom.cpp: Removed.
        * bindings/js/JSNavigatorCustom.cpp:
        * dom/Document.cpp:
        (WebCore::Document::Document):
        * dom/Document.h:
        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::canCachePage):
        * page/Geolocation.cpp: Removed.
        * page/Geolocation.h: Removed.
        * page/Geolocation.idl: Removed.
        * page/Geoposition.cpp: Removed.
        * page/Geoposition.h: Removed.
        * page/Geoposition.idl: Removed.
        * page/Navigator.cpp:
        (WebCore::Navigator::disconnectFrame):
        * page/Navigator.h:
        * page/Navigator.idl:
        * page/PositionCallback.h: Removed.
        * page/PositionCallback.idl: Removed.
        * page/PositionError.h: Removed.
        * page/PositionError.idl: Removed.
        * page/PositionErrorCallback.h: Removed.
        * page/PositionErrorCallback.idl: Removed.
        * page/PositionOptions.h: Removed.
        * page/PositionOptions.idl: Removed.
        * platform/GeolocationService.cpp: Removed.
        * platform/GeolocationService.h: Removed.

LayoutTests:

        Rolled out r37840.

        * geolocation/geolocation-not-implemented-expected.txt: Removed.
        * geolocation/geolocation-not-implemented.html: Removed.
        * geolocation/geolocation-test.js: Removed.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJavaScriptCoreChangeLog">trunk/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkJavaScriptCorewtfPlatformh">trunk/JavaScriptCore/wtf/Platform.h</a></li>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreDerivedSourcesmake">trunk/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkWebCoreGNUmakefileam">trunk/WebCore/GNUmakefile.am</a></li>
<li><a href="#trunkWebCoreWebCorepro">trunk/WebCore/WebCore.pro</a></li>
<li><a href="#trunkWebCoreWebCorevcprojWebCorevcproj">trunk/WebCore/WebCore.vcproj/WebCore.vcproj</a></li>
<li><a href="#trunkWebCoreWebCorexcodeprojprojectpbxproj">trunk/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkWebCoreWebCoreSourcesbkl">trunk/WebCore/WebCoreSources.bkl</a></li>
<li><a href="#trunkWebCorebindingsjsJSDOMBindingcpp">trunk/WebCore/bindings/js/JSDOMBinding.cpp</a></li>
<li><a href="#trunkWebCorebindingsjsJSDOMBindingh">trunk/WebCore/bindings/js/JSDOMBinding.h</a></li>
<li><a href="#trunkWebCorebindingsjsJSDOMWindowCustomcpp">trunk/WebCore/bindings/js/JSDOMWindowCustom.cpp</a></li>
<li><a href="#trunkWebCorebindingsjsJSNavigatorCustomcpp">trunk/WebCore/bindings/js/JSNavigatorCustom.cpp</a></li>
<li><a href="#trunkWebCoredomDocumentcpp">trunk/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkWebCoredomDocumenth">trunk/WebCore/dom/Document.h</a></li>
<li><a href="#trunkWebCoreloaderFrameLoadercpp">trunk/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkWebCorepageNavigatorcpp">trunk/WebCore/page/Navigator.cpp</a></li>
<li><a href="#trunkWebCorepageNavigatorh">trunk/WebCore/page/Navigator.h</a></li>
<li><a href="#trunkWebCorepageNavigatoridl">trunk/WebCore/page/Navigator.idl</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsgeolocationgeolocationnotimplementedexpectedtxt">trunk/LayoutTests/geolocation/geolocation-not-implemented-expected.txt</a></li>
<li><a href="#trunkLayoutTestsgeolocationgeolocationnotimplementedhtml">trunk/LayoutTests/geolocation/geolocation-not-implemented.html</a></li>
<li><a href="#trunkLayoutTestsgeolocationgeolocationtestjs">trunk/LayoutTests/geolocation/geolocation-test.js</a></li>
<li><a href="#trunkWebCorebindingsjsJSCustomPositionCallbackcpp">trunk/WebCore/bindings/js/JSCustomPositionCallback.cpp</a></li>
<li><a href="#trunkWebCorebindingsjsJSCustomPositionCallbackh">trunk/WebCore/bindings/js/JSCustomPositionCallback.h</a></li>
<li><a href="#trunkWebCorebindingsjsJSCustomPositionErrorCallbackcpp">trunk/WebCore/bindings/js/JSCustomPositionErrorCallback.cpp</a></li>
<li><a href="#trunkWebCorebindingsjsJSCustomPositionErrorCallbackh">trunk/WebCore/bindings/js/JSCustomPositionErrorCallback.h</a></li>
<li><a href="#trunkWebCorebindingsjsJSGeolocationCustomcpp">trunk/WebCore/bindings/js/JSGeolocationCustom.cpp</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>
<li><a href="#trunkWebCorepageGeopositioncpp">trunk/WebCore/page/Geoposition.cpp</a></li>
<li><a href="#trunkWebCorepageGeopositionh">trunk/WebCore/page/Geoposition.h</a></li>
<li><a href="#trunkWebCorepageGeopositionidl">trunk/WebCore/page/Geoposition.idl</a></li>
<li><a href="#trunkWebCorepagePositionCallbackh">trunk/WebCore/page/PositionCallback.h</a></li>
<li><a href="#trunkWebCorepagePositionCallbackidl">trunk/WebCore/page/PositionCallback.idl</a></li>
<li><a href="#trunkWebCorepagePositionErrorh">trunk/WebCore/page/PositionError.h</a></li>
<li><a href="#trunkWebCorepagePositionErroridl">trunk/WebCore/page/PositionError.idl</a></li>
<li><a href="#trunkWebCorepagePositionErrorCallbackh">trunk/WebCore/page/PositionErrorCallback.h</a></li>
<li><a href="#trunkWebCorepagePositionErrorCallbackidl">trunk/WebCore/page/PositionErrorCallback.idl</a></li>
<li><a href="#trunkWebCorepagePositionOptionsh">trunk/WebCore/page/PositionOptions.h</a></li>
<li><a href="#trunkWebCorepagePositionOptionsidl">trunk/WebCore/page/PositionOptions.idl</a></li>
<li><a href="#trunkWebCoreplatformGeolocationServicecpp">trunk/WebCore/platform/GeolocationService.cpp</a></li>
<li><a href="#trunkWebCoreplatformGeolocationServiceh">trunk/WebCore/platform/GeolocationService.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/ChangeLog (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/ChangeLog        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/JavaScriptCore/ChangeLog        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,3 +1,9 @@
</span><ins>+2008-10-24  David Kilzer  &lt;ddkilzer@apple.com&gt;
+
+        Rolled out r37840.
+
+        * wtf/Platform.h:
+
</ins><span class="cx"> 2008-10-23  Greg Bolsinga  &lt;bolsinga@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Sam Weinig.
</span></span></pre></div>
<a id="trunkJavaScriptCorewtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/wtf/Platform.h (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/wtf/Platform.h        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/JavaScriptCore/wtf/Platform.h        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -351,10 +351,6 @@
</span><span class="cx"> #define ENABLE_SAMPLING_TOOL 0
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if !defined(ENABLE_GEOLOCATION)
-#define ENABLE_GEOLOCATION 0
-#endif
-
</del><span class="cx"> // CTI only supports x86 at the moment, and has only been tested on Mac and Windows.
</span><span class="cx"> #if !defined(ENABLE_CTI) &amp;&amp; PLATFORM(X86) &amp;&amp; (PLATFORM(MAC) || PLATFORM(WIN))
</span><span class="cx"> #define ENABLE_CTI 1
</span></span></pre></div>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/LayoutTests/ChangeLog        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2008-10-24  David Kilzer  &lt;ddkilzer@apple.com&gt;
+
+        Rolled out r37840.
+
+        * geolocation/geolocation-not-implemented-expected.txt: Removed.
+        * geolocation/geolocation-not-implemented.html: Removed.
+        * geolocation/geolocation-test.js: Removed.
+
</ins><span class="cx"> 2008-10-23  Greg Bolsinga  &lt;bolsinga@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Sam Weinig.
</span></span></pre></div>
<a id="trunkLayoutTestsgeolocationgeolocationnotimplementedexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/geolocation/geolocation-not-implemented-expected.txt (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/geolocation/geolocation-not-implemented-expected.txt        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/LayoutTests/geolocation/geolocation-not-implemented-expected.txt        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,7 +0,0 @@
</span><del>-TEST(navigator.geolocation === undefined) OK
-TEST(navigator.geolocation == null) OK
-TEST(hasGeolocationProperty == false) OK
-TEST('geolocation' in navigator == false) OK
-TEST(navigator.hasOwnProperty('geolocation') == false) OK
-END OF TEST
-
</del></span></pre></div>
<a id="trunkLayoutTestsgeolocationgeolocationnotimplementedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/geolocation/geolocation-not-implemented.html (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/geolocation/geolocation-not-implemented.html        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/LayoutTests/geolocation/geolocation-not-implemented.html        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>-&lt;body&gt;&lt;/body&gt;
-&lt;script src=geolocation-test.js&gt;&lt;/script&gt;
-&lt;script&gt;
-test(&quot;navigator.geolocation === undefined&quot;);
-test(&quot;navigator.geolocation == null&quot;);
-var hasGeolocationProperty = false;
-for (var property in navigator) {
-    hasGeolocationProperty = (property == &quot;geolocation&quot;);
-    if (hasGeolocationProperty)
-        break;
-}
-test(&quot;hasGeolocationProperty == false&quot;);
-test(&quot;'geolocation' in navigator == false&quot;);
-test(&quot;navigator.hasOwnProperty('geolocation') == false&quot;);
-endTest();
-&lt;/script&gt;
</del></span></pre></div>
<a id="trunkLayoutTestsgeolocationgeolocationtestjs"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/geolocation/geolocation-test.js (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/geolocation/geolocation-test.js        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/LayoutTests/geolocation/geolocation-test.js        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,218 +0,0 @@
</span><del>-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
-}
-var watchID = -1;
-var passedPosition = null;
-var console = document.createElement('div');
-document.body.appendChild(console);
-
-function reset()
-{
-    if (window.layoutTestController) {
-        layoutTestController.notifyDone();  
-        watchID = -1;
-        passedPosition = null;
-    }
-}
-
-function hanged()
-{
-    consoleWrite(&quot;FAIL: timed out&quot;);
-    reset();
-}
-setTimeout(hanged, 10000);
-
-function testAndEnd(testFuncString)
-{
-    test(testFuncString, true);
-}
-
-function test(testFuncString, endit)
-{
-    if (eval(testFuncString))
-        consoleWrite(&quot;TEST(&quot; + testFuncString + &quot;) &lt;span style='color:green'&gt;OK&lt;/span&gt;&quot;);
-    else
-        consoleWrite(&quot;TEST(&quot; + testFuncString + &quot;) &lt;span style='color:red'&gt;FAIL&lt;/span&gt;&quot;);    
-
-    if (endit)
-        endTest();  
-}
-
-function testExpected(testFuncString, expected)
-{
-    try {
-        var observed = eval(testFuncString);
-    } catch (ex) {
-        consoleWrite(ex);
-        return;
-    }
-    
-    var msg = &quot;expected &quot; + testFuncString + &quot;=='&quot; + expected + &quot;', observed '&quot; + observed + &quot;'&quot;;
-
-    if (observed == expected)
-        consoleWrite(msg + &quot; - &lt;span style='color:green'&gt;OK&lt;/span&gt;&quot;);
-    else
-        consoleWrite(msg + &quot; - &lt;span style='color:red'&gt;FAIL&lt;/span&gt;&quot;);
-}
-
-function run(testFuncString)
-{
-    consoleWrite(&quot;RUN(&quot; + testFuncString + &quot;)&quot;);
-    try {
-        eval(testFuncString);
-    } catch (ex) {
-        consoleWrite(ex);
-    }
-}
-
-function watchPositionAndEnd(funcString)
-{
-    watchPosition(funcString, true)
-}
-
-function watchPosition(func, endit)
-{
-    function _positionCallback(position)
-    {        
-        passedPosition = position;
-        test(&quot;passedPosition == navigator.geolocation.lastPosition&quot;);
-        
-        consoleWrite(&quot;POSITION(&quot; + position + &quot;)&quot;);
-        
-        if (func)
-            func();
-        
-        if (endit)
-            endTest();    
-    }
-    
-    watchID = navigator.geolocation.watchPosition(_positionCallback);
-    test(&quot;watchID &gt; 0&quot;);
-}
-
-function watchPositionTestAndEnd(testFuncString)
-{
-    watchPositionAndTest(testFuncString, true);
-}
-
-function watchPositionAndFail()
-{
-    watchPositionAndTest(&quot;false&quot;, true);
-}
-
-function watchPositionAndTest(testFuncString, endit)
-{
-    function _positionCallback(position)
-    {
-        passedPosition = position;
-        
-        if (eval(testFuncString))
-            consoleWrite(&quot;POSITION(&quot; + position + &quot;) TEST(&quot; + testFuncString + &quot;) &lt;span style='color:green'&gt;OK&lt;/span&gt;&quot;);
-        else
-            consoleWrite(&quot;POSITION(&quot; + position + &quot;) TEST(&quot; + testFuncString + &quot;) &lt;span style='color:red'&gt;FAIL&lt;/span&gt;&quot;);
-
-        if (endit)
-            endTest();    
-    }
-    
-    watchID = navigator.geolocation.watchPosition(_positionCallback);
-    test(&quot;watchID &gt; 0&quot;);
-}
-
-function getCurrentPositionAndEnd(funcString)
-{
-    getCurrentPosition(funcString, true)
-}
-
-function getCurrentPosition(func, endit)
-{
-    function _positionCallback(position)
-    {        
-        passedPosition = position;
-        
-        consoleWrite(&quot;POSITION(&quot; + position + &quot;)&quot;);
-        
-        if (func)
-            func();
-        
-        if (endit)
-            endTest();    
-    }
-    
-    navigator.geolocation.getCurrentPosition(_positionCallback);
-}
-
-function getCurrentPositionTestAndEnd(testFuncString)
-{
-    getCurrentPositionAndTest(testFuncString, true);
-}
-
-function getCurrentPositionAndFail()
-{
-    getCurrentPositionAndTest(&quot;false&quot;, true);
-}
-
-function getCurrentPositionAndTest(testFuncString, endit)
-{
-    function _positionCallback(position)
-    {
-        passedPosition = position;
-        
-        if (eval(testFuncString))
-            consoleWrite(&quot;POSITION(&quot; + position + &quot;) TEST(&quot; + testFuncString + &quot;) &lt;span style='color:green'&gt;OK&lt;/span&gt;&quot;);
-        else
-            consoleWrite(&quot;POSITION(&quot; + position + &quot;) TEST(&quot; + testFuncString + &quot;) &lt;span style='color:red'&gt;FAIL&lt;/span&gt;&quot;);
-        
-        if (endit)
-            endTest();    
-    }
-    
-    navigator.geolocation.getCurrentPosition(_positionCallback);
-}
-
-function testException(testString, exceptionString)
-{
-    try {
-        eval(testString);
-    } catch (ex) { 
-        if (ex.code == eval(exceptionString))
-            consoleWrite(&quot;TEST(&quot; + testString + &quot;) THROWS(&quot;+exceptionString+&quot;) &lt;span style='color:green'&gt;OK&lt;/span&gt;&quot;);
-        else
-            consoleWrite(&quot;TEST(&quot; + testString + &quot;) THROWS(&quot;+exceptionString+&quot;) &lt;span style='color:red'&gt;FAIL&lt;/span&gt;&quot;);    
-    }
-}
-
-var testEnded = false;
-
-function endTest()
-{
-    consoleWrite(&quot;END OF TEST&quot;);
-    testEnded = true;
-    reset();
-}
-
-function endTestLater()
-{
-    setTimeout(endTest, 250);
-}
-
-function failTestIn(ms)
-{
-    setTimeout(function () {
-        consoleWrite(&quot;FAIL: did not end fast enough&quot;);
-        endTest();
-    }, ms);
-}
-
-function consoleWrite(text)
-{
-    if (testEnded)
-        return;
-    console.innerHTML += text + &quot;&lt;br&gt;&quot;;
-}
-
-function relativeURL(url)
-{
-    return url.substr(url.indexOf('/geolocation/')+13);
-}
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/ChangeLog        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,3 +1,49 @@
</span><ins>+2008-10-24  David Kilzer  &lt;ddkilzer@apple.com&gt;
+
+        Rolled out r37840 and r37841.
+
+        * DerivedSources.make:
+        * GNUmakefile.am:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * WebCoreSources.bkl:
+        * bindings/js/JSCustomPositionCallback.cpp: Removed.
+        * bindings/js/JSCustomPositionCallback.h: Removed.
+        * bindings/js/JSCustomPositionErrorCallback.cpp: Removed.
+        * bindings/js/JSCustomPositionErrorCallback.h: Removed.
+        * bindings/js/JSDOMBinding.cpp:
+        * bindings/js/JSDOMBinding.h:
+        * bindings/js/JSDOMWindowCustom.cpp:
+        (WebCore::markDOMObjectWrapper):
+        * bindings/js/JSGeolocationCustom.cpp: Removed.
+        * bindings/js/JSNavigatorCustom.cpp:
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        * dom/Document.h:
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::canCachePage):
+        * page/Geolocation.cpp: Removed.
+        * page/Geolocation.h: Removed.
+        * page/Geolocation.idl: Removed.
+        * page/Geoposition.cpp: Removed.
+        * page/Geoposition.h: Removed.
+        * page/Geoposition.idl: Removed.
+        * page/Navigator.cpp:
+        (WebCore::Navigator::disconnectFrame):
+        * page/Navigator.h:
+        * page/Navigator.idl:
+        * page/PositionCallback.h: Removed.
+        * page/PositionCallback.idl: Removed.
+        * page/PositionError.h: Removed.
+        * page/PositionError.idl: Removed.
+        * page/PositionErrorCallback.h: Removed.
+        * page/PositionErrorCallback.idl: Removed.
+        * page/PositionOptions.h: Removed.
+        * page/PositionOptions.idl: Removed.
+        * platform/GeolocationService.cpp: Removed.
+        * platform/GeolocationService.h: Removed.
+
</ins><span class="cx"> 2008-10-23  David Kilzer  &lt;ddkilzer@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Attempt to fix GTK build.
</span></span></pre></div>
<a id="trunkWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/DerivedSources.make (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/DerivedSources.make        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/DerivedSources.make        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -93,8 +93,6 @@
</span><span class="cx">     EventTargetNode \
</span><span class="cx">     File \
</span><span class="cx">     FileList \
</span><del>-    Geolocation \
-    Geoposition \
</del><span class="cx">     HTMLAnchorElement \
</span><span class="cx">     HTMLAppletElement \
</span><span class="cx">     HTMLAreaElement \
</span><span class="lines">@@ -182,10 +180,6 @@
</span><span class="cx">     OverflowEvent \
</span><span class="cx">     Plugin \
</span><span class="cx">     PluginArray \
</span><del>-    PositionCallback \
-    PositionError \
-    PositionErrorCallback \
-    PositionOptions \
</del><span class="cx">     ProcessingInstruction \
</span><span class="cx">     ProgressEvent \
</span><span class="cx">     RGBColor \
</span></span></pre></div>
<a id="trunkWebCoreGNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/GNUmakefile.am (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/GNUmakefile.am        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/GNUmakefile.am        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -209,15 +209,9 @@
</span><span class="cx">         WebCore/page/Console.idl \
</span><span class="cx">         WebCore/page/DOMSelection.idl \
</span><span class="cx">         WebCore/page/DOMWindow.idl \
</span><del>-        WebCore/page/Geolocation.idl \
-        WebCore/page/Geoposition.idl \
</del><span class="cx">         WebCore/page/History.idl \
</span><span class="cx">         WebCore/page/Location.idl \
</span><span class="cx">         WebCore/page/Navigator.idl \
</span><del>-        WebCore/page/PositionCallback.idl \
-        WebCore/page/PositionError.idl \
-        WebCore/page/PositionErrorCallback.idl \
-        WebCore/page/PositionOptions.idl \
</del><span class="cx">         WebCore/page/Screen.idl \
</span><span class="cx">         WebCore/plugins/MimeType.idl \
</span><span class="cx">         WebCore/plugins/MimeTypeArray.idl \
</span><span class="lines">@@ -331,10 +325,6 @@
</span><span class="cx">         WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp \
</span><span class="cx">         WebCore/bindings/js/JSClipboardCustom.cpp \
</span><span class="cx">         WebCore/bindings/js/JSConsoleCustom.cpp \
</span><del>-        WebCore/bindings/js/JSCustomPositionCallback.cpp \
-        WebCore/bindings/js/JSCustomPositionCallback.h \
-        WebCore/bindings/js/JSCustomPositionErrorCallback.cpp \
-        WebCore/bindings/js/JSCustomPositionErrorCallback.h \
</del><span class="cx">         WebCore/bindings/js/JSCustomVoidCallback.cpp \
</span><span class="cx">         WebCore/bindings/js/JSCustomVoidCallback.h \
</span><span class="cx">         WebCore/bindings/js/JSCustomXPathNSResolver.cpp \
</span><span class="lines">@@ -359,7 +349,6 @@
</span><span class="cx">         WebCore/bindings/js/JSEventTarget.h \
</span><span class="cx">         WebCore/bindings/js/JSEventTargetBase.h \
</span><span class="cx">         WebCore/bindings/js/JSEventTargetNodeCustom.cpp \
</span><del>-        WebCore/bindings/js/JSGeolocationCustom.cpp \
</del><span class="cx">         WebCore/bindings/js/JSHTMLAllCollection.cpp \
</span><span class="cx">         WebCore/bindings/js/JSHTMLAllCollection.h \
</span><span class="cx">         WebCore/bindings/js/JSHTMLAppletElementCustom.cpp \
</span><span class="lines">@@ -1201,10 +1190,6 @@
</span><span class="cx">         WebCore/page/FrameTree.h \
</span><span class="cx">         WebCore/page/FrameView.cpp \
</span><span class="cx">         WebCore/page/FrameView.h \
</span><del>-        WebCore/page/Geolocation.cpp \
-        WebCore/page/Geolocation.h \
-        WebCore/page/Geoposition.cpp \
-        WebCore/page/Geoposition.h \
</del><span class="cx">         WebCore/page/History.cpp \
</span><span class="cx">         WebCore/page/History.h \
</span><span class="cx">         WebCore/page/Location.cpp \
</span><span class="lines">@@ -1217,10 +1202,6 @@
</span><span class="cx">         WebCore/page/Page.h \
</span><span class="cx">         WebCore/page/PageGroup.cpp \
</span><span class="cx">         WebCore/page/PageGroup.h \
</span><del>-        WebCore/page/PositionCallback.h \
-        WebCore/page/PositionError.h \
-        WebCore/page/PositionErrorCallback.h \
-        WebCore/page/PositionOptions.h \
</del><span class="cx">         WebCore/page/PrintContext.cpp \
</span><span class="cx">         WebCore/page/PrintContext.h \
</span><span class="cx">         WebCore/page/Screen.cpp \
</span><span class="lines">@@ -1266,8 +1247,6 @@
</span><span class="cx">         WebCore/platform/FileChooser.h \
</span><span class="cx">         WebCore/platform/FileSystem.h \
</span><span class="cx">         WebCore/platform/FloatConversion.h \
</span><del>-        WebCore/platform/GeolocationService.cpp \
-        WebCore/platform/GeolocationService.h \
</del><span class="cx">         WebCore/platform/HostWindow.h \
</span><span class="cx">         WebCore/platform/KURL.cpp \
</span><span class="cx">         WebCore/platform/KURL.h \
</span></span></pre></div>
<a id="trunkWebCoreWebCorepro"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCore.pro (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCore.pro        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/WebCore.pro        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -777,8 +777,6 @@
</span><span class="cx">     page/Frame.cpp \
</span><span class="cx">     page/FrameTree.cpp \
</span><span class="cx">     page/FrameView.cpp \
</span><del>-    page/Geolocation.cpp \
-    page/Geoposition.cpp \
</del><span class="cx">     page/History.cpp \
</span><span class="cx">     page/Location.cpp \
</span><span class="cx">     page/MouseEventWithHitTestResults.cpp \
</span><span class="lines">@@ -806,7 +804,6 @@
</span><span class="cx">     platform/DragData.cpp \
</span><span class="cx">     platform/DragImage.cpp \
</span><span class="cx">     platform/FileChooser.cpp \
</span><del>-    platform/GeolocationService.cpp \
</del><span class="cx">     platform/graphics/FontDescription.cpp \
</span><span class="cx">     platform/graphics/FontFamily.cpp \
</span><span class="cx">     platform/graphics/AffineTransform.cpp \
</span><span class="lines">@@ -1202,10 +1199,7 @@
</span><span class="cx">         bindings/js/JSCustomSQLTransactionErrorCallback.cpp \
</span><span class="cx">         bindings/js/JSDatabaseCustom.cpp \
</span><span class="cx">         bindings/js/JSSQLResultSetRowListCustom.cpp \
</span><del>-        bindings/js/JSSQLTransactionCustom.cpp \
-        bindings/js/JSGeolocationCustom.cpp \
-        bindings/js/JSCustomPositionCallback.cpp \
-        bindings/js/JSCustomPositionErrorCallback.cpp
</del><ins>+        bindings/js/JSSQLTransactionCustom.cpp
</ins><span class="cx"> 
</span><span class="cx">     IDL_BINDINGS += \
</span><span class="cx">         storage/Database.idl \
</span></span></pre></div>
<a id="trunkWebCoreWebCorevcprojWebCorevcproj"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCore.vcproj/WebCore.vcproj (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCore.vcproj/WebCore.vcproj        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/WebCore.vcproj/WebCore.vcproj        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -680,14 +680,6 @@
</span><span class="cx">                                 &gt;
</span><span class="cx">                         &lt;/File&gt;
</span><span class="cx">                         &lt;File
</span><del>-                                RelativePath=&quot;$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSGeolocation.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSGeoposition.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
</del><span class="cx">                                 RelativePath=&quot;$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSEvent.h&quot;
</span><span class="cx">                                 &gt;
</span><span class="cx">                         &lt;/File&gt;
</span><span class="lines">@@ -1048,14 +1040,6 @@
</span><span class="cx">                                 &gt;
</span><span class="cx">                         &lt;/File&gt;
</span><span class="cx">                         &lt;File
</span><del>-                                RelativePath=&quot;$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSPositionError.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSPositionOptions.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
</del><span class="cx">                                 RelativePath=&quot;$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSOverflowEvent.h&quot;
</span><span class="cx">                                 &gt;
</span><span class="cx">                         &lt;/File&gt;
</span><span class="lines">@@ -2276,38 +2260,6 @@
</span><span class="cx">                                 &gt;
</span><span class="cx">                         &lt;/File&gt;
</span><span class="cx">                         &lt;File
</span><del>-                                RelativePath=&quot;..\page\Geolocation.cpp&quot;
-                                &gt;
-                                &lt;FileConfiguration
-                                        Name=&quot;Release_PGO|Win32&quot;
-                                        &gt;
-                                        &lt;Tool
-                                                Name=&quot;VCCLCompilerTool&quot;
-                                                WholeProgramOptimization=&quot;true&quot;
-                                        /&gt;
-                                &lt;/FileConfiguration&gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\page\Geolocation.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\page\Geoposition.cpp&quot;
-                                &gt;
-                                &lt;FileConfiguration
-                                        Name=&quot;Release_PGO|Win32&quot;
-                                        &gt;
-                                        &lt;Tool
-                                                Name=&quot;VCCLCompilerTool&quot;
-                                                WholeProgramOptimization=&quot;true&quot;
-                                        /&gt;
-                                &lt;/FileConfiguration&gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\page\Geoposition.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
</del><span class="cx">                                 RelativePath=&quot;..\page\History.cpp&quot;
</span><span class="cx">                                 &gt;
</span><span class="cx">                                 &lt;FileConfiguration
</span><span class="lines">@@ -2436,22 +2388,6 @@
</span><span class="cx">                                 &gt;
</span><span class="cx">                         &lt;/File&gt;
</span><span class="cx">                         &lt;File
</span><del>-                                RelativePath=&quot;..\page\PositionCallback.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\page\PositionError.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\page\PositionErrorCallback.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\page\PositionOptions.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
</del><span class="cx">                                 RelativePath=&quot;..\page\Screen.cpp&quot;
</span><span class="cx">                                 &gt;
</span><span class="cx">                                 &lt;FileConfiguration
</span><span class="lines">@@ -3104,14 +3040,6 @@
</span><span class="cx">                                 &gt;
</span><span class="cx">                         &lt;/File&gt;
</span><span class="cx">                         &lt;File
</span><del>-                                RelativePath=&quot;..\platform\GeolocationService.cpp&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\platform\GeolocationService.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
</del><span class="cx">                                 RelativePath=&quot;..\platform\HostWindow.h&quot;
</span><span class="cx">                                 &gt;
</span><span class="cx">                         &lt;/File&gt;
</span><span class="lines">@@ -13273,14 +13201,6 @@
</span><span class="cx">                                         &gt;
</span><span class="cx">                                 &lt;/File&gt;
</span><span class="cx">                                 &lt;File
</span><del>-                                        RelativePath=&quot;..\bindings\js\JSCustomPositionCallback.cpp&quot;
-                                        &gt;
-                                &lt;/File&gt;
-                                &lt;File
-                                        RelativePath=&quot;..\bindings\js\JSCustomPositionErrorCallback.cpp&quot;
-                                        &gt;
-                                &lt;/File&gt;
-                                &lt;File
</del><span class="cx">                                         RelativePath=&quot;..\bindings\js\JSCustomSQLStatementCallback.cpp&quot;
</span><span class="cx">                                         &gt;
</span><span class="cx">                                 &lt;/File&gt;
</span><span class="lines">@@ -13417,10 +13337,6 @@
</span><span class="cx">                                         &gt;
</span><span class="cx">                                 &lt;/File&gt;
</span><span class="cx">                                 &lt;File
</span><del>-                                        RelativePath=&quot;..\bindings\js\JSGeolocationCustom.cpp&quot;
-                                        &gt;
-                                &lt;/File&gt;
-                                &lt;File
</del><span class="cx">                                         RelativePath=&quot;..\bindings\js\JSHistoryCustom.cpp&quot;
</span><span class="cx">                                         &gt;
</span><span class="cx">                                 &lt;/File&gt;
</span></span></pre></div>
<a id="trunkWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCore.xcodeproj/project.pbxproj (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCore.xcodeproj/project.pbxproj        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/WebCore.xcodeproj/project.pbxproj        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -4238,29 +4238,6 @@
</span><span class="cx">                 F916C48D0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F916C48B0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.cpp */; };
</span><span class="cx">                 F916C48E0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F916C48C0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h */; };
</span><span class="cx">                 F9F0ED7A0DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F9F0ED770DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h */; };
</span><del>-                FE80D7A70E9C1ED2000D6F75 /* JSCustomPositionCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80D7A20E9C1ED2000D6F75 /* JSCustomPositionCallback.cpp */; };
-                FE80D7A80E9C1ED2000D6F75 /* JSCustomPositionCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7A30E9C1ED2000D6F75 /* JSCustomPositionCallback.h */; };
-                FE80D7A90E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80D7A40E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.cpp */; };
-                FE80D7AA0E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7A50E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.h */; };
-                FE80D7AB0E9C1ED2000D6F75 /* JSGeolocationCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80D7A60E9C1ED2000D6F75 /* JSGeolocationCustom.cpp */; };
-                FE80D7C50E9C1F25000D6F75 /* Geolocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80D7B70E9C1F25000D6F75 /* Geolocation.cpp */; };
-                FE80D7C60E9C1F25000D6F75 /* Geolocation.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7B80E9C1F25000D6F75 /* Geolocation.h */; settings = {ATTRIBUTES = (); }; };
-                FE80D7C80E9C1F25000D6F75 /* Geoposition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80D7BA0E9C1F25000D6F75 /* Geoposition.cpp */; };
-                FE80D7C90E9C1F25000D6F75 /* Geoposition.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7BB0E9C1F25000D6F75 /* Geoposition.h */; };
-                FE80D7CB0E9C1F25000D6F75 /* PositionCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7BD0E9C1F25000D6F75 /* PositionCallback.h */; };
-                FE80D7CD0E9C1F25000D6F75 /* PositionError.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7BF0E9C1F25000D6F75 /* PositionError.h */; };
-                FE80D7CF0E9C1F25000D6F75 /* PositionErrorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7C10E9C1F25000D6F75 /* PositionErrorCallback.h */; };
-                FE80D7D10E9C1F25000D6F75 /* PositionOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7C30E9C1F25000D6F75 /* PositionOptions.h */; };
-                FE80DA630E9C4703000D6F75 /* JSGeolocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80DA5F0E9C4703000D6F75 /* JSGeolocation.cpp */; };
-                FE80DA640E9C4703000D6F75 /* JSGeolocation.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80DA600E9C4703000D6F75 /* JSGeolocation.h */; };
-                FE80DA650E9C4703000D6F75 /* JSGeoposition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80DA610E9C4703000D6F75 /* JSGeoposition.cpp */; };
-                FE80DA660E9C4703000D6F75 /* JSGeoposition.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80DA620E9C4703000D6F75 /* JSGeoposition.h */; };
-                FE80DA710E9C472F000D6F75 /* JSPositionError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80DA6D0E9C472F000D6F75 /* JSPositionError.cpp */; };
-                FE80DA720E9C472F000D6F75 /* JSPositionError.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80DA6E0E9C472F000D6F75 /* JSPositionError.h */; };
-                FE80DA730E9C472F000D6F75 /* JSPositionOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80DA6F0E9C472F000D6F75 /* JSPositionOptions.cpp */; };
-                FE80DA740E9C472F000D6F75 /* JSPositionOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80DA700E9C472F000D6F75 /* JSPositionOptions.h */; };
-                FEAB90120EA51B9C006348C3 /* GeolocationService.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEAB90100EA51B9C006348C3 /* GeolocationService.cpp */; };
-                FEAB90130EA51B9C006348C3 /* GeolocationService.h in Headers */ = {isa = PBXBuildFile; fileRef = FEAB90110EA51B9C006348C3 /* GeolocationService.h */; };
</del><span class="cx"> /* End PBXBuildFile section */
</span><span class="cx"> 
</span><span class="cx"> /* Begin PBXContainerItemProxy section */
</span><span class="lines">@@ -8894,35 +8871,6 @@
</span><span class="cx">                 F9F0ED770DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = XMLHttpRequestProgressEvent.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 F9F0ED780DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = XMLHttpRequestProgressEvent.idl; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 FE49EF970DC51462004266E1 /* DashboardSupportCSSPropertyNames.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DashboardSupportCSSPropertyNames.in; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><del>-                FE80D7A20E9C1ED2000D6F75 /* JSCustomPositionCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCustomPositionCallback.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80D7A30E9C1ED2000D6F75 /* JSCustomPositionCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCustomPositionCallback.h; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80D7A40E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCustomPositionErrorCallback.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80D7A50E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCustomPositionErrorCallback.h; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80D7A60E9C1ED2000D6F75 /* JSGeolocationCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGeolocationCustom.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80D7B70E9C1F25000D6F75 /* Geolocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Geolocation.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80D7B80E9C1F25000D6F75 /* Geolocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Geolocation.h; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80D7B90E9C1F25000D6F75 /* Geolocation.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Geolocation.idl; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80D7BA0E9C1F25000D6F75 /* Geoposition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Geoposition.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80D7BB0E9C1F25000D6F75 /* Geoposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Geoposition.h; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80D7BC0E9C1F25000D6F75 /* Geoposition.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Geoposition.idl; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80D7BD0E9C1F25000D6F75 /* PositionCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PositionCallback.h; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80D7BE0E9C1F25000D6F75 /* PositionCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PositionCallback.idl; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80D7BF0E9C1F25000D6F75 /* PositionError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PositionError.h; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80D7C00E9C1F25000D6F75 /* PositionError.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PositionError.idl; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80D7C10E9C1F25000D6F75 /* PositionErrorCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PositionErrorCallback.h; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80D7C20E9C1F25000D6F75 /* PositionErrorCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PositionErrorCallback.idl; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80D7C30E9C1F25000D6F75 /* PositionOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PositionOptions.h; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80D7C40E9C1F25000D6F75 /* PositionOptions.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PositionOptions.idl; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80DA5F0E9C4703000D6F75 /* JSGeolocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGeolocation.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80DA600E9C4703000D6F75 /* JSGeolocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSGeolocation.h; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80DA610E9C4703000D6F75 /* JSGeoposition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGeoposition.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80DA620E9C4703000D6F75 /* JSGeoposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSGeoposition.h; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80DA6D0E9C472F000D6F75 /* JSPositionError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPositionError.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80DA6E0E9C472F000D6F75 /* JSPositionError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPositionError.h; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80DA6F0E9C472F000D6F75 /* JSPositionOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPositionOptions.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FE80DA700E9C472F000D6F75 /* JSPositionOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPositionOptions.h; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FEAB90100EA51B9C006348C3 /* GeolocationService.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeolocationService.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
-                FEAB90110EA51B9C006348C3 /* GeolocationService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationService.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</del><span class="cx"> /* End PBXFileReference section */
</span><span class="cx"> 
</span><span class="cx"> /* Begin PBXFrameworksBuildPhase section */
</span><span class="lines">@@ -9675,12 +9623,6 @@
</span><span class="cx">                                 65A21483097A3F5300B9050A /* FrameTree.h */,
</span><span class="cx">                                 65CBFEF70974F607001DAC25 /* FrameView.cpp */,
</span><span class="cx">                                 65CBFEF80974F607001DAC25 /* FrameView.h */,
</span><del>-                                FE80D7B70E9C1F25000D6F75 /* Geolocation.cpp */,
-                                FE80D7B80E9C1F25000D6F75 /* Geolocation.h */,
-                                FE80D7B90E9C1F25000D6F75 /* Geolocation.idl */,
-                                FE80D7BA0E9C1F25000D6F75 /* Geoposition.cpp */,
-                                FE80D7BB0E9C1F25000D6F75 /* Geoposition.h */,
-                                FE80D7BC0E9C1F25000D6F75 /* Geoposition.idl */,
</del><span class="cx">                                 BC94D1500C275C8B006BC617 /* History.cpp */,
</span><span class="cx">                                 BC94D1510C275C8B006BC617 /* History.h */,
</span><span class="cx">                                 BC94D1520C275C8B006BC617 /* History.idl */,
</span><span class="lines">@@ -9696,14 +9638,6 @@
</span><span class="cx">                                 65A21467097A329100B9050A /* Page.h */,
</span><span class="cx">                                 9302B0BC0D79F82900C7EE83 /* PageGroup.cpp */,
</span><span class="cx">                                 9302B0BE0D79F82C00C7EE83 /* PageGroup.h */,
</span><del>-                                FE80D7BD0E9C1F25000D6F75 /* PositionCallback.h */,
-                                FE80D7BE0E9C1F25000D6F75 /* PositionCallback.idl */,
-                                FE80D7BF0E9C1F25000D6F75 /* PositionError.h */,
-                                FE80D7C00E9C1F25000D6F75 /* PositionError.idl */,
-                                FE80D7C10E9C1F25000D6F75 /* PositionErrorCallback.h */,
-                                FE80D7C20E9C1F25000D6F75 /* PositionErrorCallback.idl */,
-                                FE80D7C30E9C1F25000D6F75 /* PositionOptions.h */,
-                                FE80D7C40E9C1F25000D6F75 /* PositionOptions.idl */,
</del><span class="cx">                                 BCEC01BA0C274DAC009F4EC9 /* Screen.cpp */,
</span><span class="cx">                                 BCEC01BB0C274DAC009F4EC9 /* Screen.h */,
</span><span class="cx">                                 BCEC01BC0C274DAC009F4EC9 /* Screen.idl */,
</span><span class="lines">@@ -11867,10 +11801,6 @@
</span><span class="cx">                                 65DF322E09D1DDBC000BE325 /* JSEntity.h */,
</span><span class="cx">                                 93F9B7720BA5FDDC00854064 /* JSEntityReference.cpp */,
</span><span class="cx">                                 93F9B7730BA5FDDC00854064 /* JSEntityReference.h */,
</span><del>-                                FE80DA5F0E9C4703000D6F75 /* JSGeolocation.cpp */,
-                                FE80DA600E9C4703000D6F75 /* JSGeolocation.h */,
-                                FE80DA610E9C4703000D6F75 /* JSGeoposition.cpp */,
-                                FE80DA620E9C4703000D6F75 /* JSGeoposition.h */,
</del><span class="cx">                                 BCD9C2BC0C17B69E005C90A2 /* JSNamedNodeMap.cpp */,
</span><span class="cx">                                 BCD9C2BD0C17B69E005C90A2 /* JSNamedNodeMap.h */,
</span><span class="cx">                                 14DC0D3509FED073007B0235 /* JSNode.cpp */,
</span><span class="lines">@@ -11879,10 +11809,6 @@
</span><span class="cx">                                 BCD9C2BF0C17B69E005C90A2 /* JSNodeList.h */,
</span><span class="cx">                                 65DF31E909D1CC60000BE325 /* JSNotation.cpp */,
</span><span class="cx">                                 65DF31EA09D1CC60000BE325 /* JSNotation.h */,
</span><del>-                                FE80DA6D0E9C472F000D6F75 /* JSPositionError.cpp */,
-                                FE80DA6E0E9C472F000D6F75 /* JSPositionError.h */,
-                                FE80DA6F0E9C472F000D6F75 /* JSPositionOptions.cpp */,
-                                FE80DA700E9C472F000D6F75 /* JSPositionOptions.h */,
</del><span class="cx">                                 65DF31EB09D1CC60000BE325 /* JSProcessingInstruction.cpp */,
</span><span class="cx">                                 65DF31EC09D1CC60000BE325 /* JSProcessingInstruction.h */,
</span><span class="cx">                                 E4B423850CBFB73C00AF2ECE /* JSProgressEvent.cpp */,
</span><span class="lines">@@ -12949,10 +12875,6 @@
</span><span class="cx">                                 BC46C1ED0C0DDBDF0020CFC3 /* JSCSSRuleCustom.cpp */,
</span><span class="cx">                                 BC5825F20C0B89380053F1B5 /* JSCSSStyleDeclarationCustom.cpp */,
</span><span class="cx">                                 BC20FB7E0C0E8E6C00D1447F /* JSCSSValueCustom.cpp */,
</span><del>-                                FE80D7A20E9C1ED2000D6F75 /* JSCustomPositionCallback.cpp */,
-                                FE80D7A30E9C1ED2000D6F75 /* JSCustomPositionCallback.h */,
-                                FE80D7A40E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.cpp */,
-                                FE80D7A50E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.h */,
</del><span class="cx">                                 51EC925B0CE90DD400F90308 /* JSCustomSQLStatementCallback.cpp */,
</span><span class="cx">                                 51EC925C0CE90DD400F90308 /* JSCustomSQLStatementCallback.h */,
</span><span class="cx">                                 51EC925D0CE90DD400F90308 /* JSCustomSQLStatementErrorCallback.cpp */,
</span><span class="lines">@@ -12975,7 +12897,6 @@
</span><span class="cx">                                 BC2ED5540C6B9BD300920BFF /* JSElementCustom.cpp */,
</span><span class="cx">                                 BCEFAF4D0C317E6900FA81F6 /* JSEventCustom.cpp */,
</span><span class="cx">                                 BC3B7B200E91AAF400D54065 /* JSEventTargetNodeCustom.cpp */,
</span><del>-                                FE80D7A60E9C1ED2000D6F75 /* JSGeolocationCustom.cpp */,
</del><span class="cx">                                 BCE7B1920D4E86960075A539 /* JSHistoryCustom.cpp */,
</span><span class="cx">                                 BC4EDEF30C08F3FB007EDD49 /* JSHTMLAppletElementCustom.cpp */,
</span><span class="cx">                                 BCCBAD3A0C18BFF800CE890F /* JSHTMLCollectionCustom.cpp */,
</span><span class="lines">@@ -13286,8 +13207,6 @@
</span><span class="cx">                                 066C772A0AB603B700238CC4 /* FileChooser.h */,
</span><span class="cx">                                 514B3F720C722047000530DF /* FileSystem.h */,
</span><span class="cx">                                 BC073BA90C399B1F000F5979 /* FloatConversion.h */,
</span><del>-                                FEAB90100EA51B9C006348C3 /* GeolocationService.cpp */,
-                                FEAB90110EA51B9C006348C3 /* GeolocationService.h */,
</del><span class="cx">                                 BC3BC29B0E91AB0F00835588 /* HostWindow.h */,
</span><span class="cx">                                 6593923509AE4346002C531F /* KURL.cpp */,
</span><span class="cx">                                 6593923609AE4346002C531F /* KURL.h */,
</span><span class="lines">@@ -16122,18 +16041,6 @@
</span><span class="cx">                                 1C81BA0C0E97348300266E07 /* JavaScriptDebugListener.h in Headers */,
</span><span class="cx">                                 1C81BA0E0E97348300266E07 /* JavaScriptDebugServer.h in Headers */,
</span><span class="cx">                                 BC3BE12B0E98092F00835588 /* PopupMenuStyle.h in Headers */,
</span><del>-                                FE80D7A80E9C1ED2000D6F75 /* JSCustomPositionCallback.h in Headers */,
-                                FE80D7AA0E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.h in Headers */,
-                                FE80D7C60E9C1F25000D6F75 /* Geolocation.h in Headers */,
-                                FE80D7C90E9C1F25000D6F75 /* Geoposition.h in Headers */,
-                                FE80D7CB0E9C1F25000D6F75 /* PositionCallback.h in Headers */,
-                                FE80D7CD0E9C1F25000D6F75 /* PositionError.h in Headers */,
-                                FE80D7CF0E9C1F25000D6F75 /* PositionErrorCallback.h in Headers */,
-                                FE80D7D10E9C1F25000D6F75 /* PositionOptions.h in Headers */,
-                                FE80DA640E9C4703000D6F75 /* JSGeolocation.h in Headers */,
-                                FE80DA660E9C4703000D6F75 /* JSGeoposition.h in Headers */,
-                                FE80DA720E9C472F000D6F75 /* JSPositionError.h in Headers */,
-                                FE80DA740E9C472F000D6F75 /* JSPositionOptions.h in Headers */,
</del><span class="cx">                                 BC3BE9940E9C1C7C00835588 /* RenderScrollbar.h in Headers */,
</span><span class="cx">                                 BC3BE9950E9C1C7C00835588 /* RenderScrollbarPart.h in Headers */,
</span><span class="cx">                                 BC3BE9990E9C1E5D00835588 /* RenderScrollbarTheme.h in Headers */,
</span><span class="lines">@@ -16145,7 +16052,6 @@
</span><span class="cx">                                 BCE659A90EA927B9007E4533 /* ThemeTypes.h in Headers */,
</span><span class="cx">                                 BCE659E60EA92FB2007E4533 /* ThemeMac.h in Headers */,
</span><span class="cx">                                 E1C4DE690EA75C1E0023CCD6 /* ActiveDOMObject.h in Headers */,
</span><del>-                                FEAB90130EA51B9C006348C3 /* GeolocationService.h in Headers */,
</del><span class="cx">                                 BCE65BEB0EACDF16007E4533 /* Length.h in Headers */,
</span><span class="cx">                                 BCFF64910EAD15C200C1D6F7 /* LengthBox.h in Headers */,
</span><span class="cx">                                 BCFF64920EAD15C200C1D6F7 /* LengthSize.h in Headers */,
</span><span class="lines">@@ -18014,15 +17920,6 @@
</span><span class="cx">                                 1C81BA020E9733CB00266E07 /* JavaScriptProfile.cpp in Sources */,
</span><span class="cx">                                 1C81BA090E97348300266E07 /* JavaScriptCallFrame.cpp in Sources */,
</span><span class="cx">                                 1C81BA0D0E97348300266E07 /* JavaScriptDebugServer.cpp in Sources */,
</span><del>-                                FE80D7A70E9C1ED2000D6F75 /* JSCustomPositionCallback.cpp in Sources */,
-                                FE80D7A90E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.cpp in Sources */,
-                                FE80D7AB0E9C1ED2000D6F75 /* JSGeolocationCustom.cpp in Sources */,
-                                FE80D7C50E9C1F25000D6F75 /* Geolocation.cpp in Sources */,
-                                FE80D7C80E9C1F25000D6F75 /* Geoposition.cpp in Sources */,
-                                FE80DA630E9C4703000D6F75 /* JSGeolocation.cpp in Sources */,
-                                FE80DA650E9C4703000D6F75 /* JSGeoposition.cpp in Sources */,
-                                FE80DA710E9C472F000D6F75 /* JSPositionError.cpp in Sources */,
-                                FE80DA730E9C472F000D6F75 /* JSPositionOptions.cpp in Sources */,
</del><span class="cx">                                 BC3BE9930E9C1C7C00835588 /* RenderScrollbar.cpp in Sources */,
</span><span class="cx">                                 BC3BE9A50E9C239600835588 /* RenderScrollbarTheme.cpp in Sources */,
</span><span class="cx">                                 BC3BE9AB0E9C242000835588 /* RenderScrollbarPart.cpp in Sources */,
</span><span class="lines">@@ -18031,7 +17928,6 @@
</span><span class="cx">                                 939B02EE0EA2DBC400C54570 /* WidthIterator.cpp in Sources */,
</span><span class="cx">                                 BCE659E90EA92FFA007E4533 /* ThemeMac.mm in Sources */,
</span><span class="cx">                                 E1C4DE6E0EA75C650023CCD6 /* ActiveDOMObject.cpp in Sources */,
</span><del>-                                FEAB90120EA51B9C006348C3 /* GeolocationService.cpp in Sources */,
</del><span class="cx">                                 BCE65BEA0EACDF16007E4533 /* Length.cpp in Sources */,
</span><span class="cx">                                 BCE65D320EAD1211007E4533 /* Theme.cpp in Sources */,
</span><span class="cx">                                 E1C36CBD0EB08062007410BC /* JSDOMGlobalObject.cpp in Sources */,
</span></span></pre></div>
<a id="trunkWebCoreWebCoreSourcesbkl"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCoreSources.bkl (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCoreSources.bkl        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/WebCoreSources.bkl        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -42,8 +42,6 @@
</span><span class="cx">         bindings/js/JSCSSRuleCustom.cpp
</span><span class="cx">         bindings/js/JSCSSStyleDeclarationCustom.cpp
</span><span class="cx">         bindings/js/JSCSSValueCustom.cpp
</span><del>-        bindings/js/JSCustomPositionCallback.cpp
-        bindings/js/JSCustomPositionErrorCallback.cpp
</del><span class="cx">         bindings/js/JSCustomSQLStatementCallback.cpp
</span><span class="cx">         bindings/js/JSCustomSQLStatementErrorCallback.cpp
</span><span class="cx">         bindings/js/JSCustomSQLTransactionCallback.cpp
</span><span class="lines">@@ -62,7 +60,6 @@
</span><span class="cx">         bindings/js/JSEventCustom.cpp
</span><span class="cx">         bindings/js/JSEventTarget.cpp
</span><span class="cx">         bindings/js/JSEventTargetNodeCustom.cpp
</span><del>-        bindings/js/JSGeolocationCustom.cpp
</del><span class="cx">         bindings/js/JSHTMLAllCollection.cpp
</span><span class="cx">         bindings/js/JSHistoryCustom.cpp
</span><span class="cx">         bindings/js/JSHTMLAppletElementCustom.cpp
</span><span class="lines">@@ -242,8 +239,6 @@
</span><span class="cx">         DerivedSources/WebCore/JSEventTargetNode.cpp
</span><span class="cx">         DerivedSources/WebCore/JSFile.cpp
</span><span class="cx">         DerivedSources/WebCore/JSFileList.cpp
</span><del>-        DerivedSources/WebCore/JSGeolocation.cpp
-        DerivedSources/WebCore/JSGeoposition.cpp
</del><span class="cx">         DerivedSources/WebCore/JSHTMLAnchorElement.cpp
</span><span class="cx">         DerivedSources/WebCore/JSHTMLAppletElement.cpp
</span><span class="cx">         DerivedSources/WebCore/JSHTMLAreaElement.cpp
</span><span class="lines">@@ -328,8 +323,6 @@
</span><span class="cx">         DerivedSources/WebCore/JSOverflowEvent.cpp
</span><span class="cx">         DerivedSources/WebCore/JSPlugin.cpp
</span><span class="cx">         DerivedSources/WebCore/JSPluginArray.cpp
</span><del>-        DerivedSources/WebCore/JSPositionError.cpp
-        DerivedSources/WebCore/JSPositionOptions.cpp
</del><span class="cx">         DerivedSources/WebCore/JSProcessingInstruction.cpp
</span><span class="cx">         DerivedSources/WebCore/JSProgressEvent.cpp
</span><span class="cx">         DerivedSources/WebCore/JSRange.cpp
</span><span class="lines">@@ -677,8 +670,6 @@
</span><span class="cx">         page/Frame.cpp
</span><span class="cx">         page/FrameTree.cpp
</span><span class="cx">         page/FrameView.cpp
</span><del>-        page/Geolocation.cpp
-        page/Geoposition.cpp
</del><span class="cx">         page/History.cpp
</span><span class="cx">         page/Location.cpp
</span><span class="cx">         page/MouseEventWithHitTestResults.cpp
</span><span class="lines">@@ -702,7 +693,6 @@
</span><span class="cx">         platform/DeprecatedValueListImpl.cpp
</span><span class="cx">         platform/DragImage.cpp
</span><span class="cx">         platform/FileChooser.cpp
</span><del>-        platform/GeolocationService.cpp
</del><span class="cx">         platform/graphics/Font.cpp
</span><span class="cx">         platform/graphics/FontCache.cpp
</span><span class="cx">         platform/graphics/FontData.cpp
</span></span></pre></div>
<a id="trunkWebCorebindingsjsJSCustomPositionCallbackcpp"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/bindings/js/JSCustomPositionCallback.cpp (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSCustomPositionCallback.cpp        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/bindings/js/JSCustomPositionCallback.cpp        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,87 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include &quot;config.h&quot;
-#include &quot;JSCustomPositionCallback.h&quot;
-
-#include &quot;Console.h&quot;
-#include &quot;CString.h&quot;
-#include &quot;Frame.h&quot;
-#include &quot;JSGeoposition.h&quot;
-#include &quot;Page.h&quot;
-#include &quot;ScriptController.h&quot;
-#include &lt;kjs/JSLock.h&gt;
-
-namespace WebCore {
-
-using namespace JSC;
-
-JSCustomPositionCallback::JSCustomPositionCallback(JSObject* callback, Frame* frame)
-    : m_callback(callback)
-    , m_frame(frame)
-{
-}
-
-void JSCustomPositionCallback::handleEvent(Geoposition* geoposition, bool&amp; raisedException)
-{
-    ASSERT(m_callback);
-    ASSERT(m_frame);
-    
-    if (!m_frame-&gt;script()-&gt;isEnabled())
-        return;
-    
-    JSGlobalObject* globalObject = m_frame-&gt;script()-&gt;globalObject();
-    ExecState* exec = globalObject-&gt;globalExec();
-    
-    JSC::JSLock lock(false);
-    
-    JSValuePtr function = m_callback-&gt;get(exec, Identifier(exec, &quot;handleEvent&quot;));
-    CallData callData;
-    CallType callType = function-&gt;getCallData(callData);
-    if (callType == CallTypeNone) {
-        callType = m_callback-&gt;getCallData(callData);
-        if (callType == CallTypeNone) {
-            // FIXME: Should an exception be thrown here?
-            return;
-        }
-        function = m_callback;
-    }
-    
-    RefPtr&lt;JSCustomPositionCallback&gt; protect(this);
-    
-    ArgList args;
-    args.append(toJS(exec, geoposition));
-    
-    globalObject-&gt;startTimeoutCheck();
-    call(exec, function, callType, callData, m_callback, args);
-    globalObject-&gt;stopTimeoutCheck();
-    
-    if (exec-&gt;hadException()) {
-        m_frame-&gt;domWindow()-&gt;console()-&gt;reportCurrentException(exec);
-        raisedException = true;
-    }
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkWebCorebindingsjsJSCustomPositionCallbackh"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/bindings/js/JSCustomPositionCallback.h (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSCustomPositionCallback.h        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/bindings/js/JSCustomPositionCallback.h        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef JSCustomPositionCallback_h
-#define JSCustomPositionCallback_h
-
-#include &quot;PositionCallback.h&quot;
-#include &lt;kjs/JSObject.h&gt;
-#include &lt;kjs/protect.h&gt;
-#include &lt;wtf/Forward.h&gt;
-
-namespace JSC {
-    class JSObject;
-}
-
-namespace WebCore {
-
-class Frame;
-class Geoposition;
-
-class JSCustomPositionCallback : public PositionCallback {
-public:
-    static PassRefPtr&lt;JSCustomPositionCallback&gt; create(JSC::JSObject* callback, Frame* frame) { return adoptRef(new JSCustomPositionCallback(callback, frame)); }
-    
-    virtual void handleEvent(Geoposition*, bool&amp; raisedException);
-
-private:
-    JSCustomPositionCallback(JSC::JSObject* callback, Frame*);
-
-    JSC::ProtectedPtr&lt;JSC::JSObject&gt; m_callback;
-    RefPtr&lt;Frame&gt; m_frame;
-};
-    
-} // namespace WebCore
-
-#endif // JSCustomPositionCallback_h
</del></span></pre></div>
<a id="trunkWebCorebindingsjsJSCustomPositionErrorCallbackcpp"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/bindings/js/JSCustomPositionErrorCallback.cpp (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSCustomPositionErrorCallback.cpp        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/bindings/js/JSCustomPositionErrorCallback.cpp        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,85 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include &quot;config.h&quot;
-#include &quot;JSCustomPositionErrorCallback.h&quot;
-
-#include &quot;Console.h&quot;
-#include &quot;CString.h&quot;
-#include &quot;Frame.h&quot;
-#include &quot;JSPositionError.h&quot;
-#include &quot;Page.h&quot;
-#include &quot;ScriptController.h&quot;
-#include &lt;kjs/JSLock.h&gt;
-
-namespace WebCore {
-    
-using namespace JSC;
-
-JSCustomPositionErrorCallback::JSCustomPositionErrorCallback(JSObject* callback, Frame* frame)
-    : m_callback(callback)
-    , m_frame(frame)
-{
-}
-
-void JSCustomPositionErrorCallback::handleEvent(PositionError* positionError)
-{
-    ASSERT(m_callback);
-    ASSERT(m_frame);
-    
-    if (!m_frame-&gt;script()-&gt;isEnabled())
-        return;
-    
-    JSGlobalObject* globalObject = m_frame-&gt;script()-&gt;globalObject();
-    ExecState* exec = globalObject-&gt;globalExec();
-    
-    JSC::JSLock lock(false);
-    
-    JSValuePtr function = m_callback-&gt;get(exec, Identifier(exec, &quot;handleEvent&quot;));
-    CallData callData;
-    CallType callType = function-&gt;getCallData(callData);
-    if (callType == CallTypeNone) {
-        callType = m_callback-&gt;getCallData(callData);
-        if (callType == CallTypeNone) {
-            // FIXME: Should an exception be thrown here?
-            return;
-        }
-        function = m_callback;
-    }
-    
-    RefPtr&lt;JSCustomPositionErrorCallback&gt; protect(this);
-    
-    ArgList args;
-    args.append(toJS(exec, positionError));
-    
-    globalObject-&gt;startTimeoutCheck();
-    call(exec, function, callType, callData, m_callback, args);
-    globalObject-&gt;stopTimeoutCheck();
-    
-    if (exec-&gt;hadException())
-        m_frame-&gt;domWindow()-&gt;console()-&gt;reportCurrentException(exec);
-}
-    
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkWebCorebindingsjsJSCustomPositionErrorCallbackh"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/bindings/js/JSCustomPositionErrorCallback.h (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSCustomPositionErrorCallback.h        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/bindings/js/JSCustomPositionErrorCallback.h        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef JSCustomPositionErrorCallback_h
-#define JSCustomPositionErrorCallback_h
-
-#include &quot;PositionErrorCallback.h&quot;
-#include &lt;kjs/JSObject.h&gt;
-#include &lt;kjs/protect.h&gt;
-#include &lt;wtf/Forward.h&gt;
-
-namespace JSC {
-    class JSObject;
-}
-
-namespace WebCore {
-    
-class Frame;
-class PositionError;
-
-class JSCustomPositionErrorCallback : public PositionErrorCallback {
-public:
-    static PassRefPtr&lt;JSCustomPositionErrorCallback&gt; create(JSC::JSObject* callback, Frame* frame) { return adoptRef(new JSCustomPositionErrorCallback(callback, frame)); }
-    
-    virtual void handleEvent(PositionError*);
-
-private:
-    JSCustomPositionErrorCallback(JSC::JSObject* callback, Frame*);
-
-    JSC::ProtectedPtr&lt;JSC::JSObject&gt; m_callback;
-    RefPtr&lt;Frame&gt; m_frame;
-};
-    
-} // namespace WebCore
-
-#endif // JSCustomPositionErrorCallback_h
</del></span></pre></div>
<a id="trunkWebCorebindingsjsJSDOMBindingcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSDOMBinding.cpp (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSDOMBinding.cpp        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/bindings/js/JSDOMBinding.cpp        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -353,16 +353,6 @@
</span><span class="cx">     addWrapper(wrapper);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void markDOMObjectWrapper(JSGlobalData&amp; globalData, void* object)
-{
-    if (!object)
-        return;
-    DOMObject* wrapper = getCachedDOMObjectWrapper(globalData, object);
-    if (!wrapper || wrapper-&gt;marked())
-        return;
-    wrapper-&gt;mark();
-}
-
</del><span class="cx"> JSValuePtr jsStringOrNull(ExecState* exec, const String&amp; s)
</span><span class="cx"> {
</span><span class="cx">     if (s.isNull())
</span></span></pre></div>
<a id="trunkWebCorebindingsjsJSDOMBindingh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSDOMBinding.h (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSDOMBinding.h        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/bindings/js/JSDOMBinding.h        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -69,7 +69,6 @@
</span><span class="cx">     void updateDOMNodeDocument(Node*, Document* oldDocument, Document* newDocument);
</span><span class="cx">     void markDOMNodesForDocument(Document*);
</span><span class="cx">     void markActiveObjectsForDocument(JSC::JSGlobalData&amp;, Document*);
</span><del>-    void markDOMObjectWrapper(JSC::JSGlobalData&amp; globalData, void* object);
</del><span class="cx">     void markCrossHeapDependentObjectsForDocument(JSC::JSGlobalData&amp;, Document*);
</span><span class="cx"> 
</span><span class="cx">     JSC::StructureID* getCachedDOMStructure(JSC::ExecState*, const JSC::ClassInfo*);
</span></span></pre></div>
<a id="trunkWebCorebindingsjsJSDOMWindowCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSDOMWindowCustom.cpp (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSDOMWindowCustom.cpp        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/bindings/js/JSDOMWindowCustom.cpp        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -41,6 +41,16 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><ins>+static void markDOMObjectWrapper(JSGlobalData&amp; globalData, void* object)
+{
+    if (!object)
+        return;
+    DOMObject* wrapper = getCachedDOMObjectWrapper(globalData, object);
+    if (!wrapper || wrapper-&gt;marked())
+        return;
+    wrapper-&gt;mark();
+}
+
</ins><span class="cx"> void JSDOMWindow::mark()
</span><span class="cx"> {
</span><span class="cx">     Base::mark();
</span></span></pre></div>
<a id="trunkWebCorebindingsjsJSGeolocationCustomcpp"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/bindings/js/JSGeolocationCustom.cpp (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSGeolocationCustom.cpp        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/bindings/js/JSGeolocationCustom.cpp        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,113 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include &quot;config.h&quot;
-#include &quot;JSGeolocation.h&quot;
-
-#include &quot;DOMWindow.h&quot;
-#include &quot;ExceptionCode.h&quot;
-#include &quot;Geolocation.h&quot;
-#include &quot;GeolocationService.h&quot;
-#include &quot;JSCustomPositionCallback.h&quot;
-#include &quot;JSCustomPositionErrorCallback.h&quot;
-#include &quot;JSDOMWindow.h&quot;
-#include &quot;JSPositionOptions.h&quot;
-
-using namespace JSC;
-
-namespace WebCore {
-
-JSValuePtr JSGeolocation::getCurrentPosition(ExecState* exec, const ArgList&amp; args)
-{
-    // Arguments: PositionCallback, (optional)PositionErrorCallback, (optional)PositionOptions
-    RefPtr&lt;PositionCallback&gt; positionCallback;
-    JSObject* object = args.at(exec, 0)-&gt;getObject();
-    if (exec-&gt;hadException())
-        return jsUndefined();
-    if (!object) {
-        setDOMException(exec, TYPE_MISMATCH_ERR);
-        return jsUndefined();
-    }
-
-    if (Frame* frame = toJSDOMWindow(exec-&gt;lexicalGlobalObject())-&gt;impl()-&gt;frame())
-        positionCallback = JSCustomPositionCallback::create(object, frame);
-    
-    RefPtr&lt;PositionErrorCallback&gt; positionErrorCallback;
-    if (!args.at(exec, 1)-&gt;isUndefinedOrNull()) {
-        JSObject* object = args.at(exec, 1)-&gt;getObject();
-        if (!object) {
-            setDOMException(exec, TYPE_MISMATCH_ERR);
-            return jsUndefined();
-        }
-
-        if (Frame* frame = toJSDOMWindow(exec-&gt;lexicalGlobalObject())-&gt;impl()-&gt;frame())
-            positionErrorCallback = JSCustomPositionErrorCallback::create(object, frame);
-    }
-    
-    RefPtr&lt;PositionOptions&gt; positionOptions;
-    if (!args.at(exec, 2)-&gt;isUndefinedOrNull())
-        positionOptions = toPositionOptions(args.at(exec, 2));
-    
-    m_impl-&gt;getCurrentPosition(positionCallback.release(), positionErrorCallback.release(), positionOptions.get());
-    
-    return jsUndefined();
-}
-
-JSValuePtr JSGeolocation::watchPosition(ExecState* exec, const ArgList&amp; args)
-{
-    // Arguments: PositionCallback, (optional)PositionErrorCallback, (optional)PositionOptions
-    RefPtr&lt;PositionCallback&gt; positionCallback;
-    JSObject* object = args.at(exec, 0)-&gt;getObject();
-    if (exec-&gt;hadException())
-        return jsUndefined();
-    if (!object) {
-        setDOMException(exec, TYPE_MISMATCH_ERR);
-        return jsUndefined();
-    }
-    
-    if (Frame* frame = toJSDOMWindow(exec-&gt;lexicalGlobalObject())-&gt;impl()-&gt;frame())
-        positionCallback = JSCustomPositionCallback::create(object, frame);
-    
-    RefPtr&lt;PositionErrorCallback&gt; positionErrorCallback;
-    if (!args.at(exec, 1)-&gt;isUndefinedOrNull()) {
-        JSObject* object = args.at(exec, 1)-&gt;getObject();
-        if (!object) {
-            setDOMException(exec, TYPE_MISMATCH_ERR);
-            return jsUndefined();
-        }
-        
-        if (Frame* frame = toJSDOMWindow(exec-&gt;lexicalGlobalObject())-&gt;impl()-&gt;frame())
-            positionErrorCallback = JSCustomPositionErrorCallback::create(object, frame);
-    }
-    
-    RefPtr&lt;PositionOptions&gt; positionOptions;
-    if (!args.at(exec, 2)-&gt;isUndefinedOrNull())
-        positionOptions = toPositionOptions(args.at(exec, 2));
-    
-    int watchID = m_impl-&gt;watchPosition(positionCallback.release(), positionErrorCallback.release(), positionOptions.get());
-    return jsNumber(exec, watchID);
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkWebCorebindingsjsJSNavigatorCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSNavigatorCustom.cpp (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSNavigatorCustom.cpp        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/bindings/js/JSNavigatorCustom.cpp        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -113,13 +113,4 @@
</span><span class="cx">     return jsString(exec, imp-&gt;appVersion());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void JSNavigator::mark()
-{
-    Base::mark();
-
-    JSGlobalData&amp; globalData = *Heap::heap(this)-&gt;globalData();
-
-    markDOMObjectWrapper(globalData, impl()-&gt;optionalGeolocation());
</del><span class="cx"> }
</span><del>-
-}
</del></span></pre></div>
<a id="trunkWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/dom/Document.cpp (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/dom/Document.cpp        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/dom/Document.cpp        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -316,7 +316,6 @@
</span><span class="cx"> #if ENABLE(DATABASE)
</span><span class="cx">     , m_hasOpenDatabases(false)
</span><span class="cx"> #endif
</span><del>-    , m_usingGeolocation(false)
</del><span class="cx"> #if USE(LOW_BANDWIDTH_DISPLAY)
</span><span class="cx">     , m_inLowBandwidthDisplay(false)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/dom/Document.h (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/dom/Document.h        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/dom/Document.h        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -998,10 +998,6 @@
</span><span class="cx">     bool hasOpenDatabases() { return m_hasOpenDatabases; }
</span><span class="cx">     void stopDatabases();
</span><span class="cx"> #endif
</span><del>-    
-    void setUsingGeolocation(bool f) { m_usingGeolocation = f; }
-    bool usingGeolocation() const { return m_usingGeolocation; };
-    
</del><span class="cx"> protected:
</span><span class="cx">     void clearXMLVersion() { m_xmlVersion = String(); }
</span><span class="cx"> 
</span><span class="lines">@@ -1078,8 +1074,6 @@
</span><span class="cx">     typedef HashSet&lt;Database*&gt; DatabaseSet;
</span><span class="cx">     OwnPtr&lt;DatabaseSet&gt; m_openDatabaseSet;
</span><span class="cx"> #endif
</span><del>-    
-    bool m_usingGeolocation;
</del><span class="cx"> 
</span><span class="cx"> #if USE(LOW_BANDWIDTH_DISPLAY)
</span><span class="cx">     bool m_inLowBandwidthDisplay;
</span></span></pre></div>
<a id="trunkWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/FrameLoader.cpp (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/FrameLoader.cpp        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/loader/FrameLoader.cpp        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1915,7 +1915,6 @@
</span><span class="cx"> #if ENABLE(DATABASE)
</span><span class="cx">         &amp;&amp; !m_frame-&gt;document()-&gt;hasOpenDatabases()
</span><span class="cx"> #endif
</span><del>-        &amp;&amp; !m_frame-&gt;document()-&gt;usingGeolocation()
</del><span class="cx">         &amp;&amp; m_frame-&gt;page()
</span><span class="cx">         &amp;&amp; m_frame-&gt;page()-&gt;backForwardList()-&gt;enabled()
</span><span class="cx">         &amp;&amp; m_frame-&gt;page()-&gt;backForwardList()-&gt;capacity() &gt; 0
</span></span></pre></div>
<a id="trunkWebCorepageGeolocationcpp"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/page/Geolocation.cpp (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/Geolocation.cpp        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/page/Geolocation.cpp        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,213 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include &quot;config.h&quot;
-#include &quot;Geolocation.h&quot;
-
-#include &quot;Document.h&quot;
-#include &quot;Frame.h&quot;
-#include &quot;PositionError.h&quot;
-
-namespace WebCore {
-
-Geolocation::GeoNotifier::GeoNotifier(PassRefPtr&lt;PositionCallback&gt; successCallback, PassRefPtr&lt;PositionErrorCallback&gt; errorCallback, PositionOptions* options)
-    : m_successCallback(successCallback)
-    , m_errorCallback(errorCallback)
-    , m_timer(this, &amp;Geolocation::GeoNotifier::timerFired)
-{
-    if (m_errorCallback &amp;&amp; options &amp;&amp; options-&gt;timeout() != -1)
-        m_timer.startOneShot(options-&gt;timeout() / 1000.0);
-}
-
-void Geolocation::GeoNotifier::timerFired(Timer&lt;GeoNotifier&gt;*)
-{
-    ASSERT(m_errorCallback);
-    
-    m_timer.stop();
-
-    RefPtr&lt;PositionError&gt; error = PositionError::create(PositionError::TIMEOUT_ERROR, &quot;Timed out&quot;);
-    m_errorCallback-&gt;handleEvent(error.get());
-}
-
-Geolocation::Geolocation(Frame* frame)
-    : m_frame(frame)
-    , m_service(GeolocationService::create(this))
-{
-    ASSERT(m_frame-&gt;document());
-    m_frame-&gt;document()-&gt;setUsingGeolocation(true);
-}
-
-void Geolocation::disconnectFrame()
-{
-    m_service-&gt;stopUpdating();
-    if (m_frame-&gt;document())
-        m_frame-&gt;document()-&gt;setUsingGeolocation(false);
-    m_frame = 0;
-}
-
-void Geolocation::getCurrentPosition(PassRefPtr&lt;PositionCallback&gt; successCallback, PassRefPtr&lt;PositionErrorCallback&gt; errorCallback, PositionOptions* options)
-{
-    RefPtr&lt;GeoNotifier&gt; notifier = GeoNotifier::create(successCallback, errorCallback, options);
-
-    if (!m_service-&gt;startUpdating(options)) {
-        if (notifier-&gt;m_errorCallback) {
-            RefPtr&lt;PositionError&gt; error = PositionError::create(PositionError::PERMISSION_ERROR, &quot;Unable to Start&quot;);
-            notifier-&gt;m_errorCallback-&gt;handleEvent(error.get());
-        }
-        return;
-    }
-
-    m_oneShots.add(notifier);
-}
-
-int Geolocation::watchPosition(PassRefPtr&lt;PositionCallback&gt; successCallback, PassRefPtr&lt;PositionErrorCallback&gt; errorCallback, PositionOptions* options)
-{
-    RefPtr&lt;GeoNotifier&gt; notifier = GeoNotifier::create(successCallback, errorCallback, options);
-
-    if (!m_service-&gt;startUpdating(options)) {
-        if (notifier-&gt;m_errorCallback) {
-            RefPtr&lt;PositionError&gt; error = PositionError::create(PositionError::PERMISSION_ERROR, &quot;Unable to Start&quot;);
-            notifier-&gt;m_errorCallback-&gt;handleEvent(error.get());
-        }
-        return 0;
-    }
-    
-    static int sIdentifier = 0;
-    
-    m_watchers.set(++sIdentifier, notifier);
-
-    return sIdentifier;
-}
-
-void Geolocation::clearWatch(int watchId)
-{
-    m_watchers.remove(watchId);
-    
-    stopUpdatingIfEmpty();
-}
-
-void Geolocation::stopUpdatingIfEmpty()
-{
-    if (m_watchers.isEmpty() &amp;&amp; m_oneShots.isEmpty())
-        m_service-&gt;stopUpdating();
-}
-
-void Geolocation::sendErrorToOneShots(PositionError* error)
-{
-    Vector&lt;RefPtr&lt;GeoNotifier&gt; &gt; copy;
-    copyToVector(m_oneShots, copy);
-
-    Vector&lt;RefPtr&lt;GeoNotifier&gt; &gt;::const_iterator end = copy.end();
-    for (Vector&lt;RefPtr&lt;GeoNotifier&gt; &gt;::const_iterator it = copy.begin(); it != end; ++it) {
-        RefPtr&lt;GeoNotifier&gt; notifier = *it;
-        
-        if (notifier-&gt;m_errorCallback)
-            notifier-&gt;m_errorCallback-&gt;handleEvent(error);
-    }
-}
-
-void Geolocation::sendErrorToWatchers(PositionError* error)
-{
-    Vector&lt;RefPtr&lt;GeoNotifier&gt; &gt; copy;
-    copyValuesToVector(m_watchers, copy);
-
-    Vector&lt;RefPtr&lt;GeoNotifier&gt; &gt;::const_iterator end = copy.end();
-    for (Vector&lt;RefPtr&lt;GeoNotifier&gt; &gt;::const_iterator it = copy.begin(); it != end; ++it) {
-        RefPtr&lt;GeoNotifier&gt; notifier = *it;
-        
-        if (notifier-&gt;m_errorCallback)
-            notifier-&gt;m_errorCallback-&gt;handleEvent(error);
-    }
-}
-
-void Geolocation::sendPositionToOneShots(Geoposition* position)
-{
-    Vector&lt;RefPtr&lt;GeoNotifier&gt; &gt; copy;
-    copyToVector(m_oneShots, copy);
-    
-    Vector&lt;RefPtr&lt;GeoNotifier&gt; &gt;::const_iterator end = copy.end();
-    for (Vector&lt;RefPtr&lt;GeoNotifier&gt; &gt;::const_iterator it = copy.begin(); it != end; ++it) {
-        RefPtr&lt;GeoNotifier&gt; notifier = *it;
-        ASSERT(notifier-&gt;m_successCallback);
-        
-        notifier-&gt;m_timer.stop();
-        bool shouldCallErrorCallback = false;
-        notifier-&gt;m_successCallback-&gt;handleEvent(position, shouldCallErrorCallback);
-        if (shouldCallErrorCallback) {
-            RefPtr&lt;PositionError&gt; error = PositionError::create(PositionError::UNKNOWN_ERROR, &quot;An exception was thrown&quot;);
-            handleError(error.get());
-        }
-    }
-}
-
-void Geolocation::sendPositionToWatchers(Geoposition* position)
-{
-    Vector&lt;RefPtr&lt;GeoNotifier&gt; &gt; copy;
-    copyValuesToVector(m_watchers, copy);
-    
-    Vector&lt;RefPtr&lt;GeoNotifier&gt; &gt;::const_iterator end = copy.end();
-    for (Vector&lt;RefPtr&lt;GeoNotifier&gt; &gt;::const_iterator it = copy.begin(); it != end; ++it) {
-        RefPtr&lt;GeoNotifier&gt; notifier = *it;
-        ASSERT(notifier-&gt;m_successCallback);
-        
-        notifier-&gt;m_timer.stop();
-        bool shouldCallErrorCallback = false;
-        notifier-&gt;m_successCallback-&gt;handleEvent(position, shouldCallErrorCallback);
-        if (shouldCallErrorCallback) {
-            RefPtr&lt;PositionError&gt; error = PositionError::create(PositionError::UNKNOWN_ERROR, &quot;An exception was thrown&quot;);
-            handleError(error.get());
-        }
-    }
-}
-
-void Geolocation::handleError(PositionError* error)
-{
-    ASSERT(error);
-    
-    sendErrorToOneShots(error);    
-    sendErrorToWatchers(error);
-
-    m_oneShots.clear();
-}
-
-void Geolocation::geolocationServicePositionChanged(GeolocationService* service)
-{
-    ASSERT(service-&gt;lastPosition());
-    
-    sendPositionToOneShots(service-&gt;lastPosition());
-    sendPositionToWatchers(service-&gt;lastPosition());
-        
-    m_oneShots.clear();
-    stopUpdatingIfEmpty();
-}
-
-void Geolocation::geolocationServiceErrorOccurred(GeolocationService* service)
-{
-    ASSERT(service-&gt;lastError());
-    
-    handleError(service-&gt;lastError());
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkWebCorepageGeolocationh"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/page/Geolocation.h (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/Geolocation.h        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/page/Geolocation.h        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,101 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef Geolocation_h
-#define Geolocation_h
-
-#include &quot;GeolocationService.h&quot;
-#include &quot;PositionCallback.h&quot;
-#include &quot;PositionErrorCallback.h&quot;
-#include &quot;PositionOptions.h&quot;
-#include &quot;Timer.h&quot;
-#include &lt;wtf/Platform.h&gt;
-#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;
-
-namespace WebCore {
-
-class Frame;
-class Geoposition;
-
-class Geolocation : public RefCounted&lt;Geolocation&gt;, public GeolocationServiceClient {
-public:
-    static PassRefPtr&lt;Geolocation&gt; create(Frame* frame) { return adoptRef(new Geolocation(frame)); }
-
-    virtual ~Geolocation() {}
-
-    void disconnectFrame();
-    
-    Geoposition* lastPosition() const { return m_service-&gt;lastPosition(); }
-
-    void getCurrentPosition(PassRefPtr&lt;PositionCallback&gt;, PassRefPtr&lt;PositionErrorCallback&gt;, PositionOptions*);
-    int watchPosition(PassRefPtr&lt;PositionCallback&gt;, PassRefPtr&lt;PositionErrorCallback&gt;, PositionOptions*);
-    void clearWatch(int watchId);
-
-private:
-    Geolocation(Frame*);
-
-    class GeoNotifier : public RefCounted&lt;GeoNotifier&gt; {
-    public:
-        static PassRefPtr&lt;GeoNotifier&gt; create(PassRefPtr&lt;PositionCallback&gt; positionCallback, PassRefPtr&lt;PositionErrorCallback&gt; positionErrorCallback, PositionOptions* options) { return adoptRef(new GeoNotifier(positionCallback, positionErrorCallback, options)); }
-        
-        void timerFired(Timer&lt;GeoNotifier&gt;*);
-        
-        RefPtr&lt;PositionCallback&gt; m_successCallback;
-        RefPtr&lt;PositionErrorCallback&gt; m_errorCallback;
-        Timer&lt;GeoNotifier&gt; m_timer;
-
-    private:
-        GeoNotifier(PassRefPtr&lt;PositionCallback&gt;, PassRefPtr&lt;PositionErrorCallback&gt;, PositionOptions*);
-    };
-    
-    void stopUpdatingIfEmpty();
-
-    void sendErrorToOneShots(PositionError*);
-    void sendErrorToWatchers(PositionError*);
-    void sendPositionToOneShots(Geoposition*);
-    void sendPositionToWatchers(Geoposition*);
-    
-    void handleError(PositionError*);
-    
-    virtual void geolocationServicePositionChanged(GeolocationService*);
-    virtual void geolocationServiceErrorOccurred(GeolocationService*);
-            
-    typedef HashSet&lt;RefPtr&lt;GeoNotifier&gt; &gt; GeoNotifierSet;
-    typedef HashMap&lt;int, RefPtr&lt;GeoNotifier&gt; &gt; GeoNotifierMap;
-    
-    GeoNotifierSet m_oneShots;
-    GeoNotifierMap m_watchers;
-    Frame* m_frame;
-    OwnPtr&lt;GeolocationService&gt; m_service;
-};
-    
-} // namespace WebCore
-
-#endif // Geolocation_h
</del></span></pre></div>
<a id="trunkWebCorepageGeolocationidl"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/page/Geolocation.idl (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/Geolocation.idl        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/page/Geolocation.idl        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-module core {
-
-    interface Geolocation {
-        readonly attribute Geoposition lastPosition;
-
-        [Custom] void getCurrentPosition(in PositionCallback successCallback, in PositionErrorCallback errorCallback, in PositionOptions options);
-
-        [Custom] long watchPosition(in PositionCallback successCallback, in PositionErrorCallback errorCallback, in PositionOptions options);
-
-        void clearWatch(in long watchId);
-    };
-
-}
</del></span></pre></div>
<a id="trunkWebCorepageGeopositioncpp"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/page/Geoposition.cpp (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/Geoposition.cpp        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/page/Geoposition.cpp        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include &quot;config.h&quot;
-#include &quot;Geoposition.h&quot;
-
-namespace WebCore {
-
-String Geoposition::toString() const
-{
-    return String::format(&quot;position(%.6lg, %.6lg, %.6lg, %.6lg, %.6lg, %.6lg, %.6lg, %.lld)&quot;,
-                          m_latitude, m_longitude, m_altitude, m_accuracy, 
-                          m_altitudeAccuracy, m_heading, m_velocity, m_timestamp);
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkWebCorepageGeopositionh"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/page/Geoposition.h (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/Geoposition.h        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/page/Geoposition.h        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,77 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef Geoposition_h
-#define Geoposition_h
-
-#include &quot;Event.h&quot;
-#include &quot;PlatformString.h&quot;
-#include &lt;wtf/RefCounted.h&gt;
-
-namespace WebCore {
-
-typedef int ExceptionCode;
-
-class Geoposition : public RefCounted&lt;Geoposition&gt; {
-public:
-    static PassRefPtr&lt;Geoposition&gt; create(double latitude, double longitude, double altitude, double accuracy, double altitudeAccuracy, double heading, double velocity, DOMTimeStamp timestamp) { return adoptRef(new Geoposition(latitude, longitude, altitude, accuracy, altitudeAccuracy, heading, velocity, timestamp)); }
-    
-    double latitude() const { return m_latitude; }
-    double longitude() const { return m_longitude; }
-    double altitude() const { return m_altitude; }
-    double accuracy() const { return m_accuracy; }
-    double altitudeAccuracy() const { return m_altitudeAccuracy; }
-    double heading() const { return m_heading; }
-    double velocity() const { return m_velocity; }
-    DOMTimeStamp timestamp() const { return m_timestamp; }
-
-    String toString() const;
-
-private:
-    Geoposition(double latitude, double longitude, double altitude, double accuracy, double altitudeAccuracy, double heading, double velocity, DOMTimeStamp timestamp)
-        : m_latitude(latitude)
-        , m_longitude(longitude)
-        , m_altitude(altitude)
-        , m_accuracy(accuracy)
-        , m_altitudeAccuracy(altitudeAccuracy)
-        , m_heading(heading)
-        , m_velocity(velocity)
-        , m_timestamp(timestamp)
-    {
-    }
-
-    double m_latitude;
-    double m_longitude;
-    double m_altitude;
-    double m_accuracy;
-    double m_altitudeAccuracy;
-    double m_heading;
-    double m_velocity;
-    DOMTimeStamp m_timestamp;
-};
-    
-} // namespace WebCore
-
-#endif // Geoposition_h
</del></span></pre></div>
<a id="trunkWebCorepageGeopositionidl"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/page/Geoposition.idl (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/Geoposition.idl        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/page/Geoposition.idl        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-module core {
-
-    interface Geoposition {
-        readonly attribute double latitude;
-        readonly attribute double longitude;
-        readonly attribute double altitude;
-        readonly attribute double accuracy;
-        readonly attribute double altitudeAccuracy;
-        readonly attribute double heading
-        readonly attribute double velocity
-        readonly attribute DOMTimeStamp timestamp;
-
-#if defined(LANGUAGE_JAVASCRIPT)
-        [DontEnum] DOMString toString();
-#endif
-    };
-}
</del></span></pre></div>
<a id="trunkWebCorepageNavigatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/Navigator.cpp (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/Navigator.cpp        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/page/Navigator.cpp        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include &quot;Frame.h&quot;
</span><span class="cx"> #include &quot;FrameLoader.h&quot;
</span><span class="cx"> #include &quot;FrameLoaderClient.h&quot;
</span><del>-#include &quot;Geolocation.h&quot;
</del><span class="cx"> #include &quot;Language.h&quot;
</span><span class="cx"> #include &quot;MimeTypeArray.h&quot;
</span><span class="cx"> #include &quot;NetworkStateNotifier.h&quot;
</span><span class="lines">@@ -88,10 +87,6 @@
</span><span class="cx">         m_mimeTypes-&gt;disconnectFrame();
</span><span class="cx">         m_mimeTypes = 0;
</span><span class="cx">     }
</span><del>-    if (m_geolocation) {
-        m_geolocation-&gt;disconnectFrame();
-        m_geolocation = 0;
-    }
</del><span class="cx">     m_frame = 0;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -202,11 +197,4 @@
</span><span class="cx">     return networkStateNotifier().onLine();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-Geolocation* Navigator::geolocation() const
-{
-    if (!m_geolocation)
-        m_geolocation = Geolocation::create(m_frame);
-    return m_geolocation.get();
-}
-    
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkWebCorepageNavigatorh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/Navigator.h (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/Navigator.h        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/page/Navigator.h        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx">     class Frame;
</span><del>-    class Geolocation;
</del><span class="cx">     class MimeTypeArray;
</span><span class="cx">     class PluginData;
</span><span class="cx">     class PluginArray;
</span><span class="lines">@@ -57,16 +56,11 @@
</span><span class="cx">         bool javaEnabled() const;
</span><span class="cx"> 
</span><span class="cx">         bool onLine() const;
</span><del>-        Geolocation* geolocation() const;
-        // This is used for GC marking.
-        Geolocation* optionalGeolocation() const { return m_geolocation.get(); }
-
</del><span class="cx">     private:
</span><span class="cx">         Navigator(Frame*);
</span><span class="cx">         Frame* m_frame;
</span><span class="cx">         mutable RefPtr&lt;PluginArray&gt; m_plugins;
</span><span class="cx">         mutable RefPtr&lt;MimeTypeArray&gt; m_mimeTypes;
</span><del>-        mutable RefPtr&lt;Geolocation&gt; m_geolocation;
</del><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebCorepageNavigatoridl"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/Navigator.idl (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/Navigator.idl        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/page/Navigator.idl        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -19,9 +19,7 @@
</span><span class="cx"> 
</span><span class="cx"> module window {
</span><span class="cx"> 
</span><del>-    interface [
-        CustomMarkFunction
-    ] Navigator {
</del><ins>+    interface Navigator {
</ins><span class="cx">         readonly attribute DOMString appCodeName;
</span><span class="cx">         readonly attribute DOMString appName;
</span><span class="cx">         readonly attribute [CustomGetter] DOMString appVersion;
</span><span class="lines">@@ -38,9 +36,6 @@
</span><span class="cx">         boolean javaEnabled();
</span><span class="cx">         
</span><span class="cx">         readonly attribute boolean onLine;
</span><del>-#if ENABLE_GEOLOCATION
-        readonly attribute Geolocation geolocation;
-#endif
</del><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebCorepagePositionCallbackh"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/page/PositionCallback.h (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/PositionCallback.h        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/page/PositionCallback.h        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef PositionCallback_h
-#define PositionCallback_h
-
-#include &lt;wtf/Platform.h&gt;
-#include &lt;wtf/RefCounted.h&gt;
-
-namespace WebCore {
-    
-    class Geoposition;
-    
-    class PositionCallback : public RefCounted&lt;PositionCallback&gt; {
-    public:
-        virtual ~PositionCallback() { }
-        virtual void handleEvent(Geoposition* position, bool&amp; raisedException) = 0;
-    };
-    
-} // namespace WebCore
-
-#endif // PositionCallback_h
</del></span></pre></div>
<a id="trunkWebCorepagePositionCallbackidl"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/page/PositionCallback.idl (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/PositionCallback.idl        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/page/PositionCallback.idl        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,34 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-module core {
-
-    interface [
-        GenerateConstructor
-    ] PositionCallback {
-        void handleEvent(in Geoposition position);
-    };
-
-}
</del></span></pre></div>
<a id="trunkWebCorepagePositionErrorh"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/page/PositionError.h (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/PositionError.h        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/page/PositionError.h        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,63 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef PositionError_h
-#define PositionError_h
-
-#include &quot;PlatformString.h&quot;
-#include &lt;wtf/PassRefPtr.h&gt;
-#include &lt;wtf/RefCounted.h&gt;
-
-namespace WebCore {
-    
-class PositionError : public RefCounted&lt;PositionError&gt; {
-public:
-    enum ErrorCode {
-        PERMISSION_ERROR = 1,
-        LOCATION_PROVIDER_ERROR,
-        POSITION_NOT_FOUND_ERROR,
-        TIMEOUT_ERROR,
-        UNKNOWN_ERROR
-    };
-    
-    static PassRefPtr&lt;PositionError&gt; create(ErrorCode code, const String&amp; message) { return adoptRef(new PositionError(code, message)); }
-
-    ErrorCode code() const { return m_code; }
-    const String&amp; message() const { return m_message; }
-    
-private:
-    PositionError(ErrorCode code, const String&amp; message) 
-        : m_code(code)
-        , m_message(message)
-    {
-    }
-    
-    ErrorCode m_code;
-    String m_message;
-};
-    
-} // namespace WebCore
-
-#endif // PositionError_h
</del></span></pre></div>
<a id="trunkWebCorepagePositionErroridl"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/page/PositionError.idl (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/PositionError.idl        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/page/PositionError.idl        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-module core {
-
-    interface [
-        GenerateConstructor
-    ] PositionError {
-        readonly attribute long code;
-        readonly attribute DOMString message;
-    };
-
-}
</del></span></pre></div>
<a id="trunkWebCorepagePositionErrorCallbackh"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/page/PositionErrorCallback.h (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/PositionErrorCallback.h        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/page/PositionErrorCallback.h        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef PositionErrorCallback_h
-#define PositionErrorCallback_h
-
-#include &lt;wtf/Platform.h&gt;
-#include &lt;wtf/RefCounted.h&gt;
-
-namespace WebCore {
-
-    class PositionError;
-
-    class PositionErrorCallback : public RefCounted&lt;PositionErrorCallback&gt; {
-    public:
-        virtual ~PositionErrorCallback() { }
-        virtual void handleEvent(PositionError*) = 0;
-    };
-    
-} // namespace WebCore
-
-#endif // PositionErrorCallback_h
</del></span></pre></div>
<a id="trunkWebCorepagePositionErrorCallbackidl"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/page/PositionErrorCallback.idl (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/PositionErrorCallback.idl        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/page/PositionErrorCallback.idl        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,34 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-module core {
-
-    interface [
-        GenerateConstructor
-    ] PositionErrorCallback {
-        void handleEvent(in PositionError error);
-    };
-
-}
</del></span></pre></div>
<a id="trunkWebCorepagePositionOptionsh"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/page/PositionOptions.h (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/PositionOptions.h        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/page/PositionOptions.h        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,56 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef PositionOptions_h
-#define PositionOptions_h
-
-#include &lt;wtf/PassRefPtr.h&gt;
-#include &lt;wtf/RefCounted.h&gt;
-
-namespace WebCore {
-    
-class PositionOptions : public RefCounted&lt;PositionOptions&gt; {
-public:
-    static PassRefPtr&lt;PositionOptions&gt; create(bool highAccuracy, int timeout) { return adoptRef(new PositionOptions(highAccuracy, timeout)); }
-
-    bool enableHighAccuracy() const { return m_highAccuracy; }
-    void setEnableHighAccuracy(bool enable) { m_highAccuracy = enable; }
-    int timeout() const { return m_timeout; }
-    void setTimeout(int t) { m_timeout = t; }
-    
-private:
-    PositionOptions(bool highAccuracy, int timeout)
-        : m_highAccuracy(highAccuracy)
-        , m_timeout(timeout)
-    {
-    }
-    
-    bool m_highAccuracy;
-    int m_timeout;
-};
-    
-} // namespace WebCore
-
-#endif // PositionOptions_h
</del></span></pre></div>
<a id="trunkWebCorepagePositionOptionsidl"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/page/PositionOptions.idl (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/PositionOptions.idl        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/page/PositionOptions.idl        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-module core {
-
-    interface [
-        GenerateConstructor
-    ] PositionOptions {
-        attribute boolean enableHighAccuracy;
-        attribute long timeout;
-    };
-
-}
</del></span></pre></div>
<a id="trunkWebCoreplatformGeolocationServicecpp"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/platform/GeolocationService.cpp (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/GeolocationService.cpp        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/platform/GeolocationService.cpp        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,51 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include &quot;config.h&quot;
-#include &quot;GeolocationService.h&quot;
-
-#include &quot;Geoposition.h&quot;
-#include &quot;PositionError.h&quot;
-#include &quot;PositionOptions.h&quot;
-
-namespace WebCore {
-
-GeolocationService::GeolocationService(GeolocationServiceClient* client)
-    : m_geolocationServiceClient(client)
-{
-    ASSERT(m_geolocationServiceClient);
-}
-
-void GeolocationService::positionChanged()
-{
-    m_geolocationServiceClient-&gt;geolocationServicePositionChanged(this);
-}
-
-void GeolocationService::errorOccurred()
-{
-    m_geolocationServiceClient-&gt;geolocationServiceErrorOccurred(this);
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkWebCoreplatformGeolocationServiceh"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/platform/GeolocationService.h (37841 => 37842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/GeolocationService.h        2008-10-24 05:39:28 UTC (rev 37841)
+++ trunk/WebCore/platform/GeolocationService.h        2008-10-24 07:39:15 UTC (rev 37842)
</span><span class="lines">@@ -1,68 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef GeolocationService_h
-#define GeolocationService_h
-
-#include &lt;wtf/Noncopyable.h&gt;
-
-namespace WebCore {
-
-class GeolocationService;
-class Geoposition;
-class PositionError;
-class PositionOptions;
-
-class GeolocationServiceClient {
-public:
-    virtual ~GeolocationServiceClient() { }
-    virtual void geolocationServicePositionChanged(GeolocationService*) { }
-    virtual void geolocationServiceErrorOccurred(GeolocationService*) { }
-};
-
-class GeolocationService : public Noncopyable {
-public:
-    static GeolocationService* create(GeolocationServiceClient*);
-    virtual ~GeolocationService() {}
-    
-    bool startUpdating(PositionOptions*);
-    virtual void stopUpdating();
-    
-    Geoposition* lastPosition() const;
-    PositionError* lastError() const;
-
-    void positionChanged();
-    void errorOccurred();
-
-protected:
-    GeolocationService(GeolocationServiceClient*);
-
-private:
-    GeolocationServiceClient* m_geolocationServiceClient;
-};
-    
-} // namespace WebCore
-
-#endif // GeolocationService_h
</del></span></pre>
</div>
</div>

</body>
</html>