<!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>[169775] trunk/Source</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/169775">169775</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-06-10 15:30:31 -0700 (Tue, 10 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Factor repeated CFRunLoopObserver code out
https://bugs.webkit.org/show_bug.cgi?id=133690
Reviewed by Simon Fraser.
* WebCore.exp.in:
* WebCore.xcodeproj/project.pbxproj:
* platform/cf/RunLoopObserver.cpp: Added.
(WebCore::RunLoopObserver::create):
(WebCore::RunLoopObserver::~RunLoopObserver):
(WebCore::RunLoopObserver::runLoopObserverFired):
(WebCore::RunLoopObserver::schedule):
(WebCore::RunLoopObserver::invalidate):
* platform/cf/RunLoopObserver.h: Added.
(WebCore::RunLoopObserver::isScheduled):
(WebCore::RunLoopObserver::RunLoopObserver):
Factor CFRunLoopObserver management code out of LayerFlushScheduler and WebKit2.
* platform/graphics/ca/LayerFlushScheduler.h:
* platform/graphics/ca/mac/LayerFlushSchedulerMac.cpp:
(WebCore::LayerFlushScheduler::LayerFlushScheduler):
(WebCore::LayerFlushScheduler::~LayerFlushScheduler):
(WebCore::LayerFlushScheduler::layerFlushCallback):
(WebCore::LayerFlushScheduler::schedule):
(WebCore::LayerFlushScheduler::invalidate):
(WebCore::LayerFlushScheduler::runLoopObserverCallback): Deleted.
Make use of WebCore::RunLoopObserver.
* UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:
* UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
(WebKit::RemoteLayerTreeDrawingAreaProxy::RemoteLayerTreeDrawingAreaProxy):
(WebKit::RemoteLayerTreeDrawingAreaProxy::~RemoteLayerTreeDrawingAreaProxy):
(WebKit::RemoteLayerTreeDrawingAreaProxy::commitLayerTree):
(WebKit::RemoteLayerTreeDrawingAreaProxy::showDebugIndicator):
(WebKit::coreAnimationDidCommitLayersCallback): Deleted.
(WebKit::RemoteLayerTreeDrawingAreaProxy::scheduleCoreAnimationLayerCommitObserver): Deleted.
(WebKit::RemoteLayerTreeDrawingAreaProxy::coreAnimationDidCommitLayers): Deleted.
Make use of WebCore::RunLoopObserver.
* WebView/WebViewData.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaLayerFlushSchedulerh">trunk/Source/WebCore/platform/graphics/ca/LayerFlushScheduler.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacLayerFlushSchedulerMaccpp">trunk/Source/WebCore/platform/graphics/ca/mac/LayerFlushSchedulerMac.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewDatah">trunk/Source/WebKit/mac/WebView/WebViewData.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm">trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformcfRunLoopObservercpp">trunk/Source/WebCore/platform/cf/RunLoopObserver.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformcfRunLoopObserverh">trunk/Source/WebCore/platform/cf/RunLoopObserver.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169774 => 169775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-10 22:25:44 UTC (rev 169774)
+++ trunk/Source/WebCore/ChangeLog 2014-06-10 22:30:31 UTC (rev 169775)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-06-10 Timothy Horton <timothy_horton@apple.com>
+
+ Factor repeated CFRunLoopObserver code out
+ https://bugs.webkit.org/show_bug.cgi?id=133690
+
+ Reviewed by Simon Fraser.
+
+ * WebCore.exp.in:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/cf/RunLoopObserver.cpp: Added.
+ (WebCore::RunLoopObserver::create):
+ (WebCore::RunLoopObserver::~RunLoopObserver):
+ (WebCore::RunLoopObserver::runLoopObserverFired):
+ (WebCore::RunLoopObserver::schedule):
+ (WebCore::RunLoopObserver::invalidate):
+ * platform/cf/RunLoopObserver.h: Added.
+ (WebCore::RunLoopObserver::isScheduled):
+ (WebCore::RunLoopObserver::RunLoopObserver):
+ Factor CFRunLoopObserver management code out of LayerFlushScheduler and WebKit2.
+
+ * platform/graphics/ca/LayerFlushScheduler.h:
+ * platform/graphics/ca/mac/LayerFlushSchedulerMac.cpp:
+ (WebCore::LayerFlushScheduler::LayerFlushScheduler):
+ (WebCore::LayerFlushScheduler::~LayerFlushScheduler):
+ (WebCore::LayerFlushScheduler::layerFlushCallback):
+ (WebCore::LayerFlushScheduler::schedule):
+ (WebCore::LayerFlushScheduler::invalidate):
+ (WebCore::LayerFlushScheduler::runLoopObserverCallback): Deleted.
+ Make use of WebCore::RunLoopObserver.
+
</ins><span class="cx"> 2014-06-10 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Modernize loop code in scrolling tree code
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (169774 => 169775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-06-10 22:25:44 UTC (rev 169774)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-06-10 22:30:31 UTC (rev 169775)
</span><span class="lines">@@ -606,6 +606,10 @@
</span><span class="cx"> __ZN7WebCore15ProtectionSpaceC1Ev
</span><span class="cx"> __ZN7WebCore15ResourceRequest21httpPipeliningEnabledEv
</span><span class="cx"> __ZN7WebCore15ResourceRequest24setHTTPPipeliningEnabledEb
</span><ins>+__ZN7WebCore15RunLoopObserver10invalidateEv
+__ZN7WebCore15RunLoopObserver6createElNSt3__18functionIFvvEEE
+__ZN7WebCore15RunLoopObserver8scheduleEP11__CFRunLoop
+__ZN7WebCore15RunLoopObserverD1Ev
</ins><span class="cx"> __ZN7WebCore15SQLiteStatement12getColumnIntEi
</span><span class="cx"> __ZN7WebCore15SQLiteStatement12isColumnNullEi
</span><span class="cx"> __ZN7WebCore15SQLiteStatement13getColumnTextEi
</span><span class="lines">@@ -794,7 +798,7 @@
</span><span class="cx"> __ZN7WebCore19AnimationController36setAllowsNewAnimationsWhileSuspendedEb
</span><span class="cx"> __ZN7WebCore19HTMLTextAreaElement8setValueERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore19LayerFlushScheduler10invalidateEv
</span><del>-__ZN7WebCore19LayerFlushScheduler23runLoopObserverCallbackEv
</del><ins>+__ZN7WebCore19LayerFlushScheduler18layerFlushCallbackEv
</ins><span class="cx"> __ZN7WebCore19LayerFlushScheduler6resumeEv
</span><span class="cx"> __ZN7WebCore19LayerFlushScheduler7suspendEv
</span><span class="cx"> __ZN7WebCore19LayerFlushScheduler8scheduleEv
</span><span class="lines">@@ -2187,6 +2191,7 @@
</span><span class="cx"> .objc_class_name_WebFontCache
</span><span class="cx"> .objc_class_name_WebWindowFadeAnimation
</span><span class="cx"> .objc_class_name_WebWindowScaleAnimation
</span><ins>+__ZN7WebCore10CredentialC1EP20OpaqueSecIdentityRefPK9__CFArrayNS_21CredentialPersistenceE
</ins><span class="cx"> __ZN7WebCore10FloatPointC1ERK8_NSPoint
</span><span class="cx"> __ZN7WebCore10handCursorEv
</span><span class="cx"> __ZN7WebCore11CachedImage5imageEv
</span><span class="lines">@@ -2488,6 +2493,7 @@
</span><span class="cx"> _WebUIApplicationDidBecomeActiveNotification
</span><span class="cx"> _WebUIApplicationWillEnterForegroundNotification
</span><span class="cx"> _WebUIApplicationWillResignActiveNotification
</span><ins>+__ZN7WebCore10CredentialC1EP13__SecIdentityPK9__CFArrayNS_21CredentialPersistenceE
</ins><span class="cx"> __ZN7WebCore10RenderView35resumePausedImageAnimationsIfNeededEv
</span><span class="cx"> __ZN7WebCore10ScrollView15setScrollOffsetERKNS_8IntPointE
</span><span class="cx"> __ZN7WebCore10ScrollView21setExposedContentRectERKNS_7IntRectE
</span><span class="lines">@@ -3419,9 +3425,3 @@
</span><span class="cx"> #if ENABLE(WEB_TIMING)
</span><span class="cx"> __ZNK7WebCore20ResourceResponseBase18resourceLoadTimingEv
</span><span class="cx"> #endif
</span><del>-
-#if PLATFORM(IOS)
-__ZN7WebCore10CredentialC1EP13__SecIdentityPK9__CFArrayNS_21CredentialPersistenceE
-#else
-__ZN7WebCore10CredentialC1EP20OpaqueSecIdentityRefPK9__CFArrayNS_21CredentialPersistenceE
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (169774 => 169775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-06-10 22:25:44 UTC (rev 169774)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-06-10 22:30:31 UTC (rev 169775)
</span><span class="lines">@@ -1092,6 +1092,8 @@
</span><span class="cx"> 2D6E468417D660F500ECF8BB /* PDFDocumentImageMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D6E468217D660F500ECF8BB /* PDFDocumentImageMac.mm */; };
</span><span class="cx"> 2D70BA1318074DDF0001908A /* PlatformCALayerMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D70BA1218074DDF0001908A /* PlatformCALayerMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 2D70BA1518074F860001908A /* PlatformCALayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D70BA1418074F850001908A /* PlatformCALayer.cpp */; };
</span><ins>+ 2D76BB821945632400CFD29A /* RunLoopObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D76BB801945632400CFD29A /* RunLoopObserver.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 2D76BB8419456F8100CFD29A /* RunLoopObserver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D76BB8319456F8100CFD29A /* RunLoopObserver.cpp */; };
</ins><span class="cx"> 2D8287F616E4A0380086BD00 /* HitTestLocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8287F416E4A0380086BD00 /* HitTestLocation.cpp */; };
</span><span class="cx"> 2D8287F716E4A0380086BD00 /* HitTestLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D8287F516E4A0380086BD00 /* HitTestLocation.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 2D8FEBDC143E3EF70072502B /* CSSCrossfadeValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8FEBDA143E3EF70072502B /* CSSCrossfadeValue.cpp */; };
</span><span class="lines">@@ -8049,6 +8051,8 @@
</span><span class="cx"> 2D6E468217D660F500ECF8BB /* PDFDocumentImageMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PDFDocumentImageMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2D70BA1218074DDF0001908A /* PlatformCALayerMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlatformCALayerMac.h; path = ca/mac/PlatformCALayerMac.h; sourceTree = "<group>"; };
</span><span class="cx"> 2D70BA1418074F850001908A /* PlatformCALayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PlatformCALayer.cpp; path = ca/PlatformCALayer.cpp; sourceTree = "<group>"; };
</span><ins>+ 2D76BB801945632400CFD29A /* RunLoopObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RunLoopObserver.h; sourceTree = "<group>"; };
+ 2D76BB8319456F8100CFD29A /* RunLoopObserver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RunLoopObserver.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 2D8287F416E4A0380086BD00 /* HitTestLocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HitTestLocation.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2D8287F516E4A0380086BD00 /* HitTestLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HitTestLocation.h; sourceTree = "<group>"; };
</span><span class="cx"> 2D8FEBDA143E3EF70072502B /* CSSCrossfadeValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSCrossfadeValue.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -14965,6 +14969,8 @@
</span><span class="cx"> E1A8E56417552B2A007488E7 /* CFURLExtras.cpp */,
</span><span class="cx"> E1A8E56517552B2A007488E7 /* CFURLExtras.h */,
</span><span class="cx"> 5160306B0CC4362300C8AC25 /* FileSystemCF.cpp */,
</span><ins>+ 2D76BB8319456F8100CFD29A /* RunLoopObserver.cpp */,
+ 2D76BB801945632400CFD29A /* RunLoopObserver.h */,
</ins><span class="cx"> 512DD8E20D91E2B4000F89EE /* SharedBufferCF.cpp */,
</span><span class="cx"> 1A98956A0AA78F80005EF5EF /* URLCF.cpp */,
</span><span class="cx"> );
</span><span class="lines">@@ -26245,6 +26251,7 @@
</span><span class="cx"> A77E1FF014AACB6E005B7CB6 /* TreeScopeAdopter.h in Headers */,
</span><span class="cx"> 1419D2C50CEA6F6100FF507A /* TreeShared.h in Headers */,
</span><span class="cx"> 854FE7390A2297BE0058D7AD /* TreeWalker.h in Headers */,
</span><ins>+ 2D76BB821945632400CFD29A /* RunLoopObserver.h in Headers */,
</ins><span class="cx"> C375D7FE16639519006184AB /* TypeAhead.h in Headers */,
</span><span class="cx"> 37C28A6810F659CC008C7813 /* TypesettingFeatures.h in Headers */,
</span><span class="cx"> 93309E1A099E64920056E581 /* TypingCommand.h in Headers */,
</span><span class="lines">@@ -28211,6 +28218,7 @@
</span><span class="cx"> C6F0917F143A2BB900685849 /* JSMutationObserverCustom.cpp in Sources */,
</span><span class="cx"> C6F08FC91431000D00685849 /* JSMutationRecord.cpp in Sources */,
</span><span class="cx"> BCD9C2C00C17B69E005C90A2 /* JSNamedNodeMap.cpp in Sources */,
</span><ins>+ 2D76BB8419456F8100CFD29A /* RunLoopObserver.cpp in Sources */,
</ins><span class="cx"> BCD9C2630C17AA67005C90A2 /* JSNamedNodeMapCustom.cpp in Sources */,
</span><span class="cx"> A9D247F70D757E3400FDF959 /* JSNavigator.cpp in Sources */,
</span><span class="cx"> 073BE34017D17E01002BD431 /* JSNavigatorUserMedia.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcfRunLoopObservercpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/cf/RunLoopObserver.cpp (0 => 169775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cf/RunLoopObserver.cpp (rev 0)
+++ trunk/Source/WebCore/platform/cf/RunLoopObserver.cpp 2014-06-10 22:30:31 UTC (rev 169775)
</span><span class="lines">@@ -0,0 +1,77 @@
</span><ins>+/*
+ * Copyright (C) 2011, 2014 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 "config.h"
+#include "RunLoopObserver.h"
+
+namespace WebCore {
+
+std::unique_ptr<RunLoopObserver> RunLoopObserver::create(CFIndex order, RunLoopObserver::RunLoopObserverCallback callback)
+{
+ return std::unique_ptr<RunLoopObserver>(new RunLoopObserver(order, callback));
+}
+
+RunLoopObserver::~RunLoopObserver()
+{
+ invalidate();
+}
+
+void RunLoopObserver::runLoopObserverFired(CFRunLoopObserverRef, CFRunLoopActivity, void* context)
+{
+ static_cast<RunLoopObserver*>(context)->runLoopObserverFired();
+}
+
+void RunLoopObserver::runLoopObserverFired()
+{
+ ASSERT(m_runLoopObserver);
+ m_callback();
+}
+
+void RunLoopObserver::schedule(CFRunLoopRef runLoop)
+{
+ if (!runLoop)
+ runLoop = CFRunLoopGetCurrent();
+
+ // Make sure we wake up the loop or the observer could be delayed until some other source fires.
+ CFRunLoopWakeUp(runLoop);
+
+ if (m_runLoopObserver)
+ return;
+
+ CFRunLoopObserverContext context = { 0, this, 0, 0, 0 };
+ m_runLoopObserver = adoptCF(CFRunLoopObserverCreate(0, kCFRunLoopBeforeWaiting | kCFRunLoopExit, true, m_order, runLoopObserverFired, &context));
+
+ CFRunLoopAddObserver(runLoop, m_runLoopObserver.get(), kCFRunLoopCommonModes);
+}
+
+void RunLoopObserver::invalidate()
+{
+ if (m_runLoopObserver) {
+ CFRunLoopObserverInvalidate(m_runLoopObserver.get());
+ m_runLoopObserver = nullptr;
+ }
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformcfRunLoopObserverh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/cf/RunLoopObserver.h (0 => 169775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cf/RunLoopObserver.h (rev 0)
+++ trunk/Source/WebCore/platform/cf/RunLoopObserver.h 2014-06-10 22:30:31 UTC (rev 169775)
</span><span class="lines">@@ -0,0 +1,72 @@
</span><ins>+/*
+ * Copyright (C) 2011, 2014 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 RunLoopObserver_h
+#define RunLoopObserver_h
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <functional>
+#include <wtf/Noncopyable.h>
+#include <wtf/RetainPtr.h>
+
+namespace WebCore {
+
+class RunLoopObserver {
+ WTF_MAKE_NONCOPYABLE(RunLoopObserver);
+public:
+ typedef std::function<void ()> RunLoopObserverCallback;
+
+ static std::unique_ptr<RunLoopObserver> create(CFIndex order, RunLoopObserverCallback callback);
+
+ ~RunLoopObserver();
+
+ void schedule(CFRunLoopRef = nullptr);
+ void invalidate();
+
+ bool isScheduled() const { return m_runLoopObserver; }
+
+ enum class WellKnownRunLoopOrders : CFIndex {
+ CoreAnimationCommit = 2000000
+ };
+
+protected:
+ RunLoopObserver(CFIndex order, RunLoopObserverCallback callback)
+ : m_order(order)
+ , m_callback(callback)
+ { }
+
+ void runLoopObserverFired();
+
+private:
+ static void runLoopObserverFired(CFRunLoopObserverRef, CFRunLoopActivity, void* context);
+
+ CFIndex m_order;
+ RunLoopObserverCallback m_callback;
+ RetainPtr<CFRunLoopObserverRef> m_runLoopObserver;
+};
+
+} // namespace WebCore
+
+#endif // RunLoopObserver_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaLayerFlushSchedulerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/LayerFlushScheduler.h (169774 => 169775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/LayerFlushScheduler.h 2014-06-10 22:25:44 UTC (rev 169774)
+++ trunk/Source/WebCore/platform/graphics/ca/LayerFlushScheduler.h 2014-06-10 22:30:31 UTC (rev 169775)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> #define LayerFlushScheduler_h
</span><span class="cx">
</span><span class="cx"> #include "LayerFlushSchedulerClient.h"
</span><ins>+#include "RunLoopObserver.h"
</ins><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/RetainPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -46,16 +46,16 @@
</span><span class="cx">
</span><span class="cx"> bool isSuspended() const { return m_isSuspended; }
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+ virtual void layerFlushCallback();
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> bool m_isSuspended;
</span><span class="cx"> LayerFlushSchedulerClient* m_client;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- RetainPtr<CFRunLoopObserverRef> m_runLoopObserver;
- static void runLoopObserverCallback(CFRunLoopObserverRef, CFRunLoopActivity, void* context);
-
-protected:
- virtual void runLoopObserverCallback();
</del><ins>+ std::unique_ptr<RunLoopObserver> m_runLoopObserver;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacLayerFlushSchedulerMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/LayerFlushSchedulerMac.cpp (169774 => 169775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/LayerFlushSchedulerMac.cpp 2014-06-10 22:25:44 UTC (rev 169774)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/LayerFlushSchedulerMac.cpp 2014-06-10 22:30:31 UTC (rev 169775)
</span><span class="lines">@@ -37,8 +37,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static const CFIndex CoreAnimationRunLoopOrder = 2000000;
-static const CFIndex LayerFlushRunLoopOrder = CoreAnimationRunLoopOrder - 1;
</del><ins>+static const CFIndex layerFlushRunLoopOrder = (CFIndex)RunLoopObserver::WellKnownRunLoopOrders::CoreAnimationCommit - 1;
</ins><span class="cx">
</span><span class="cx"> static CFRunLoopRef currentRunLoop()
</span><span class="cx"> {
</span><span class="lines">@@ -59,21 +58,20 @@
</span><span class="cx"> , m_client(client)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_ARG(client, client);
</span><ins>+
+ m_runLoopObserver = RunLoopObserver::create(layerFlushRunLoopOrder, [this]() {
+ if (this->isSuspended())
+ return;
+ this->layerFlushCallback();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayerFlushScheduler::~LayerFlushScheduler()
</span><span class="cx"> {
</span><del>- ASSERT(!m_runLoopObserver);
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void LayerFlushScheduler::runLoopObserverCallback(CFRunLoopObserverRef, CFRunLoopActivity, void* context)
</del><ins>+void LayerFlushScheduler::layerFlushCallback()
</ins><span class="cx"> {
</span><del>- static_cast<LayerFlushScheduler*>(context)->runLoopObserverCallback();
-}
-
-void LayerFlushScheduler::runLoopObserverCallback()
-{
- ASSERT(m_runLoopObserver);
</del><span class="cx"> ASSERT(!m_isSuspended);
</span><span class="cx">
</span><span class="cx"> AutodrainedPool pool;
</span><span class="lines">@@ -86,26 +84,12 @@
</span><span class="cx"> if (m_isSuspended)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- CFRunLoopRef runLoop = currentRunLoop();
-
- // Make sure we wake up the loop or the observer could be delayed until some other source fires.
- CFRunLoopWakeUp(runLoop);
-
- if (m_runLoopObserver)
- return;
-
- CFRunLoopObserverContext context = { 0, this, 0, 0, 0 };
- m_runLoopObserver = adoptCF(CFRunLoopObserverCreate(0, kCFRunLoopBeforeWaiting | kCFRunLoopExit, true, LayerFlushRunLoopOrder, runLoopObserverCallback, &context));
-
- CFRunLoopAddObserver(runLoop, m_runLoopObserver.get(), kCFRunLoopCommonModes);
</del><ins>+ m_runLoopObserver->schedule(currentRunLoop());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void LayerFlushScheduler::invalidate()
</span><span class="cx"> {
</span><del>- if (m_runLoopObserver) {
- CFRunLoopObserverInvalidate(m_runLoopObserver.get());
- m_runLoopObserver = nullptr;
- }
</del><ins>+ m_runLoopObserver->invalidate();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (169774 => 169775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-06-10 22:25:44 UTC (rev 169774)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-06-10 22:30:31 UTC (rev 169775)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-06-10 Timothy Horton <timothy_horton@apple.com>
+
+ Factor repeated CFRunLoopObserver code out
+ https://bugs.webkit.org/show_bug.cgi?id=133690
+
+ Reviewed by Simon Fraser.
+
+ * WebView/WebViewData.h:
+
</ins><span class="cx"> 2014-06-05 Pratik Solanki <psolanki@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unsused method _setAcceleratedImageDecoding
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewData.h (169774 => 169775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewData.h 2014-06-10 22:25:44 UTC (rev 169774)
+++ trunk/Source/WebKit/mac/WebView/WebViewData.h 2014-06-10 22:30:31 UTC (rev 169775)
</span><span class="lines">@@ -89,10 +89,10 @@
</span><span class="cx"> virtual ~WebViewLayerFlushScheduler() { }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual void runLoopObserverCallback() override
</del><ins>+ virtual void layerFlushCallback() override
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<LayerFlushController> protector = m_flushController;
</span><del>- WebCore::LayerFlushScheduler::runLoopObserverCallback();
</del><ins>+ WebCore::LayerFlushScheduler::layerFlushCallback();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayerFlushController* m_flushController;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169774 => 169775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-10 22:25:44 UTC (rev 169774)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-10 22:30:31 UTC (rev 169775)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-06-10 Timothy Horton <timothy_horton@apple.com>
+
+ Factor repeated CFRunLoopObserver code out
+ https://bugs.webkit.org/show_bug.cgi?id=133690
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::RemoteLayerTreeDrawingAreaProxy):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::~RemoteLayerTreeDrawingAreaProxy):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::commitLayerTree):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::showDebugIndicator):
+ (WebKit::coreAnimationDidCommitLayersCallback): Deleted.
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::scheduleCoreAnimationLayerCommitObserver): Deleted.
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::coreAnimationDidCommitLayers): Deleted.
+ Make use of WebCore::RunLoopObserver.
+
</ins><span class="cx"> 2014-06-10 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix availability declaration.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h (169774 => 169775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h 2014-06-10 22:25:44 UTC (rev 169774)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h 2014-06-10 22:30:31 UTC (rev 169775)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include <WebCore/FloatPoint.h>
</span><span class="cx"> #include <WebCore/IntPoint.h>
</span><span class="cx"> #include <WebCore/IntSize.h>
</span><ins>+#include <WebCore/RunLoopObserver.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -75,8 +76,6 @@
</span><span class="cx">
</span><span class="cx"> void sendUpdateGeometry();
</span><span class="cx">
</span><del>- void scheduleCoreAnimationLayerCommitObserver();
-
</del><span class="cx"> RemoteLayerTreeHost m_remoteLayerTreeHost;
</span><span class="cx"> bool m_isWaitingForDidUpdateGeometry;
</span><span class="cx">
</span><span class="lines">@@ -87,7 +86,7 @@
</span><span class="cx"> RetainPtr<CALayer> m_tileMapHostLayer;
</span><span class="cx"> RetainPtr<CALayer> m_exposedRectIndicatorLayer;
</span><span class="cx">
</span><del>- RetainPtr<CFRunLoopObserverRef> m_layerCommitObserver;
</del><ins>+ std::unique_ptr<WebCore::RunLoopObserver> m_layerCommitObserver;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> DRAWING_AREA_PROXY_TYPE_CASTS(RemoteLayerTreeDrawingAreaProxy, type() == DrawingAreaTypeRemoteLayerTree);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (169774 => 169775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2014-06-10 22:25:44 UTC (rev 169774)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2014-06-10 22:30:31 UTC (rev 169775)
</span><span class="lines">@@ -37,11 +37,10 @@
</span><span class="cx"> #import <WebCore/IOSurfacePool.h>
</span><span class="cx"> #import <WebCore/WebActionDisablingCALayerDelegate.h>
</span><span class="cx">
</span><del>-static const CFIndex CoreAnimationCommitRunLoopOrder = 2000000;
-static const CFIndex DidCommitLayersRunLoopOrder = CoreAnimationCommitRunLoopOrder + 1;
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><ins>+static const CFIndex didCommitLayersRunLoopOrder = (CFIndex)RunLoopObserver::WellKnownRunLoopOrders::CoreAnimationCommit + 1;
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> RemoteLayerTreeDrawingAreaProxy::RemoteLayerTreeDrawingAreaProxy(WebPageProxy* webPageProxy)
</span><span class="lines">@@ -56,16 +55,15 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_webPageProxy->process().addMessageReceiver(Messages::RemoteLayerTreeDrawingAreaProxy::messageReceiverName(), m_webPageProxy->pageID(), *this);
</span><ins>+
+ m_layerCommitObserver = RunLoopObserver::create(didCommitLayersRunLoopOrder, [this]() {
+ this->coreAnimationDidCommitLayers();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RemoteLayerTreeDrawingAreaProxy::~RemoteLayerTreeDrawingAreaProxy()
</span><span class="cx"> {
</span><span class="cx"> m_webPageProxy->process().removeMessageReceiver(Messages::RemoteLayerTreeDrawingAreaProxy::messageReceiverName(), m_webPageProxy->pageID());
</span><del>-
- if (m_layerCommitObserver) {
- CFRunLoopObserverInvalidate(m_layerCommitObserver.get());
- m_layerCommitObserver = nullptr;
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoteLayerTreeDrawingAreaProxy::sizeDidChange()
</span><span class="lines">@@ -150,7 +148,7 @@
</span><span class="cx"> asLayer(m_debugIndicatorLayerTreeHost->rootLayer()).name = @"Indicator host root";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- scheduleCoreAnimationLayerCommitObserver();
</del><ins>+ m_layerCommitObserver->schedule();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoteLayerTreeDrawingAreaProxy::acceleratedAnimationDidStart(uint64_t layerID, const String& key, double startTime)
</span><span class="lines">@@ -296,33 +294,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void coreAnimationDidCommitLayersCallback(CFRunLoopObserverRef, CFRunLoopActivity, void* context)
-{
- static_cast<RemoteLayerTreeDrawingAreaProxy*>(context)->coreAnimationDidCommitLayers();
-}
-
-void RemoteLayerTreeDrawingAreaProxy::scheduleCoreAnimationLayerCommitObserver()
-{
- if (m_layerCommitObserver)
- return;
-
- CFRunLoopRef runLoop = CFRunLoopGetCurrent();
-
- // Make sure we wake up the loop or the observer could be delayed until some other source fires.
- CFRunLoopWakeUp(runLoop);
-
- CFRunLoopObserverContext context = { 0, this, 0, 0, 0 };
- m_layerCommitObserver = adoptCF(CFRunLoopObserverCreate(0, kCFRunLoopBeforeWaiting | kCFRunLoopExit, true, DidCommitLayersRunLoopOrder, coreAnimationDidCommitLayersCallback, &context));
-
- CFRunLoopAddObserver(runLoop, m_layerCommitObserver.get(), kCFRunLoopCommonModes);
-}
-
</del><span class="cx"> void RemoteLayerTreeDrawingAreaProxy::coreAnimationDidCommitLayers()
</span><span class="cx"> {
</span><del>- if (m_layerCommitObserver) {
- CFRunLoopObserverInvalidate(m_layerCommitObserver.get());
- m_layerCommitObserver = nullptr;
- }
</del><ins>+ m_layerCommitObserver->invalidate();
</ins><span class="cx">
</span><span class="cx"> if (!m_webPageProxy->isValid())
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>