<!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>[166360] 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/166360">166360</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-03-27 09:47:58 -0700 (Thu, 27 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Connection::dispatchOneMessage() can be re-entered while handling Cmd-key menu
equivalents, ASSERT(!_data->_keyDownEventBeingResent)
https://bugs.webkit.org/show_bug.cgi?id=130767
<rdar://problem/16307487>
Source/WebCore:
Added a wrapper for RunLoop::initializeMainThread that also adds modal run loop
mode to it on Mac.
* CMakeLists.txt:
* WebCore.exp.in:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* platform/MainRunLoop.cpp: Added.
(WebCore::initializeMainRunLoop):
* platform/MainRunLoop.h: Added.
* platform/mac/MainRunLoop.mm: Added.
(WebCore::initializeMainRunLoop):
Source/WebKit/mac:
Reviewed by Darin Adler.
Switched to a WebCore wrapper for RunLoop::initializeMainRunLoop that adds
NSModalPanelRunLoopMode to RunLoop event source and timer modes.
* Carbon/CarbonWindowAdapter.mm: (+[CarbonWindowAdapter initialize]):
* History/WebBackForwardList.mm: (+[WebBackForwardList initialize]):
* History/WebHistoryItem.mm: (+[WebHistoryItem initialize]):
* Misc/WebCache.mm: (+[WebCache initialize]):
* Misc/WebElementDictionary.mm: (+[WebElementDictionary initialize]):
* Misc/WebIconDatabase.mm: (+[WebIconDatabase initialize]):
* Plugins/Hosted/WebHostedNetscapePluginView.mm: (+[WebHostedNetscapePluginView initialize]):
* Plugins/WebBaseNetscapePluginView.mm:
* Plugins/WebBasePluginPackage.mm:
* Plugins/WebNetscapePluginView.mm: (+[WebNetscapePluginView initialize]):
* WebCoreSupport/WebEditorClient.mm: (+[WebUndoStep initialize]):
* WebCoreSupport/WebFrameLoaderClient.mm:
* WebView/WebArchive.mm: (+[WebArchivePrivate initialize]):
* WebView/WebDataSource.mm: (+[WebDataSource initialize]):
* WebView/WebHTMLView.mm:
(+[WebHTMLViewPrivate initialize]):
(+[WebHTMLView initialize]):
* WebView/WebPreferences.mm: (+[WebPreferences initialize]):
* WebView/WebResource.mm: (+[WebResourcePrivate initialize]):
* WebView/WebTextIterator.mm: (+[WebTextIteratorPrivate initialize]):
* WebView/WebView.mm: (+[WebView initialize]):
* WebView/WebViewData.mm: (+[WebViewPrivate initialize]):
Source/WebKit2:
Reviewed by Darin Adler.
* Shared/WebKit2Initialize.cpp: (WebKit::InitializeWebKit2): Added NSModalPanelRunLoopMode
to RunLoop event source and timer modes.
Source/WTF:
Reviewed by Darin Adler.
Changed RunLoop to wake up and fire timers only in default run loop mode by default,
and added an ability to add more modes (can't use AppKit symbols in WTF).
In addition to this bug, the change also blocks modal alerts from appearing under
menus during menu tracking.
* wtf/RunLoop.h:
* wtf/cf/RunLoopCF.cpp:
(WTF::RunLoop::RunLoop):
(WTF::RunLoop::addModeForWakeUpAndTimers):
(WTF::RunLoop::TimerBase::start):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfRunLooph">trunk/Source/WTF/wtf/RunLoop.h</a></li>
<li><a href="#trunkSourceWTFwtfcfRunLoopCFcpp">trunk/Source/WTF/wtf/cf/RunLoopCF.cpp</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<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="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitmacCarbonCarbonWindowAdaptermm">trunk/Source/WebKit/mac/Carbon/CarbonWindowAdapter.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebBackForwardListmm">trunk/Source/WebKit/mac/History/WebBackForwardList.mm</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebHistoryItemmm">trunk/Source/WebKit/mac/History/WebHistoryItem.mm</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebCachemm">trunk/Source/WebKit/mac/Misc/WebCache.mm</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebElementDictionarymm">trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebIconDatabasemm">trunk/Source/WebKit/mac/Misc/WebIconDatabase.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedWebHostedNetscapePluginViewmm">trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebBaseNetscapePluginViewmm">trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebBasePluginPackagemm">trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebNetscapePluginViewmm">trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebEditorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebArchivemm">trunk/Source/WebKit/mac/WebView/WebArchive.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebDataSourcemm">trunk/Source/WebKit/mac/WebView/WebDataSource.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebResourcemm">trunk/Source/WebKit/mac/WebView/WebResource.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebTextIteratormm">trunk/Source/WebKit/mac/WebView/WebTextIterator.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewDatamm">trunk/Source/WebKit/mac/WebView/WebViewData.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebKit2Initializecpp">trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformMainRunLoopcpp">trunk/Source/WebCore/platform/MainRunLoop.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformMainRunLooph">trunk/Source/WebCore/platform/MainRunLoop.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacMainRunLoopmm">trunk/Source/WebCore/platform/mac/MainRunLoop.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WTF/ChangeLog 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-03-27 Alexey Proskuryakov <ap@apple.com>
+
+ Connection::dispatchOneMessage() can be re-entered while handling Cmd-key menu
+ equivalents, ASSERT(!_data->_keyDownEventBeingResent)
+ https://bugs.webkit.org/show_bug.cgi?id=130767
+ <rdar://problem/16307487>
+
+ Reviewed by Darin Adler.
+
+ Changed RunLoop to wake up and fire timers only in default run loop mode by default,
+ and added an ability to add more modes (can't use AppKit symbols in WTF).
+
+ In addition to this bug, the change also blocks modal alerts from appearing under
+ menus during menu tracking.
+
+ * wtf/RunLoop.h:
+ * wtf/cf/RunLoopCF.cpp:
+ (WTF::RunLoop::RunLoop):
+ (WTF::RunLoop::addModeForWakeUpAndTimers):
+ (WTF::RunLoop::TimerBase::start):
+
</ins><span class="cx"> 2014-03-26 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Removing the remaining Automake cruft.
</span></span></pre></div>
<a id="trunkSourceWTFwtfRunLooph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RunLoop.h (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RunLoop.h 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WTF/wtf/RunLoop.h 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -67,6 +67,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> WTF_EXPORT_PRIVATE void runForDuration(double duration);
</span><ins>+ WTF_EXPORT_PRIVATE void addModeForWakeUpAndTimers(CFStringRef);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> class TimerBase {
</span><span class="lines">@@ -145,6 +146,7 @@
</span><span class="cx"> static void performWork(void*);
</span><span class="cx"> RetainPtr<CFRunLoopRef> m_runLoop;
</span><span class="cx"> RetainPtr<CFRunLoopSourceRef> m_runLoopSource;
</span><ins>+ RetainPtr<CFMutableSetRef> m_additionalTimerModes;
</ins><span class="cx"> int m_nestingLevel;
</span><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> Mutex m_pipeLock;
</span></span></pre></div>
<a id="trunkSourceWTFwtfcfRunLoopCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/cf/RunLoopCF.cpp (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/cf/RunLoopCF.cpp 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WTF/wtf/cf/RunLoopCF.cpp 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> {
</span><span class="cx"> CFRunLoopSourceContext context = { 0, this, 0, 0, 0, 0, 0, 0, 0, performWork };
</span><span class="cx"> m_runLoopSource = adoptCF(CFRunLoopSourceCreate(kCFAllocatorDefault, 0, &context));
</span><del>- CFRunLoopAddSource(m_runLoop.get(), m_runLoopSource.get(), kCFRunLoopCommonModes);
</del><ins>+ CFRunLoopAddSource(m_runLoop.get(), m_runLoopSource.get(), kCFRunLoopDefaultMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RunLoop::~RunLoop()
</span><span class="lines">@@ -57,6 +57,14 @@
</span><span class="cx"> CFRunLoopRunInMode(kCFRunLoopDefaultMode, duration, true);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RunLoop::addModeForWakeUpAndTimers(CFStringRef mode)
+{
+ CFRunLoopAddSource(m_runLoop.get(), m_runLoopSource.get(), mode);
+ if (!m_additionalTimerModes)
+ m_additionalTimerModes = adoptCF(CFSetCreateMutable(0, 0, &kCFCopyStringSetCallBacks));
+ CFSetAddValue(m_additionalTimerModes.get(), mode);
+}
+
</ins><span class="cx"> void RunLoop::wakeUp()
</span><span class="cx"> {
</span><span class="cx"> CFRunLoopSourceSignal(m_runLoopSource.get());
</span><span class="lines">@@ -109,7 +117,12 @@
</span><span class="cx"> CFRunLoopTimerContext context = { 0, this, 0, 0, 0 };
</span><span class="cx"> CFTimeInterval repeatInterval = repeat ? nextFireInterval : 0;
</span><span class="cx"> m_timer = adoptCF(CFRunLoopTimerCreate(kCFAllocatorDefault, CFAbsoluteTimeGetCurrent() + nextFireInterval, repeatInterval, 0, 0, timerFired, &context));
</span><del>- CFRunLoopAddTimer(m_runLoop.m_runLoop.get(), m_timer.get(), kCFRunLoopCommonModes);
</del><ins>+ CFRunLoopAddTimer(m_runLoop.m_runLoop.get(), m_timer.get(), kCFRunLoopDefaultMode);
+ if (m_runLoop.m_additionalTimerModes) {
+ CFSetApplyFunction(m_runLoop.m_additionalTimerModes.get(), [](const void* mode, void* context) {
+ CFRunLoopAddTimer(static_cast<RunLoop::TimerBase*>(context)->m_runLoop.m_runLoop.get(), static_cast<RunLoop::TimerBase*>(context)->m_timer.get(), static_cast<CFStringRef>(mode));
+ }, this);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RunLoop::TimerBase::stop()
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -1803,6 +1803,7 @@
</span><span class="cx"> platform/LinkHash.cpp
</span><span class="cx"> platform/Logging.cpp
</span><span class="cx"> platform/MIMETypeRegistry.cpp
</span><ins>+ platform/MainRunLoop.cpp
</ins><span class="cx"> platform/MemoryPressureHandler.cpp
</span><span class="cx"> platform/NotImplemented.cpp
</span><span class="cx"> platform/PlatformEvent.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebCore/ChangeLog 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-03-27 Alexey Proskuryakov <ap@apple.com>
+
+ Connection::dispatchOneMessage() can be re-entered while handling Cmd-key menu
+ equivalents, ASSERT(!_data->_keyDownEventBeingResent)
+ https://bugs.webkit.org/show_bug.cgi?id=130767
+ <rdar://problem/16307487>
+
+ Added a wrapper for RunLoop::initializeMainThread that also adds modal run loop
+ mode to it on Mac.
+
+ * CMakeLists.txt:
+ * WebCore.exp.in:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/MainRunLoop.cpp: Added.
+ (WebCore::initializeMainRunLoop):
+ * platform/MainRunLoop.h: Added.
+ * platform/mac/MainRunLoop.mm: Added.
+ (WebCore::initializeMainRunLoop):
+
</ins><span class="cx"> 2014-03-27 Krzysztof Czech <k.czech@samsung.com>
</span><span class="cx">
</span><span class="cx"> AX: Returns const reference to static string.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -892,6 +892,7 @@
</span><span class="cx"> __ZN7WebCore21createCFURLFromBufferEPKcmPK7__CFURL
</span><span class="cx"> __ZN7WebCore21findEventWithKeyStateEPNS_5EventE
</span><span class="cx"> __ZN7WebCore21getCachedDOMStructureEPNS_17JSDOMGlobalObjectEPKN3JSC9ClassInfoE
</span><ins>+__ZN7WebCore21initializeMainRunLoopEv
</ins><span class="cx"> __ZN7WebCore21isBackForwardLoadTypeENS_13FrameLoadTypeE
</span><span class="cx"> __ZN7WebCore21mainThreadNormalWorldEv
</span><span class="cx"> __ZN7WebCore21markerTextForListItemEPNS_7ElementE
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -19218,6 +19218,7 @@
</span><span class="cx"> <ClInclude Include="..\platform\LocalizedStrings.h" />
</span><span class="cx"> <ClInclude Include="..\platform\Logging.h" />
</span><span class="cx"> <ClInclude Include="..\platform\MemoryPressureHandler.h" />
</span><ins>+ <ClInclude Include="..\platform\MainRunLoop.h" />
</ins><span class="cx"> <ClInclude Include="..\platform\MainThreadTask.h" />
</span><span class="cx"> <ClInclude Include="..\platform\MIMETypeRegistry.h" />
</span><span class="cx"> <ClInclude Include="..\platform\NotImplemented.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -8059,6 +8059,9 @@
</span><span class="cx"> <ClInclude Include="..\platform\MemoryPressureHandler.h">
</span><span class="cx"> <Filter>platform</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\platform\MainRunLoop.h">
+ <Filter>platform</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="..\platform\MainThreadTask.h">
</span><span class="cx"> <Filter>platform</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -5891,6 +5891,9 @@
</span><span class="cx"> E1ADEDD50E76BD60004A1A5E /* DOMMessagePortInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = E1ADEDD40E76BD60004A1A5E /* DOMMessagePortInternal.h */; };
</span><span class="cx"> E1ADEDDA0E76BD93004A1A5E /* JSMessagePort.h in Headers */ = {isa = PBXBuildFile; fileRef = E1ADEDD80E76BD93004A1A5E /* JSMessagePort.h */; };
</span><span class="cx"> E1ADEDDB0E76BD93004A1A5E /* JSMessagePort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1ADEDD90E76BD93004A1A5E /* JSMessagePort.cpp */; };
</span><ins>+ E1B0552318E3EA5900AED9D3 /* MainRunLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = E1B0552218E3EA5900AED9D3 /* MainRunLoop.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ E1B0552518E3EAB100AED9D3 /* MainRunLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1B0552418E3EAB100AED9D3 /* MainRunLoop.cpp */; };
+ E1B0552718E3EB6200AED9D3 /* MainRunLoop.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1B0552618E3EB6200AED9D3 /* MainRunLoop.mm */; };
</ins><span class="cx"> E1B25106152A0BAF0069B779 /* StylePropertyShorthand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1B25104152A0BAF0069B779 /* StylePropertyShorthand.cpp */; };
</span><span class="cx"> E1B25107152A0BB00069B779 /* StylePropertyShorthand.h in Headers */ = {isa = PBXBuildFile; fileRef = E1B25105152A0BAF0069B779 /* StylePropertyShorthand.h */; };
</span><span class="cx"> E1B4CD2510B322E200BFFD7E /* CredentialStorageMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1B4CD2410B322E200BFFD7E /* CredentialStorageMac.mm */; };
</span><span class="lines">@@ -13267,6 +13270,9 @@
</span><span class="cx"> E1ADEDD40E76BD60004A1A5E /* DOMMessagePortInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMMessagePortInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> E1ADEDD80E76BD93004A1A5E /* JSMessagePort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMessagePort.h; sourceTree = "<group>"; };
</span><span class="cx"> E1ADEDD90E76BD93004A1A5E /* JSMessagePort.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMessagePort.cpp; sourceTree = "<group>"; };
</span><ins>+ E1B0552218E3EA5900AED9D3 /* MainRunLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainRunLoop.h; sourceTree = "<group>"; };
+ E1B0552418E3EAB100AED9D3 /* MainRunLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MainRunLoop.cpp; sourceTree = "<group>"; };
+ E1B0552618E3EB6200AED9D3 /* MainRunLoop.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MainRunLoop.mm; sourceTree = "<group>"; };
</ins><span class="cx"> E1B25104152A0BAF0069B779 /* StylePropertyShorthand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StylePropertyShorthand.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E1B25105152A0BAF0069B779 /* StylePropertyShorthand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StylePropertyShorthand.h; sourceTree = "<group>"; };
</span><span class="cx"> E1B4CD2410B322E200BFFD7E /* CredentialStorageMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CredentialStorageMac.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -16092,6 +16098,7 @@
</span><span class="cx"> BC25B528131C6D3900180E10 /* LocalizedStringsMac.cpp */,
</span><span class="cx"> 1402645D0AFDC19B005919E2 /* LoggingMac.mm */,
</span><span class="cx"> CD641EBD1819B35900EE4C41 /* MediaTimeMac.cpp */,
</span><ins>+ E1B0552618E3EB6200AED9D3 /* MainRunLoop.mm */,
</ins><span class="cx"> CD641EBE1819B35900EE4C41 /* MediaTimeMac.h */,
</span><span class="cx"> 657EDA0A1385CBD8004E0645 /* MemoryPressureHandlerMac.mm */,
</span><span class="cx"> BC772C5D0C4EB3440083285F /* MIMETypeRegistryMac.mm */,
</span><span class="lines">@@ -20957,6 +20964,8 @@
</span><span class="cx"> 935207BD09BD410A00F2038D /* LocalizedStrings.h */,
</span><span class="cx"> A8239DFE09B3CF8A00B60641 /* Logging.cpp */,
</span><span class="cx"> A8239DFF09B3CF8A00B60641 /* Logging.h */,
</span><ins>+ E1B0552418E3EAB100AED9D3 /* MainRunLoop.cpp */,
+ E1B0552218E3EA5900AED9D3 /* MainRunLoop.h */,
</ins><span class="cx"> E187056216E54A0D00585E97 /* MainThreadTask.h */,
</span><span class="cx"> CDF2B003181F059C00F2B424 /* MediaDescription.h */,
</span><span class="cx"> CD641EC7181ED60100EE4C41 /* MediaSample.h */,
</span><span class="lines">@@ -22858,6 +22867,7 @@
</span><span class="cx"> 29A8122E0FBB9C1D00510293 /* AccessibilityARIAGridCell.h in Headers */,
</span><span class="cx"> 29A812330FBB9C1D00510293 /* AccessibilityARIAGridRow.h in Headers */,
</span><span class="cx"> 29A8123B0FBB9C1D00510293 /* AccessibilityImageMapLink.h in Headers */,
</span><ins>+ E1B0552318E3EA5900AED9D3 /* MainRunLoop.h in Headers */,
</ins><span class="cx"> 29A8122C0FBB9C1D00510293 /* AccessibilityList.h in Headers */,
</span><span class="cx"> 29A812430FBB9C1D00510293 /* AccessibilityListBox.h in Headers */,
</span><span class="cx"> 29A812420FBB9C1D00510293 /* AccessibilityListBoxOption.h in Headers */,
</span><span class="lines">@@ -28788,6 +28798,7 @@
</span><span class="cx"> 93C38C04164473DD00091EB2 /* ScrollingTreeFixedNode.mm in Sources */,
</span><span class="cx"> 0FC4E40F187F82E10045882C /* ScrollingTreeIOS.cpp in Sources */,
</span><span class="cx"> 1AAADDE314DC8C8F00AF64B3 /* ScrollingTreeNode.cpp in Sources */,
</span><ins>+ E1B0552518E3EAB100AED9D3 /* MainRunLoop.cpp in Sources */,
</ins><span class="cx"> 9391A99C1629D70000297330 /* ScrollingTreeScrollingNode.cpp in Sources */,
</span><span class="cx"> 0FC4E412187F82E10045882C /* ScrollingTreeScrollingNodeIOS.mm in Sources */,
</span><span class="cx"> 93C4A4161629DF5A00C3EB6E /* ScrollingTreeScrollingNodeMac.mm in Sources */,
</span><span class="lines">@@ -28933,6 +28944,7 @@
</span><span class="cx"> E139866315478474001E3F65 /* StyleResolver.cpp in Sources */,
</span><span class="cx"> E4DEAA1717A93DC3000E0430 /* StyleResolveTree.cpp in Sources */,
</span><span class="cx"> E4BBED4C14FCDBA1003F0B98 /* StyleRule.cpp in Sources */,
</span><ins>+ E1B0552718E3EB6200AED9D3 /* MainRunLoop.mm in Sources */,
</ins><span class="cx"> E4946EAE156E64DD00D3297F /* StyleRuleImport.cpp in Sources */,
</span><span class="cx"> A8EA800D0A19516E00A8EF5F /* StyleSheet.cpp in Sources */,
</span><span class="cx"> E4F9EEF2156D9FFA00D23E7E /* StyleSheetContents.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMainRunLoopcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/MainRunLoop.cpp (0 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MainRunLoop.cpp (rev 0)
+++ trunk/Source/WebCore/platform/MainRunLoop.cpp 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+/*
+ * Copyright (C) 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. AND ITS CONTRIBUTORS ``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 ITS 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 "MainRunLoop.h"
+
+#if !PLATFORM(MAC)
+
+#include <wtf/RunLoop.h>
+
+namespace WebCore {
+
+void initializeMainRunLoop()
+{
+ RunLoop::initializeMainRunLoop();
+}
+
+}
+
+#endif
</ins><span class="cx">Property changes on: trunk/Source/WebCore/platform/MainRunLoop.cpp
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreplatformMainRunLooph"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/MainRunLoop.h (0 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MainRunLoop.h (rev 0)
+++ trunk/Source/WebCore/platform/MainRunLoop.h 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+/*
+ * Copyright (C) 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. AND ITS CONTRIBUTORS ``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 ITS 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 MainRunLoop_h
+#define MainRunLoop_h
+
+namespace WebCore {
+
+void initializeMainRunLoop();
+
+} // namespace WebCore
+
+#endif // MainRunLoop_h
</ins><span class="cx">Property changes on: trunk/Source/WebCore/platform/MainRunLoop.h
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreplatformmacMainRunLoopmm"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/mac/MainRunLoop.mm (0 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/MainRunLoop.mm (rev 0)
+++ trunk/Source/WebCore/platform/mac/MainRunLoop.mm 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 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. AND ITS CONTRIBUTORS ``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 ITS 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 "MainRunLoop.h"
+
+#if PLATFORM(MAC)
+
+#include <wtf/RunLoop.h>
+
+namespace WebCore {
+
+void initializeMainRunLoop()
+{
+ RunLoop::initializeMainRunLoop();
+ RunLoop::main().addModeForWakeUpAndTimers((CFStringRef)NSModalPanelRunLoopMode);
+}
+
+}
+
+#endif
</ins><span class="cx">Property changes on: trunk/Source/WebCore/platform/mac/MainRunLoop.mm
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebKitmacCarbonCarbonWindowAdaptermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Carbon/CarbonWindowAdapter.mm (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Carbon/CarbonWindowAdapter.mm 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit/mac/Carbon/CarbonWindowAdapter.mm 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -72,10 +72,10 @@
</span><span class="cx"> #import <HIToolbox/HIView.h>
</span><span class="cx"> #import <assert.h>
</span><span class="cx">
</span><ins>+#import <WebCore/MainRunLoop.h>
</ins><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><del>-#import <wtf/RunLoop.h>
</del><span class="cx">
</span><span class="cx"> #import "WebKitLogging.h"
</span><span class="cx"> #import "WebNSObjectExtras.h"
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThreadToProcessMainThread();
</span><del>- RunLoop::initializeMainRunLoop();
</del><ins>+ WebCore::initializeMainRunLoop();
</ins><span class="cx"> WebCoreObjCFinalizeOnMainThread(self);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2014-03-27 Alexey Proskuryakov <ap@apple.com>
+
+ Connection::dispatchOneMessage() can be re-entered while handling Cmd-key menu
+ equivalents, ASSERT(!_data->_keyDownEventBeingResent)
+ https://bugs.webkit.org/show_bug.cgi?id=130767
+ <rdar://problem/16307487>
+
+ Reviewed by Darin Adler.
+
+ Switched to a WebCore wrapper for RunLoop::initializeMainRunLoop that adds
+ NSModalPanelRunLoopMode to RunLoop event source and timer modes.
+
+ * Carbon/CarbonWindowAdapter.mm: (+[CarbonWindowAdapter initialize]):
+ * History/WebBackForwardList.mm: (+[WebBackForwardList initialize]):
+ * History/WebHistoryItem.mm: (+[WebHistoryItem initialize]):
+ * Misc/WebCache.mm: (+[WebCache initialize]):
+ * Misc/WebElementDictionary.mm: (+[WebElementDictionary initialize]):
+ * Misc/WebIconDatabase.mm: (+[WebIconDatabase initialize]):
+ * Plugins/Hosted/WebHostedNetscapePluginView.mm: (+[WebHostedNetscapePluginView initialize]):
+ * Plugins/WebBaseNetscapePluginView.mm:
+ * Plugins/WebBasePluginPackage.mm:
+ * Plugins/WebNetscapePluginView.mm: (+[WebNetscapePluginView initialize]):
+ * WebCoreSupport/WebEditorClient.mm: (+[WebUndoStep initialize]):
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ * WebView/WebArchive.mm: (+[WebArchivePrivate initialize]):
+ * WebView/WebDataSource.mm: (+[WebDataSource initialize]):
+ * WebView/WebHTMLView.mm:
+ (+[WebHTMLViewPrivate initialize]):
+ (+[WebHTMLView initialize]):
+ * WebView/WebPreferences.mm: (+[WebPreferences initialize]):
+ * WebView/WebResource.mm: (+[WebResourcePrivate initialize]):
+ * WebView/WebTextIterator.mm: (+[WebTextIteratorPrivate initialize]):
+ * WebView/WebView.mm: (+[WebView initialize]):
+ * WebView/WebViewData.mm: (+[WebViewPrivate initialize]):
+
</ins><span class="cx"> 2014-03-26 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Propagate the hiddenFromInspector flag on ResourceRequest in
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebBackForwardListmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebBackForwardList.mm (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebBackForwardList.mm 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit/mac/History/WebBackForwardList.mm 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #import "WebViewPrivate.h"
</span><span class="cx"> #import <WebCore/BackForwardList.h>
</span><span class="cx"> #import <WebCore/HistoryItem.h>
</span><ins>+#import <WebCore/MainRunLoop.h>
</ins><span class="cx"> #import <WebCore/Page.h>
</span><span class="cx"> #import <WebCore/PageCache.h>
</span><span class="cx"> #import <WebCore/Settings.h>
</span><span class="lines">@@ -49,7 +50,6 @@
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><del>-#import <wtf/RunLoop.h>
</del><span class="cx"> #import <wtf/StdLibExtras.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThreadToProcessMainThread();
</span><del>- RunLoop::initializeMainRunLoop();
</del><ins>+ WebCore::initializeMainRunLoop();
</ins><span class="cx"> #endif
</span><span class="cx"> WebCoreObjCFinalizeOnMainThread(self);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryItemmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistoryItem.mm (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -45,14 +45,14 @@
</span><span class="cx"> #import "WebTypesInternal.h"
</span><span class="cx"> #import <WebCore/HistoryItem.h>
</span><span class="cx"> #import <WebCore/Image.h>
</span><del>-#import <WebCore/URL.h>
</del><ins>+#import <WebCore/MainRunLoop.h>
</ins><span class="cx"> #import <WebCore/PageCache.h>
</span><span class="cx"> #import <WebCore/ThreadCheck.h>
</span><ins>+#import <WebCore/URL.h>
</ins><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><del>-#import <wtf/RunLoop.h>
</del><span class="cx"> #import <wtf/StdLibExtras.h>
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThreadToProcessMainThread();
</span><del>- RunLoop::initializeMainRunLoop();
</del><ins>+ WebCore::initializeMainRunLoop();
</ins><span class="cx"> #endif
</span><span class="cx"> WebCoreObjCFinalizeOnMainThread(self);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebCachemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebCache.mm (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebCache.mm 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit/mac/Misc/WebCache.mm 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -32,10 +32,10 @@
</span><span class="cx"> #import "WebViewInternal.h"
</span><span class="cx"> #import <WebCore/ApplicationCacheStorage.h>
</span><span class="cx"> #import <WebCore/CrossOriginPreflightResultCache.h>
</span><ins>+#import <WebCore/MainRunLoop.h>
</ins><span class="cx"> #import <WebCore/MemoryCache.h>
</span><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><del>-#import <wtf/RunLoop.h>
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import "MemoryMeasure.h"
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThreadToProcessMainThread();
</span><del>- RunLoop::initializeMainRunLoop();
</del><ins>+ WebCore::initializeMainRunLoop();
</ins><span class="cx"> #endif
</span><span class="cx"> InitWebCoreSystemInterface();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebElementDictionarymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -39,12 +39,12 @@
</span><span class="cx"> #import <WebCore/Frame.h>
</span><span class="cx"> #import <WebCore/HitTestResult.h>
</span><span class="cx"> #import <WebCore/Image.h>
</span><ins>+#import <WebCore/MainRunLoop.h>
</ins><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><span class="cx"> #import <WebKit/DOMCore.h>
</span><span class="cx"> #import <WebKit/DOMExtensions.h>
</span><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><del>-#import <wtf/RunLoop.h>
</del><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThreadToProcessMainThread();
</span><del>- RunLoop::initializeMainRunLoop();
</del><ins>+ WebCore::initializeMainRunLoop();
</ins><span class="cx"> #endif
</span><span class="cx"> WebCoreObjCFinalizeOnMainThread(self);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebIconDatabasemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebIconDatabase.mm (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebIconDatabase.mm 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit/mac/Misc/WebIconDatabase.mm 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -41,11 +41,11 @@
</span><span class="cx"> #import <WebCore/IconDatabase.h>
</span><span class="cx"> #import <WebCore/Image.h>
</span><span class="cx"> #import <WebCore/IntSize.h>
</span><ins>+#import <WebCore/MainRunLoop.h>
</ins><span class="cx"> #import <WebCore/SharedBuffer.h>
</span><span class="cx"> #import <WebCore/ThreadCheck.h>
</span><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><del>-#import <wtf/RunLoop.h>
</del><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThreadToProcessMainThread();
</span><del>- RunLoop::initializeMainRunLoop();
</del><ins>+ WebCore::initializeMainRunLoop();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (WebIconDatabase *)sharedIconDatabase
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedWebHostedNetscapePluginViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #import <WebCore/FrameLoaderTypes.h>
</span><span class="cx"> #import <WebCore/FrameView.h>
</span><span class="cx"> #import <WebCore/HTMLPlugInElement.h>
</span><ins>+#import <WebCore/MainRunLoop.h>
</ins><span class="cx"> #import <WebCore/RenderEmbeddedObject.h>
</span><span class="cx"> #import <WebCore/ResourceError.h>
</span><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><span class="lines">@@ -51,7 +52,6 @@
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><span class="cx"> #import <wtf/ObjcRuntimeExtras.h>
</span><del>-#import <wtf/RunLoop.h>
</del><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThreadToProcessMainThread();
</span><del>- RunLoop::initializeMainRunLoop();
</del><ins>+ WebCore::initializeMainRunLoop();
</ins><span class="cx"> #endif
</span><span class="cx"> WebCoreObjCFinalizeOnMainThread(self);
</span><span class="cx"> WKSendUserChangeNotifications();
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebBaseNetscapePluginViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> #import <WebCore/Frame.h>
</span><span class="cx"> #import <WebCore/FrameLoader.h>
</span><span class="cx"> #import <WebCore/HTMLPlugInElement.h>
</span><ins>+#import <WebCore/MainRunLoop.h>
</ins><span class="cx"> #import <WebCore/Page.h>
</span><span class="cx"> #import <WebCore/ProtectionSpace.h>
</span><span class="cx"> #import <WebCore/RenderView.h>
</span><span class="lines">@@ -61,7 +62,6 @@
</span><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><del>-#import <wtf/RunLoop.h>
</del><span class="cx"> #import <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> #define LoginWindowDidSwitchFromUserNotification @"WebLoginWindowDidSwitchFromUserNotification"
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThreadToProcessMainThread();
</span><del>- RunLoop::initializeMainRunLoop();
</del><ins>+ WebCore::initializeMainRunLoop();
</ins><span class="cx"> WebCoreObjCFinalizeOnMainThread(self);
</span><span class="cx"> WKSendUserChangeNotifications();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebBasePluginPackagemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #import <WebKit/WebBasePluginPackage.h>
</span><span class="cx">
</span><span class="cx"> #import <algorithm>
</span><ins>+#import <WebCore/MainRunLoop.h>
</ins><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><span class="cx"> #import <WebKit/WebKitNSStringExtras.h>
</span><span class="cx"> #import <WebKit/WebNetscapePluginPackage.h>
</span><span class="lines">@@ -37,7 +38,6 @@
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><span class="cx"> #import <wtf/ObjcRuntimeExtras.h>
</span><del>-#import <wtf/RunLoop.h>
</del><span class="cx"> #import <wtf/Vector.h>
</span><span class="cx"> #import <wtf/text/CString.h>
</span><span class="cx">
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThreadToProcessMainThread();
</span><del>- RunLoop::initializeMainRunLoop();
</del><ins>+ WebCore::initializeMainRunLoop();
</ins><span class="cx"> #endif
</span><span class="cx"> WebCoreObjCFinalizeOnMainThread(self);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebNetscapePluginViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> #import <WebCore/FrameTree.h>
</span><span class="cx"> #import <WebCore/FrameView.h>
</span><span class="cx"> #import <WebCore/HTMLPlugInElement.h>
</span><ins>+#import <WebCore/MainRunLoop.h>
</ins><span class="cx"> #import <WebCore/Page.h>
</span><span class="cx"> #import <WebCore/PluginMainThreadScheduler.h>
</span><span class="cx"> #import <WebCore/ProxyServer.h>
</span><span class="lines">@@ -81,7 +82,6 @@
</span><span class="cx"> #import <runtime/JSLock.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><del>-#import <wtf/RunLoop.h>
</del><span class="cx"> #import <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> #define LoginWindowDidSwitchFromUserNotification @"WebLoginWindowDidSwitchFromUserNotification"
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThreadToProcessMainThread();
</span><del>- RunLoop::initializeMainRunLoop();
</del><ins>+ WebCore::initializeMainRunLoop();
</ins><span class="cx"> WebCoreObjCFinalizeOnMainThread(self);
</span><span class="cx"> WKSendUserChangeNotifications();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebEditorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx"> #import <WebCore/HTMLTextAreaElement.h>
</span><span class="cx"> #import <WebCore/KeyboardEvent.h>
</span><span class="cx"> #import <WebCore/LegacyWebArchive.h>
</span><ins>+#import <WebCore/MainRunLoop.h>
</ins><span class="cx"> #import <WebCore/Page.h>
</span><span class="cx"> #import <WebCore/PlatformKeyboardEvent.h>
</span><span class="cx"> #import <WebCore/Settings.h>
</span><span class="lines">@@ -70,7 +71,6 @@
</span><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><span class="cx"> #import <wtf/PassRefPtr.h>
</span><del>-#import <wtf/RunLoop.h>
</del><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThreadToProcessMainThread();
</span><del>- RunLoop::initializeMainRunLoop();
</del><ins>+ WebCore::initializeMainRunLoop();
</ins><span class="cx"> #endif
</span><span class="cx"> WebCoreObjCFinalizeOnMainThread(self);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx"> #import <WebCore/LoaderNSURLExtras.h>
</span><span class="cx"> #import <WebCore/MIMETypeRegistry.h>
</span><span class="cx"> #import <WebCore/MainFrame.h>
</span><ins>+#import <WebCore/MainRunLoop.h>
</ins><span class="cx"> #import <WebCore/MouseEvent.h>
</span><span class="cx"> #import <WebCore/Page.h>
</span><span class="cx"> #import <WebCore/PluginViewBase.h>
</span><span class="lines">@@ -128,7 +129,6 @@
</span><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><span class="cx"> #import <wtf/PassRefPtr.h>
</span><del>-#import <wtf/RunLoop.h>
</del><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
</span><span class="lines">@@ -2399,7 +2399,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThreadToProcessMainThread();
</span><del>- RunLoop::initializeMainRunLoop();
</del><ins>+ WebCore::initializeMainRunLoop();
</ins><span class="cx"> #endif
</span><span class="cx"> WebCoreObjCFinalizeOnMainThread(self);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebArchivemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebArchive.mm (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebArchive.mm 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit/mac/WebView/WebArchive.mm 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -36,10 +36,10 @@
</span><span class="cx"> #import <JavaScriptCore/InitializeThreading.h>
</span><span class="cx"> #import <WebCore/ArchiveResource.h>
</span><span class="cx"> #import <WebCore/LegacyWebArchive.h>
</span><ins>+#import <WebCore/MainRunLoop.h>
</ins><span class="cx"> #import <WebCore/ThreadCheck.h>
</span><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><del>-#import <wtf/RunLoop.h>
</del><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThreadToProcessMainThread();
</span><del>- RunLoop::initializeMainRunLoop();
</del><ins>+ WebCore::initializeMainRunLoop();
</ins><span class="cx"> #endif
</span><span class="cx"> WebCoreObjCFinalizeOnMainThread(self);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebDataSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebDataSource.mm (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> #import <WebCore/URL.h>
</span><span class="cx"> #import <WebCore/LegacyWebArchive.h>
</span><span class="cx"> #import <WebCore/MIMETypeRegistry.h>
</span><ins>+#import <WebCore/MainRunLoop.h>
</ins><span class="cx"> #import <WebCore/ResourceBuffer.h>
</span><span class="cx"> #import <WebCore/ResourceRequest.h>
</span><span class="cx"> #import <WebCore/SharedBuffer.h>
</span><span class="lines">@@ -65,7 +66,6 @@
</span><span class="cx"> #import <wtf/MainThread.h>
</span><span class="cx"> #import <wtf/RefPtr.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><del>-#import <wtf/RunLoop.h>
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import "WebPDFViewIOS.h"
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThreadToProcessMainThread();
</span><del>- RunLoop::initializeMainRunLoop();
</del><ins>+ WebCore::initializeMainRunLoop();
</ins><span class="cx"> #endif
</span><span class="cx"> WebCoreObjCFinalizeOnMainThread(self);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -101,6 +101,7 @@
</span><span class="cx"> #import <WebCore/LegacyWebArchive.h>
</span><span class="cx"> #import <WebCore/MIMETypeRegistry.h>
</span><span class="cx"> #import <WebCore/MainFrame.h>
</span><ins>+#import <WebCore/MainRunLoop.h>
</ins><span class="cx"> #import <WebCore/Page.h>
</span><span class="cx"> #import <WebCore/Range.h>
</span><span class="cx"> #import <WebCore/RenderView.h>
</span><span class="lines">@@ -124,7 +125,6 @@
</span><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><span class="cx"> #import <wtf/ObjcRuntimeExtras.h>
</span><del>-#import <wtf/RunLoop.h>
</del><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> #import <AppKit/NSAccessibility.h>
</span><span class="lines">@@ -643,7 +643,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThreadToProcessMainThread();
</span><del>- RunLoop::initializeMainRunLoop();
</del><ins>+ WebCore::initializeMainRunLoop();
</ins><span class="cx"> #endif
</span><span class="cx"> WebCoreObjCFinalizeOnMainThread(self);
</span><span class="cx">
</span><span class="lines">@@ -2474,7 +2474,7 @@
</span><span class="cx"> returnTypes:[[self class] _insertablePasteboardTypes]];
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThreadToProcessMainThread();
</span><del>- RunLoop::initializeMainRunLoop();
</del><ins>+ WebCore::initializeMainRunLoop();
</ins><span class="cx"> #endif
</span><span class="cx"> WebCoreObjCFinalizeOnMainThread(self);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -42,12 +42,12 @@
</span><span class="cx"> #import "WebSystemInterface.h"
</span><span class="cx"> #import <WebCore/ApplicationCacheStorage.h>
</span><span class="cx"> #import <WebCore/AudioSession.h>
</span><ins>+#import <WebCore/MainRunLoop.h>
</ins><span class="cx"> #import <WebCore/NetworkStorageSession.h>
</span><span class="cx"> #import <WebCore/ResourceHandle.h>
</span><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><del>-#import <wtf/RunLoop.h>
</del><span class="cx">
</span><span class="cx"> enum {
</span><span class="cx"> NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain = 3
</span><span class="lines">@@ -392,7 +392,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThreadToProcessMainThread();
</span><del>- RunLoop::initializeMainRunLoop();
</del><ins>+ WebCore::initializeMainRunLoop();
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> static unsigned defaultMaximumImageSize = 20 * 1024 * 1024;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebResourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebResource.mm (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebResource.mm 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit/mac/WebView/WebResource.mm 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -38,13 +38,13 @@
</span><span class="cx"> #import <wtf/PassRefPtr.h>
</span><span class="cx"> #import <WebCore/ArchiveResource.h>
</span><span class="cx"> #import <WebCore/LegacyWebArchive.h>
</span><ins>+#import <WebCore/MainRunLoop.h>
</ins><span class="cx"> #import <WebCore/RuntimeApplicationChecks.h>
</span><span class="cx"> #import <WebCore/TextEncoding.h>
</span><span class="cx"> #import <WebCore/ThreadCheck.h>
</span><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><span class="cx"> #import <WebCore/WebCoreURLResponse.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><del>-#import <wtf/RunLoop.h>
</del><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThreadToProcessMainThread();
</span><del>- RunLoop::initializeMainRunLoop();
</del><ins>+ WebCore::initializeMainRunLoop();
</ins><span class="cx"> #endif
</span><span class="cx"> WebCoreObjCFinalizeOnMainThread(self);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebTextIteratormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebTextIterator.mm (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebTextIterator.mm 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit/mac/WebView/WebTextIterator.mm 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -28,11 +28,11 @@
</span><span class="cx"> #import "DOMNodeInternal.h"
</span><span class="cx"> #import "DOMRangeInternal.h"
</span><span class="cx"> #import "WebTypesInternal.h"
</span><ins>+#import <WebCore/MainRunLoop.h>
</ins><span class="cx"> #import <WebCore/TextIterator.h>
</span><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><del>-#import <wtf/RunLoop.h>
</del><span class="cx"> #import <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> @interface WebTextIteratorPrivate : NSObject {
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThreadToProcessMainThread();
</span><del>- RunLoop::initializeMainRunLoop();
</del><ins>+ WebCore::initializeMainRunLoop();
</ins><span class="cx"> #endif
</span><span class="cx"> WebCoreObjCFinalizeOnMainThread(self);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -148,6 +148,7 @@
</span><span class="cx"> #import <WebCore/Logging.h>
</span><span class="cx"> #import <WebCore/MIMETypeRegistry.h>
</span><span class="cx"> #import <WebCore/MainFrame.h>
</span><ins>+#import <WebCore/MainRunLoop.h>
</ins><span class="cx"> #import <WebCore/MemoryPressureHandler.h>
</span><span class="cx"> #import <WebCore/NodeList.h>
</span><span class="cx"> #import <WebCore/Notification.h>
</span><span class="lines">@@ -195,7 +196,6 @@
</span><span class="cx"> #import <wtf/ObjcRuntimeExtras.h>
</span><span class="cx"> #import <wtf/RefCountedLeakCounter.h>
</span><span class="cx"> #import <wtf/RefPtr.h>
</span><del>-#import <wtf/RunLoop.h>
</del><span class="cx"> #import <wtf/StdLibExtras.h>
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="lines">@@ -4697,7 +4697,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThreadToProcessMainThread();
</span><del>- RunLoop::initializeMainRunLoop();
</del><ins>+ WebCore::initializeMainRunLoop();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewDatamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewData.mm (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewData.mm 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit/mac/WebView/WebViewData.mm 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -33,12 +33,12 @@
</span><span class="cx"> #import "WebPreferenceKeysPrivate.h"
</span><span class="cx"> #import "WebViewGroup.h"
</span><span class="cx"> #import <WebCore/AlternativeTextUIController.h>
</span><ins>+#import <WebCore/HistoryItem.h>
+#import <WebCore/MainRunLoop.h>
</ins><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><del>-#import <WebCore/HistoryItem.h>
</del><span class="cx"> #import <objc/objc-auto.h>
</span><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><del>-#import <wtf/RunLoop.h>
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import "WebGeolocationProviderIOS.h"
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThreadToProcessMainThread();
</span><del>- RunLoop::initializeMainRunLoop();
</del><ins>+ WebCore::initializeMainRunLoop();
</ins><span class="cx"> #endif
</span><span class="cx"> WebCoreObjCFinalizeOnMainThread(self);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-03-27 Alexey Proskuryakov <ap@apple.com>
+
+ Connection::dispatchOneMessage() can be re-entered while handling Cmd-key menu
+ equivalents, ASSERT(!_data->_keyDownEventBeingResent)
+ https://bugs.webkit.org/show_bug.cgi?id=130767
+ <rdar://problem/16307487>
+
+ Reviewed by Darin Adler.
+
+ * Shared/WebKit2Initialize.cpp: (WebKit::InitializeWebKit2): Added NSModalPanelRunLoopMode
+ to RunLoop event source and timer modes.
+
</ins><span class="cx"> 2014-03-27 Jae Hyun Park <jaepark@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove LayerTreeContextCairo.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebKit2Initializecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp (166359 => 166360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp 2014-03-27 16:43:19 UTC (rev 166359)
+++ trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp 2014-03-27 16:47:58 UTC (rev 166360)
</span><span class="lines">@@ -28,9 +28,9 @@
</span><span class="cx">
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include <WebCore/Logging.h>
</span><ins>+#include <WebCore/MainRunLoop.h>
</ins><span class="cx"> #include <runtime/InitializeThreading.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><del>-#include <wtf/RunLoop.h>
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #include "WebSystemInterface.h"
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThread();
</span><del>- RunLoop::initializeMainRunLoop();
</del><ins>+ WebCore::initializeMainRunLoop();
</ins><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> WebCore::initializeLoggingChannelsIfNecessary();
</span></span></pre>
</div>
</div>
</body>
</html>