<!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>[191007] 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/191007">191007</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-10-13 14:45:43 -0700 (Tue, 13 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERT(m_motionManager) on emgn.com page
https://bugs.webkit.org/show_bug.cgi?id=150070
<rdar://problem/18383732>
Reviewed by Simon Fraser.
In the WebCoreMotionManager init method, we call
into another setup method on the main thread.
However, if a listener was attached before that
ran, we'd ASSERT. This wasn't actually causing a bug
because the main thread initialization would
check the listeners once it got a chance to run.
The fix is to only check status when we've
actually initialized.
* platform/ios/WebCoreMotionManager.h: New m_initialized boolean.
* platform/ios/WebCoreMotionManager.mm: Check m_initialized before doing real work.
(-[WebCoreMotionManager init]):
(-[WebCoreMotionManager addMotionClient:]):
(-[WebCoreMotionManager removeMotionClient:]):
(-[WebCoreMotionManager addOrientationClient:]):
(-[WebCoreMotionManager removeOrientationClient:]):
(-[WebCoreMotionManager initializeOnMainThread]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebCoreMotionManagerh">trunk/Source/WebCore/platform/ios/WebCoreMotionManager.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebCoreMotionManagermm">trunk/Source/WebCore/platform/ios/WebCoreMotionManager.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191006 => 191007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-13 21:28:21 UTC (rev 191006)
+++ trunk/Source/WebCore/ChangeLog 2015-10-13 21:45:43 UTC (rev 191007)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-10-12 Dean Jackson <dino@apple.com>
+
+ ASSERT(m_motionManager) on emgn.com page
+ https://bugs.webkit.org/show_bug.cgi?id=150070
+ <rdar://problem/18383732>
+
+ Reviewed by Simon Fraser.
+
+ In the WebCoreMotionManager init method, we call
+ into another setup method on the main thread.
+ However, if a listener was attached before that
+ ran, we'd ASSERT. This wasn't actually causing a bug
+ because the main thread initialization would
+ check the listeners once it got a chance to run.
+
+ The fix is to only check status when we've
+ actually initialized.
+
+ * platform/ios/WebCoreMotionManager.h: New m_initialized boolean.
+ * platform/ios/WebCoreMotionManager.mm: Check m_initialized before doing real work.
+ (-[WebCoreMotionManager init]):
+ (-[WebCoreMotionManager addMotionClient:]):
+ (-[WebCoreMotionManager removeMotionClient:]):
+ (-[WebCoreMotionManager addOrientationClient:]):
+ (-[WebCoreMotionManager removeOrientationClient:]):
+ (-[WebCoreMotionManager initializeOnMainThread]):
+
</ins><span class="cx"> 2015-10-13 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Avoid useless copies in range-loops that are using 'auto'
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebCoreMotionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebCoreMotionManager.h (191006 => 191007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebCoreMotionManager.h 2015-10-13 21:28:21 UTC (rev 191006)
+++ trunk/Source/WebCore/platform/ios/WebCoreMotionManager.h 2015-10-13 21:45:43 UTC (rev 191007)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> NSTimer* m_updateTimer;
</span><span class="cx"> BOOL m_gyroAvailable;
</span><span class="cx"> BOOL m_headingAvailable;
</span><ins>+ BOOL m_initialized;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (WebCoreMotionManager *)sharedManager;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebCoreMotionManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebCoreMotionManager.mm (191006 => 191007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebCoreMotionManager.mm 2015-10-13 21:28:21 UTC (rev 191006)
+++ trunk/Source/WebCore/platform/ios/WebCoreMotionManager.mm 2015-10-13 21:45:43 UTC (rev 191007)
</span><span class="lines">@@ -77,6 +77,7 @@
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (self)
</span><span class="cx"> [self performSelectorOnMainThread:@selector(initializeOnMainThread) withObject:nil waitUntilDone:NO];
</span><ins>+
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -103,25 +104,29 @@
</span><span class="cx"> - (void)addMotionClient:(WebCore::DeviceMotionClientIOS *)client
</span><span class="cx"> {
</span><span class="cx"> m_deviceMotionClients.add(client);
</span><del>- [self checkClientStatus];
</del><ins>+ if (m_initialized)
+ [self checkClientStatus];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)removeMotionClient:(WebCore::DeviceMotionClientIOS *)client
</span><span class="cx"> {
</span><span class="cx"> m_deviceMotionClients.remove(client);
</span><del>- [self checkClientStatus];
</del><ins>+ if (m_initialized)
+ [self checkClientStatus];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)addOrientationClient:(WebCore::DeviceOrientationClientIOS *)client
</span><span class="cx"> {
</span><span class="cx"> m_deviceOrientationClients.add(client);
</span><del>- [self checkClientStatus];
</del><ins>+ if (m_initialized)
+ [self checkClientStatus];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)removeOrientationClient:(WebCore::DeviceOrientationClientIOS *)client
</span><span class="cx"> {
</span><span class="cx"> m_deviceOrientationClients.remove(client);
</span><del>- [self checkClientStatus];
</del><ins>+ if (m_initialized)
+ [self checkClientStatus];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)gyroAvailable
</span><span class="lines">@@ -150,6 +155,8 @@
</span><span class="cx"> m_locationManager = [allocCLLocationManagerInstance() init];
</span><span class="cx"> m_headingAvailable = [getCLLocationManagerClass() headingAvailable];
</span><span class="cx">
</span><ins>+ m_initialized = YES;
+
</ins><span class="cx"> [self checkClientStatus];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>