<!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>[178233] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/178233">178233</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-01-09 19:53:54 -0800 (Fri, 09 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>CTTE: GeolocationController always has a client.
<https://webkit.org/b/140330>
Reviewed by Anders Carlsson.
Change GeolocationController::m_client to be a reference and remove
a whole bunch of unnecessary null checks.
* Modules/geolocation/GeolocationController.cpp:
(WebCore::GeolocationController::GeolocationController):
(WebCore::GeolocationController::~GeolocationController):
(WebCore::GeolocationController::addObserver):
(WebCore::GeolocationController::removeObserver):
(WebCore::GeolocationController::requestPermission):
(WebCore::GeolocationController::cancelPermissionRequest):
(WebCore::GeolocationController::lastPosition):
(WebCore::GeolocationController::viewStateDidChange):
(WebCore::provideGeolocationTo):
* Modules/geolocation/GeolocationController.h:
(WebCore::GeolocationController::client):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesgeolocationGeolocationControllercpp">trunk/Source/WebCore/Modules/geolocation/GeolocationController.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesgeolocationGeolocationControllerh">trunk/Source/WebCore/Modules/geolocation/GeolocationController.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178232 => 178233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-10 02:44:56 UTC (rev 178232)
+++ trunk/Source/WebCore/ChangeLog 2015-01-10 03:53:54 UTC (rev 178233)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-01-09 Andreas Kling <akling@apple.com>
+
+ CTTE: GeolocationController always has a client.
+ <https://webkit.org/b/140330>
+
+ Reviewed by Anders Carlsson.
+
+ Change GeolocationController::m_client to be a reference and remove
+ a whole bunch of unnecessary null checks.
+
+ * Modules/geolocation/GeolocationController.cpp:
+ (WebCore::GeolocationController::GeolocationController):
+ (WebCore::GeolocationController::~GeolocationController):
+ (WebCore::GeolocationController::addObserver):
+ (WebCore::GeolocationController::removeObserver):
+ (WebCore::GeolocationController::requestPermission):
+ (WebCore::GeolocationController::cancelPermissionRequest):
+ (WebCore::GeolocationController::lastPosition):
+ (WebCore::GeolocationController::viewStateDidChange):
+ (WebCore::provideGeolocationTo):
+ * Modules/geolocation/GeolocationController.h:
+ (WebCore::GeolocationController::client):
+
</ins><span class="cx"> 2015-01-09 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Calling clearSelection on a detached RenderObject leads to segfault.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgeolocationGeolocationControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/geolocation/GeolocationController.cpp (178232 => 178233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/geolocation/GeolocationController.cpp 2015-01-10 02:44:56 UTC (rev 178232)
+++ trunk/Source/WebCore/Modules/geolocation/GeolocationController.cpp 2015-01-10 03:53:54 UTC (rev 178233)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-GeolocationController::GeolocationController(Page& page, GeolocationClient* client)
</del><ins>+GeolocationController::GeolocationController(Page& page, GeolocationClient& client)
</ins><span class="cx"> : m_page(page)
</span><span class="cx"> , m_client(client)
</span><span class="cx"> {
</span><span class="lines">@@ -49,8 +49,7 @@
</span><span class="cx"> // we are supplement of the Page, and our destructor getting called means the page is being
</span><span class="cx"> // torn down.
</span><span class="cx">
</span><del>- if (m_client)
- m_client->geolocationDestroyed();
</del><ins>+ m_client.geolocationDestroyed();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GeolocationController::addObserver(Geolocation* observer, bool enableHighAccuracy)
</span><span class="lines">@@ -62,12 +61,10 @@
</span><span class="cx"> if (enableHighAccuracy)
</span><span class="cx"> m_highAccuracyObservers.add(observer);
</span><span class="cx">
</span><del>- if (m_client) {
- if (enableHighAccuracy)
- m_client->setEnableHighAccuracy(true);
- if (wasEmpty)
- m_client->startUpdating();
- }
</del><ins>+ if (enableHighAccuracy)
+ m_client.setEnableHighAccuracy(true);
+ if (wasEmpty)
+ m_client.startUpdating();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GeolocationController::removeObserver(Geolocation* observer)
</span><span class="lines">@@ -78,12 +75,10 @@
</span><span class="cx"> m_observers.remove(observer);
</span><span class="cx"> m_highAccuracyObservers.remove(observer);
</span><span class="cx">
</span><del>- if (m_client) {
- if (m_observers.isEmpty())
- m_client->stopUpdating();
- else if (m_highAccuracyObservers.isEmpty())
- m_client->setEnableHighAccuracy(false);
- }
</del><ins>+ if (m_observers.isEmpty())
+ m_client.stopUpdating();
+ else if (m_highAccuracyObservers.isEmpty())
+ m_client.setEnableHighAccuracy(false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GeolocationController::requestPermission(Geolocation* geolocation)
</span><span class="lines">@@ -93,8 +88,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_client)
- m_client->requestPermission(geolocation);
</del><ins>+ m_client.requestPermission(geolocation);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GeolocationController::cancelPermissionRequest(Geolocation* geolocation)
</span><span class="lines">@@ -102,8 +96,7 @@
</span><span class="cx"> if (m_pendedPermissionRequest.remove(geolocation))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_client)
- m_client->cancelPermissionRequest(geolocation);
</del><ins>+ m_client.cancelPermissionRequest(geolocation);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GeolocationController::positionChanged(GeolocationPosition* position)
</span><span class="lines">@@ -128,10 +121,7 @@
</span><span class="cx"> if (m_lastPosition.get())
</span><span class="cx"> return m_lastPosition.get();
</span><span class="cx">
</span><del>- if (!m_client)
- return 0;
-
- return m_client->lastPosition();
</del><ins>+ return m_client.lastPosition();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GeolocationController::viewStateDidChange(ViewState::Flags, ViewState::Flags)
</span><span class="lines">@@ -141,7 +131,7 @@
</span><span class="cx">
</span><span class="cx"> HashSet<RefPtr<Geolocation>> pendedPermissionRequests = WTF::move(m_pendedPermissionRequest);
</span><span class="cx"> for (auto& permissionRequest : pendedPermissionRequests)
</span><del>- m_client->requestPermission(permissionRequest.get());
</del><ins>+ m_client.requestPermission(permissionRequest.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const char* GeolocationController::supplementName()
</span><span class="lines">@@ -151,7 +141,9 @@
</span><span class="cx">
</span><span class="cx"> void provideGeolocationTo(Page* page, GeolocationClient* client)
</span><span class="cx"> {
</span><del>- Supplement<Page>::provideTo(page, GeolocationController::supplementName(), std::make_unique<GeolocationController>(*page, client));
</del><ins>+ ASSERT(page);
+ ASSERT(client);
+ Supplement<Page>::provideTo(page, GeolocationController::supplementName(), std::make_unique<GeolocationController>(*page, *client));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgeolocationGeolocationControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/geolocation/GeolocationController.h (178232 => 178233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/geolocation/GeolocationController.h 2015-01-10 02:44:56 UTC (rev 178232)
+++ trunk/Source/WebCore/Modules/geolocation/GeolocationController.h 2015-01-10 03:53:54 UTC (rev 178233)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> class GeolocationController : public Supplement<Page>, private ViewStateChangeObserver {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(GeolocationController);
</span><span class="cx"> public:
</span><del>- explicit GeolocationController(Page&, GeolocationClient*);
</del><ins>+ GeolocationController(Page&, GeolocationClient&);
</ins><span class="cx"> ~GeolocationController();
</span><span class="cx">
</span><span class="cx"> void addObserver(Geolocation*, bool enableHighAccuracy);
</span><span class="lines">@@ -59,14 +59,14 @@
</span><span class="cx">
</span><span class="cx"> GeolocationPosition* lastPosition();
</span><span class="cx">
</span><del>- GeolocationClient* client() { return m_client; }
</del><ins>+ GeolocationClient& client() { return m_client; }
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT static const char* supplementName();
</span><span class="cx"> static GeolocationController* from(Page* page) { return static_cast<GeolocationController*>(Supplement<Page>::from(page, supplementName())); }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Page& m_page;
</span><del>- GeolocationClient* m_client;
</del><ins>+ GeolocationClient& m_client;
</ins><span class="cx">
</span><span class="cx"> virtual void viewStateDidChange(ViewState::Flags oldViewState, ViewState::Flags newViewState) override;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>