Changeset 166360 in webkit


Ignore:
Timestamp:
Mar 27, 2014 9:47:58 AM (10 years ago)
Author:
ap@apple.com
Message:

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):

Location:
trunk/Source
Files:
3 added
32 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r166287 r166360  
     12014-03-27  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Connection::dispatchOneMessage() can be re-entered while handling Cmd-key menu
     4        equivalents, ASSERT(!_data->_keyDownEventBeingResent)
     5        https://bugs.webkit.org/show_bug.cgi?id=130767
     6        <rdar://problem/16307487>
     7
     8        Reviewed by Darin Adler.
     9
     10        Changed RunLoop to wake up and fire timers only in default run loop mode by default,
     11        and added an ability to add more modes (can't use AppKit symbols in WTF).
     12
     13        In addition to this bug, the change also blocks modal alerts from appearing under
     14        menus during menu tracking.
     15
     16        * wtf/RunLoop.h:
     17        * wtf/cf/RunLoopCF.cpp:
     18        (WTF::RunLoop::RunLoop):
     19        (WTF::RunLoop::addModeForWakeUpAndTimers):
     20        (WTF::RunLoop::TimerBase::start):
     21
    1222014-03-26  Zan Dobersek  <zdobersek@igalia.com>
    223

  • trunk/Source/WTF/wtf/RunLoop.h

    r166039 r166360  
    6868#if PLATFORM(COCOA)
    6969    WTF_EXPORT_PRIVATE void runForDuration(double duration);
     70    WTF_EXPORT_PRIVATE void addModeForWakeUpAndTimers(CFStringRef);
    7071#endif
    7172   
    … …  
    146147    RetainPtr<CFRunLoopRef> m_runLoop;
    147148    RetainPtr<CFRunLoopSourceRef> m_runLoopSource;
     149    RetainPtr<CFMutableSetRef> m_additionalTimerModes;
    148150    int m_nestingLevel;
    149151#elif PLATFORM(EFL)

  • trunk/Source/WTF/wtf/cf/RunLoopCF.cpp

    r165746 r166360  
    4545    CFRunLoopSourceContext context = { 0, this, 0, 0, 0, 0, 0, 0, 0, performWork };
    4646    m_runLoopSource = adoptCF(CFRunLoopSourceCreate(kCFAllocatorDefault, 0, &context));
    47     CFRunLoopAddSource(m_runLoop.get(), m_runLoopSource.get(), kCFRunLoopCommonModes);
     47    CFRunLoopAddSource(m_runLoop.get(), m_runLoopSource.get(), kCFRunLoopDefaultMode);
    4848}
    4949
    … …  
    5656{
    5757    CFRunLoopRunInMode(kCFRunLoopDefaultMode, duration, true);
     58}
     59
     60void RunLoop::addModeForWakeUpAndTimers(CFStringRef mode)
     61{
     62    CFRunLoopAddSource(m_runLoop.get(), m_runLoopSource.get(), mode);
     63    if (!m_additionalTimerModes)
     64        m_additionalTimerModes = adoptCF(CFSetCreateMutable(0, 0, &kCFCopyStringSetCallBacks));
     65    CFSetAddValue(m_additionalTimerModes.get(), mode);
    5866}
    5967
    … …  
    110118    CFTimeInterval repeatInterval = repeat ? nextFireInterval : 0;
    111119    m_timer = adoptCF(CFRunLoopTimerCreate(kCFAllocatorDefault, CFAbsoluteTimeGetCurrent() + nextFireInterval, repeatInterval, 0, 0, timerFired, &context));
    112     CFRunLoopAddTimer(m_runLoop.m_runLoop.get(), m_timer.get(), kCFRunLoopCommonModes);
     120    CFRunLoopAddTimer(m_runLoop.m_runLoop.get(), m_timer.get(), kCFRunLoopDefaultMode);
     121    if (m_runLoop.m_additionalTimerModes) {
     122        CFSetApplyFunction(m_runLoop.m_additionalTimerModes.get(), [](const void* mode, void* context) {
     123            CFRunLoopAddTimer(static_cast<RunLoop::TimerBase*>(context)->m_runLoop.m_runLoop.get(), static_cast<RunLoop::TimerBase*>(context)->m_timer.get(), static_cast<CFStringRef>(mode));
     124        }, this);
     125    }
    113126}
    114127

  • trunk/Source/WebCore/CMakeLists.txt

    r166301 r166360  
    18041804    platform/Logging.cpp
    18051805    platform/MIMETypeRegistry.cpp
     1806    platform/MainRunLoop.cpp
    18061807    platform/MemoryPressureHandler.cpp
    18071808    platform/NotImplemented.cpp

  • trunk/Source/WebCore/ChangeLog

    r166358 r166360  
     12014-03-27  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Connection::dispatchOneMessage() can be re-entered while handling Cmd-key menu
     4        equivalents, ASSERT(!_data->_keyDownEventBeingResent)
     5        https://bugs.webkit.org/show_bug.cgi?id=130767
     6        <rdar://problem/16307487>
     7
     8        Added a wrapper for RunLoop::initializeMainThread that also adds modal run loop
     9        mode to it on Mac.
     10
     11        * CMakeLists.txt:
     12        * WebCore.exp.in:
     13        * WebCore.vcxproj/WebCore.vcxproj:
     14        * WebCore.vcxproj/WebCore.vcxproj.filters:
     15        * WebCore.xcodeproj/project.pbxproj:
     16        * platform/MainRunLoop.cpp: Added.
     17        (WebCore::initializeMainRunLoop):
     18        * platform/MainRunLoop.h: Added.
     19        * platform/mac/MainRunLoop.mm: Added.
     20        (WebCore::initializeMainRunLoop):
     21
    1222014-03-27  Krzysztof Czech  <k.czech@samsung.com>
    223

  • trunk/Source/WebCore/WebCore.exp.in

    r166348 r166360  
    893893__ZN7WebCore21findEventWithKeyStateEPNS_5EventE
    894894__ZN7WebCore21getCachedDOMStructureEPNS_17JSDOMGlobalObjectEPKN3JSC9ClassInfoE
     895__ZN7WebCore21initializeMainRunLoopEv
    895896__ZN7WebCore21isBackForwardLoadTypeENS_13FrameLoadTypeE
    896897__ZN7WebCore21mainThreadNormalWorldEv

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r166301 r166360  
    1921919219    <ClInclude Include="..\platform\Logging.h" />
    1922019220    <ClInclude Include="..\platform\MemoryPressureHandler.h" />
     19221    <ClInclude Include="..\platform\MainRunLoop.h" />
    1922119222    <ClInclude Include="..\platform\MainThreadTask.h" />
    1922219223    <ClInclude Include="..\platform\MIMETypeRegistry.h" />

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

    r166221 r166360  
    80608060      <Filter>platform</Filter>
    80618061    </ClInclude>
     8062    <ClInclude Include="..\platform\MainRunLoop.h">
     8063      <Filter>platform</Filter>
     8064    </ClInclude>
    80628065    <ClInclude Include="..\platform\MainThreadTask.h">
    80638066      <Filter>platform</Filter>

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r166301 r166360  
    58925892                E1ADEDDA0E76BD93004A1A5E /* JSMessagePort.h in Headers */ = {isa = PBXBuildFile; fileRef = E1ADEDD80E76BD93004A1A5E /* JSMessagePort.h */; };
    58935893                E1ADEDDB0E76BD93004A1A5E /* JSMessagePort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1ADEDD90E76BD93004A1A5E /* JSMessagePort.cpp */; };
     5894                E1B0552318E3EA5900AED9D3 /* MainRunLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = E1B0552218E3EA5900AED9D3 /* MainRunLoop.h */; settings = {ATTRIBUTES = (Private, ); }; };
     5895                E1B0552518E3EAB100AED9D3 /* MainRunLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1B0552418E3EAB100AED9D3 /* MainRunLoop.cpp */; };
     5896                E1B0552718E3EB6200AED9D3 /* MainRunLoop.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1B0552618E3EB6200AED9D3 /* MainRunLoop.mm */; };
    58945897                E1B25106152A0BAF0069B779 /* StylePropertyShorthand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1B25104152A0BAF0069B779 /* StylePropertyShorthand.cpp */; };
    58955898                E1B25107152A0BB00069B779 /* StylePropertyShorthand.h in Headers */ = {isa = PBXBuildFile; fileRef = E1B25105152A0BAF0069B779 /* StylePropertyShorthand.h */; };
    … …  
    1326813271                E1ADEDD80E76BD93004A1A5E /* JSMessagePort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMessagePort.h; sourceTree = "<group>"; };
    1326913272                E1ADEDD90E76BD93004A1A5E /* JSMessagePort.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMessagePort.cpp; sourceTree = "<group>"; };
     13273                E1B0552218E3EA5900AED9D3 /* MainRunLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainRunLoop.h; sourceTree = "<group>"; };
     13274                E1B0552418E3EAB100AED9D3 /* MainRunLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MainRunLoop.cpp; sourceTree = "<group>"; };
     13275                E1B0552618E3EB6200AED9D3 /* MainRunLoop.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MainRunLoop.mm; sourceTree = "<group>"; };
    1327013276                E1B25104152A0BAF0069B779 /* StylePropertyShorthand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StylePropertyShorthand.cpp; sourceTree = "<group>"; };
    1327113277                E1B25105152A0BAF0069B779 /* StylePropertyShorthand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StylePropertyShorthand.h; sourceTree = "<group>"; };
    … …  
    1609316099                                1402645D0AFDC19B005919E2 /* LoggingMac.mm */,
    1609416100                                CD641EBD1819B35900EE4C41 /* MediaTimeMac.cpp */,
     16101                                E1B0552618E3EB6200AED9D3 /* MainRunLoop.mm */,
    1609516102                                CD641EBE1819B35900EE4C41 /* MediaTimeMac.h */,
    1609616103                                657EDA0A1385CBD8004E0645 /* MemoryPressureHandlerMac.mm */,
    … …  
    2095820965                                A8239DFE09B3CF8A00B60641 /* Logging.cpp */,
    2095920966                                A8239DFF09B3CF8A00B60641 /* Logging.h */,
     20967                                E1B0552418E3EAB100AED9D3 /* MainRunLoop.cpp */,
     20968                                E1B0552218E3EA5900AED9D3 /* MainRunLoop.h */,
    2096020969                                E187056216E54A0D00585E97 /* MainThreadTask.h */,
    2096120970                                CDF2B003181F059C00F2B424 /* MediaDescription.h */,
    … …  
    2285922868                                29A812330FBB9C1D00510293 /* AccessibilityARIAGridRow.h in Headers */,
    2286022869                                29A8123B0FBB9C1D00510293 /* AccessibilityImageMapLink.h in Headers */,
     22870                                E1B0552318E3EA5900AED9D3 /* MainRunLoop.h in Headers */,
    2286122871                                29A8122C0FBB9C1D00510293 /* AccessibilityList.h in Headers */,
    2286222872                                29A812430FBB9C1D00510293 /* AccessibilityListBox.h in Headers */,
    … …  
    2878928799                                0FC4E40F187F82E10045882C /* ScrollingTreeIOS.cpp in Sources */,
    2879028800                                1AAADDE314DC8C8F00AF64B3 /* ScrollingTreeNode.cpp in Sources */,
     28801                                E1B0552518E3EAB100AED9D3 /* MainRunLoop.cpp in Sources */,
    2879128802                                9391A99C1629D70000297330 /* ScrollingTreeScrollingNode.cpp in Sources */,
    2879228803                                0FC4E412187F82E10045882C /* ScrollingTreeScrollingNodeIOS.mm in Sources */,
    … …  
    2893428945                                E4DEAA1717A93DC3000E0430 /* StyleResolveTree.cpp in Sources */,
    2893528946                                E4BBED4C14FCDBA1003F0B98 /* StyleRule.cpp in Sources */,
     28947                                E1B0552718E3EB6200AED9D3 /* MainRunLoop.mm in Sources */,
    2893628948                                E4946EAE156E64DD00D3297F /* StyleRuleImport.cpp in Sources */,
    2893728949                                A8EA800D0A19516E00A8EF5F /* StyleSheet.cpp in Sources */,

  • trunk/Source/WebKit/mac/Carbon/CarbonWindowAdapter.mm

    r165676 r166360  
    7373#import <assert.h>
    7474
     75#import <WebCore/MainRunLoop.h>
    7576#import <WebCore/WebCoreObjCExtras.h>
    7677#import <runtime/InitializeThreading.h>
    7778#import <wtf/MainThread.h>
    78 #import <wtf/RunLoop.h>
    7979
    8080#import "WebKitLogging.h"
    … …  
    273273    JSC::initializeThreading();
    274274    WTF::initializeMainThreadToProcessMainThread();
    275     RunLoop::initializeMainRunLoop();
     275    WebCore::initializeMainRunLoop();
    276276    WebCoreObjCFinalizeOnMainThread(self);
    277277}

  • trunk/Source/WebKit/mac/ChangeLog

    r166317 r166360  
     12014-03-27  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Connection::dispatchOneMessage() can be re-entered while handling Cmd-key menu
     4        equivalents, ASSERT(!_data->_keyDownEventBeingResent)
     5        https://bugs.webkit.org/show_bug.cgi?id=130767
     6        <rdar://problem/16307487>
     7
     8        Reviewed by Darin Adler.
     9
     10        Switched to a WebCore wrapper for RunLoop::initializeMainRunLoop that adds
     11        NSModalPanelRunLoopMode to RunLoop event source and timer modes.
     12
     13        * Carbon/CarbonWindowAdapter.mm: (+[CarbonWindowAdapter initialize]):
     14        * History/WebBackForwardList.mm: (+[WebBackForwardList initialize]):
     15        * History/WebHistoryItem.mm: (+[WebHistoryItem initialize]):
     16        * Misc/WebCache.mm: (+[WebCache initialize]):
     17        * Misc/WebElementDictionary.mm: (+[WebElementDictionary initialize]):
     18        * Misc/WebIconDatabase.mm: (+[WebIconDatabase initialize]):
     19        * Plugins/Hosted/WebHostedNetscapePluginView.mm: (+[WebHostedNetscapePluginView initialize]):
     20        * Plugins/WebBaseNetscapePluginView.mm:
     21        * Plugins/WebBasePluginPackage.mm:
     22        * Plugins/WebNetscapePluginView.mm: (+[WebNetscapePluginView initialize]):
     23        * WebCoreSupport/WebEditorClient.mm: (+[WebUndoStep initialize]):
     24        * WebCoreSupport/WebFrameLoaderClient.mm:
     25        * WebView/WebArchive.mm: (+[WebArchivePrivate initialize]):
     26        * WebView/WebDataSource.mm: (+[WebDataSource initialize]):
     27        * WebView/WebHTMLView.mm:
     28        (+[WebHTMLViewPrivate initialize]):
     29        (+[WebHTMLView initialize]):
     30        * WebView/WebPreferences.mm: (+[WebPreferences initialize]):
     31        * WebView/WebResource.mm: (+[WebResourcePrivate initialize]):
     32        * WebView/WebTextIterator.mm: (+[WebTextIteratorPrivate initialize]):
     33        * WebView/WebView.mm: (+[WebView initialize]):
     34        * WebView/WebViewData.mm: (+[WebViewPrivate initialize]):
     35
    1362014-03-26  Timothy Hatcher  <timothy@apple.com>
    237

  • trunk/Source/WebKit/mac/History/WebBackForwardList.mm

    r165676 r166360  
    4141#import <WebCore/BackForwardList.h>
    4242#import <WebCore/HistoryItem.h>
     43#import <WebCore/MainRunLoop.h>
    4344#import <WebCore/Page.h>
    4445#import <WebCore/PageCache.h>
    … …  
    5051#import <wtf/MainThread.h>
    5152#import <wtf/RetainPtr.h>
    52 #import <wtf/RunLoop.h>
    5353#import <wtf/StdLibExtras.h>
    5454
    … …  
    107107    JSC::initializeThreading();
    108108    WTF::initializeMainThreadToProcessMainThread();
    109     RunLoop::initializeMainRunLoop();
     109    WebCore::initializeMainRunLoop();
    110110#endif
    111111    WebCoreObjCFinalizeOnMainThread(self);

  • trunk/Source/WebKit/mac/History/WebHistoryItem.mm

    r165676 r166360  
    4646#import <WebCore/HistoryItem.h>
    4747#import <WebCore/Image.h>
    48 #import <WebCore/URL.h>
     48#import <WebCore/MainRunLoop.h>
    4949#import <WebCore/PageCache.h>
    5050#import <WebCore/ThreadCheck.h>
     51#import <WebCore/URL.h>
    5152#import <WebCore/WebCoreObjCExtras.h>
    5253#import <runtime/InitializeThreading.h>
    5354#import <wtf/Assertions.h>
    5455#import <wtf/MainThread.h>
    55 #import <wtf/RunLoop.h>
    5656#import <wtf/StdLibExtras.h>
    5757#import <wtf/text/WTFString.h>
    … …  
    129129    JSC::initializeThreading();
    130130    WTF::initializeMainThreadToProcessMainThread();
    131     RunLoop::initializeMainRunLoop();
     131    WebCore::initializeMainRunLoop();
    132132#endif
    133133    WebCoreObjCFinalizeOnMainThread(self);

  • trunk/Source/WebKit/mac/Misc/WebCache.mm

    r165676 r166360  
    3333#import <WebCore/ApplicationCacheStorage.h>
    3434#import <WebCore/CrossOriginPreflightResultCache.h>
     35#import <WebCore/MainRunLoop.h>
    3536#import <WebCore/MemoryCache.h>
    3637#import <runtime/InitializeThreading.h>
    3738#import <wtf/MainThread.h>
    38 #import <wtf/RunLoop.h>
    3939
    4040#if PLATFORM(IOS)
    … …  
    5959    JSC::initializeThreading();
    6060    WTF::initializeMainThreadToProcessMainThread();
    61     RunLoop::initializeMainRunLoop();
     61    WebCore::initializeMainRunLoop();
    6262#endif
    6363    InitWebCoreSystemInterface();   

  • trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm

    r165676 r166360  
    4040#import <WebCore/HitTestResult.h>
    4141#import <WebCore/Image.h>
     42#import <WebCore/MainRunLoop.h>
    4243#import <WebCore/WebCoreObjCExtras.h>
    4344#import <WebKit/DOMCore.h>
    … …  
    4546#import <runtime/InitializeThreading.h>
    4647#import <wtf/MainThread.h>
    47 #import <wtf/RunLoop.h>
    4848
    4949using namespace WebCore;
    … …  
    6969    JSC::initializeThreading();
    7070    WTF::initializeMainThreadToProcessMainThread();
    71     RunLoop::initializeMainRunLoop();
     71    WebCore::initializeMainRunLoop();
    7272#endif
    7373    WebCoreObjCFinalizeOnMainThread(self);

  • trunk/Source/WebKit/mac/Misc/WebIconDatabase.mm

    r165676 r166360  
    4242#import <WebCore/Image.h>
    4343#import <WebCore/IntSize.h>
     44#import <WebCore/MainRunLoop.h>
    4445#import <WebCore/SharedBuffer.h>
    4546#import <WebCore/ThreadCheck.h>
    4647#import <runtime/InitializeThreading.h>
    4748#import <wtf/MainThread.h>
    48 #import <wtf/RunLoop.h>
    4949
    5050using namespace WebCore;
    … …  
    9393    JSC::initializeThreading();
    9494    WTF::initializeMainThreadToProcessMainThread();
    95     RunLoop::initializeMainRunLoop();
     95    WebCore::initializeMainRunLoop();
    9696}
    9797

  • trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm

    r163218 r166360  
    4444#import <WebCore/FrameView.h>
    4545#import <WebCore/HTMLPlugInElement.h>
     46#import <WebCore/MainRunLoop.h>
    4647#import <WebCore/RenderEmbeddedObject.h>
    4748#import <WebCore/ResourceError.h>
    … …  
    5253#import <wtf/MainThread.h>
    5354#import <wtf/ObjcRuntimeExtras.h>
    54 #import <wtf/RunLoop.h>
    5555
    5656using namespace WebCore;
    … …  
    7575    JSC::initializeThreading();
    7676    WTF::initializeMainThreadToProcessMainThread();
    77     RunLoop::initializeMainRunLoop();
     77    WebCore::initializeMainRunLoop();
    7878#endif
    7979    WebCoreObjCFinalizeOnMainThread(self);

  • trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm

    r165676 r166360  
    5252#import <WebCore/FrameLoader.h>
    5353#import <WebCore/HTMLPlugInElement.h>
     54#import <WebCore/MainRunLoop.h>
    5455#import <WebCore/Page.h>
    5556#import <WebCore/ProtectionSpace.h>
    … …  
    6263#import <wtf/Assertions.h>
    6364#import <wtf/MainThread.h>
    64 #import <wtf/RunLoop.h>
    6565#import <wtf/text/CString.h>
    6666
    … …  
    7676    JSC::initializeThreading();
    7777    WTF::initializeMainThreadToProcessMainThread();
    78     RunLoop::initializeMainRunLoop();
     78    WebCore::initializeMainRunLoop();
    7979    WebCoreObjCFinalizeOnMainThread(self);
    8080    WKSendUserChangeNotifications();

  • trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm

    r165676 r166360  
    3030
    3131#import <algorithm>
     32#import <WebCore/MainRunLoop.h>
    3233#import <WebCore/WebCoreObjCExtras.h>
    3334#import <WebKit/WebKitNSStringExtras.h>
    … …  
    3839#import <wtf/MainThread.h>
    3940#import <wtf/ObjcRuntimeExtras.h>
    40 #import <wtf/RunLoop.h>
    4141#import <wtf/Vector.h>
    4242#import <wtf/text/CString.h>
    … …  
    7070    JSC::initializeThreading();
    7171    WTF::initializeMainThreadToProcessMainThread();
    72     RunLoop::initializeMainRunLoop();
     72    WebCore::initializeMainRunLoop();
    7373#endif
    7474    WebCoreObjCFinalizeOnMainThread(self);

  • trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm

    r165676 r166360  
    6565#import <WebCore/FrameView.h>
    6666#import <WebCore/HTMLPlugInElement.h>
     67#import <WebCore/MainRunLoop.h>
    6768#import <WebCore/Page.h>
    6869#import <WebCore/PluginMainThreadScheduler.h>
    … …  
    8283#import <wtf/Assertions.h>
    8384#import <wtf/MainThread.h>
    84 #import <wtf/RunLoop.h>
    8585#import <wtf/text/CString.h>
    8686
    … …  
    195195    JSC::initializeThreading();
    196196    WTF::initializeMainThreadToProcessMainThread();
    197     RunLoop::initializeMainRunLoop();
     197    WebCore::initializeMainRunLoop();
    198198    WebCoreObjCFinalizeOnMainThread(self);
    199199    WKSendUserChangeNotifications();

  • trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm

    r165676 r166360  
    6060#import <WebCore/KeyboardEvent.h>
    6161#import <WebCore/LegacyWebArchive.h>
     62#import <WebCore/MainRunLoop.h>
    6263#import <WebCore/Page.h>
    6364#import <WebCore/PlatformKeyboardEvent.h>
    … …  
    7172#import <wtf/MainThread.h>
    7273#import <wtf/PassRefPtr.h>
    73 #import <wtf/RunLoop.h>
    7474#import <wtf/text/WTFString.h>
    7575
    … …  
    118118    JSC::initializeThreading();
    119119    WTF::initializeMainThreadToProcessMainThread();
    120     RunLoop::initializeMainRunLoop();
     120    WebCore::initializeMainRunLoop();
    121121#endif
    122122    WebCoreObjCFinalizeOnMainThread(self);

  • trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

    r166317 r166360  
    110110#import <WebCore/MIMETypeRegistry.h>
    111111#import <WebCore/MainFrame.h>
     112#import <WebCore/MainRunLoop.h>
    112113#import <WebCore/MouseEvent.h>
    113114#import <WebCore/Page.h>
    … …  
    129130#import <wtf/MainThread.h>
    130131#import <wtf/PassRefPtr.h>
    131 #import <wtf/RunLoop.h>
    132132#import <wtf/text/WTFString.h>
    133133
    … …  
    24002400    JSC::initializeThreading();
    24012401    WTF::initializeMainThreadToProcessMainThread();
    2402     RunLoop::initializeMainRunLoop();
     2402    WebCore::initializeMainRunLoop();
    24032403#endif
    24042404    WebCoreObjCFinalizeOnMainThread(self);

  • trunk/Source/WebKit/mac/WebView/WebArchive.mm

    r165676 r166360  
    3737#import <WebCore/ArchiveResource.h>
    3838#import <WebCore/LegacyWebArchive.h>
     39#import <WebCore/MainRunLoop.h>
    3940#import <WebCore/ThreadCheck.h>
    4041#import <WebCore/WebCoreObjCExtras.h>
    4142#import <wtf/MainThread.h>
    42 #import <wtf/RunLoop.h>
    4343
    4444using namespace WebCore;
    … …  
    7171    JSC::initializeThreading();
    7272    WTF::initializeMainThreadToProcessMainThread();
    73     RunLoop::initializeMainRunLoop();
     73    WebCore::initializeMainRunLoop();
    7474#endif
    7575    WebCoreObjCFinalizeOnMainThread(self);

  • trunk/Source/WebKit/mac/WebView/WebDataSource.mm

    r165676 r166360  
    5454#import <WebCore/LegacyWebArchive.h>
    5555#import <WebCore/MIMETypeRegistry.h>
     56#import <WebCore/MainRunLoop.h>
    5657#import <WebCore/ResourceBuffer.h>
    5758#import <WebCore/ResourceRequest.h>
    … …  
    6667#import <wtf/RefPtr.h>
    6768#import <wtf/RetainPtr.h>
    68 #import <wtf/RunLoop.h>
    6969
    7070#if PLATFORM(IOS)
    … …  
    162162        JSC::initializeThreading();
    163163        WTF::initializeMainThreadToProcessMainThread();
    164         RunLoop::initializeMainRunLoop();
     164        WebCore::initializeMainRunLoop();
    165165#endif
    166166        WebCoreObjCFinalizeOnMainThread(self);

  • trunk/Source/WebKit/mac/WebView/WebHTMLView.mm

    r166146 r166360  
    102102#import <WebCore/MIMETypeRegistry.h>
    103103#import <WebCore/MainFrame.h>
     104#import <WebCore/MainRunLoop.h>
    104105#import <WebCore/Page.h>
    105106#import <WebCore/Range.h>
    … …  
    125126#import <wtf/MainThread.h>
    126127#import <wtf/ObjcRuntimeExtras.h>
    127 #import <wtf/RunLoop.h>
    128128
    129129#if !PLATFORM(IOS)
    … …  
    644644    JSC::initializeThreading();
    645645    WTF::initializeMainThreadToProcessMainThread();
    646     RunLoop::initializeMainRunLoop();
     646    WebCore::initializeMainRunLoop();
    647647#endif
    648648    WebCoreObjCFinalizeOnMainThread(self);
    … …  
    24752475    JSC::initializeThreading();
    24762476    WTF::initializeMainThreadToProcessMainThread();
    2477     RunLoop::initializeMainRunLoop();
     2477    WebCore::initializeMainRunLoop();
    24782478#endif
    24792479    WebCoreObjCFinalizeOnMainThread(self);

  • trunk/Source/WebKit/mac/WebView/WebPreferences.mm

    r165979 r166360  
    4343#import <WebCore/ApplicationCacheStorage.h>
    4444#import <WebCore/AudioSession.h>
     45#import <WebCore/MainRunLoop.h>
    4546#import <WebCore/NetworkStorageSession.h>
    4647#import <WebCore/ResourceHandle.h>
    … …  
    4849#import <wtf/MainThread.h>
    4950#import <wtf/RetainPtr.h>
    50 #import <wtf/RunLoop.h>
    5151
    5252enum {
    … …  
    393393    JSC::initializeThreading();
    394394    WTF::initializeMainThreadToProcessMainThread();
    395     RunLoop::initializeMainRunLoop();
     395    WebCore::initializeMainRunLoop();
    396396#endif
    397397#if PLATFORM(IOS)

  • trunk/Source/WebKit/mac/WebView/WebResource.mm

    r165676 r166360  
    3939#import <WebCore/ArchiveResource.h>
    4040#import <WebCore/LegacyWebArchive.h>
     41#import <WebCore/MainRunLoop.h>
    4142#import <WebCore/RuntimeApplicationChecks.h>
    4243#import <WebCore/TextEncoding.h>
    … …  
    4546#import <WebCore/WebCoreURLResponse.h>
    4647#import <wtf/MainThread.h>
    47 #import <wtf/RunLoop.h>
    4848
    4949using namespace WebCore;
    … …  
    7070    JSC::initializeThreading();
    7171    WTF::initializeMainThreadToProcessMainThread();
    72     RunLoop::initializeMainRunLoop();
     72    WebCore::initializeMainRunLoop();
    7373#endif
    7474    WebCoreObjCFinalizeOnMainThread(self);

  • trunk/Source/WebKit/mac/WebView/WebTextIterator.mm

    r165664 r166360  
    2929#import "DOMRangeInternal.h"
    3030#import "WebTypesInternal.h"
     31#import <WebCore/MainRunLoop.h>
    3132#import <WebCore/TextIterator.h>
    3233#import <WebCore/WebCoreObjCExtras.h>
    3334#import <runtime/InitializeThreading.h>
    3435#import <wtf/MainThread.h>
    35 #import <wtf/RunLoop.h>
    3636#import <wtf/Vector.h>
    3737
    … …  
    5050    JSC::initializeThreading();
    5151    WTF::initializeMainThreadToProcessMainThread();
    52     RunLoop::initializeMainRunLoop();
     52    WebCore::initializeMainRunLoop();
    5353#endif
    5454    WebCoreObjCFinalizeOnMainThread(self);

  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r166257 r166360  
    149149#import <WebCore/MIMETypeRegistry.h>
    150150#import <WebCore/MainFrame.h>
     151#import <WebCore/MainRunLoop.h>
    151152#import <WebCore/MemoryPressureHandler.h>
    152153#import <WebCore/NodeList.h>
    … …  
    196197#import <wtf/RefCountedLeakCounter.h>
    197198#import <wtf/RefPtr.h>
    198 #import <wtf/RunLoop.h>
    199199#import <wtf/StdLibExtras.h>
    200200
    … …  
    46984698    JSC::initializeThreading();
    46994699    WTF::initializeMainThreadToProcessMainThread();
    4700     RunLoop::initializeMainRunLoop();
     4700    WebCore::initializeMainRunLoop();
    47014701#endif
    47024702

  • trunk/Source/WebKit/mac/WebView/WebViewData.mm

    r165676 r166360  
    3434#import "WebViewGroup.h"
    3535#import <WebCore/AlternativeTextUIController.h>
     36#import <WebCore/HistoryItem.h>
     37#import <WebCore/MainRunLoop.h>
    3638#import <WebCore/WebCoreObjCExtras.h>
    37 #import <WebCore/HistoryItem.h>
    3839#import <objc/objc-auto.h>
    3940#import <runtime/InitializeThreading.h>
    4041#import <wtf/MainThread.h>
    41 #import <wtf/RunLoop.h>
    4242
    4343#if PLATFORM(IOS)
    … …  
    7979    JSC::initializeThreading();
    8080    WTF::initializeMainThreadToProcessMainThread();
    81     RunLoop::initializeMainRunLoop();
     81    WebCore::initializeMainRunLoop();
    8282#endif
    8383    WebCoreObjCFinalizeOnMainThread(self);

  • trunk/Source/WebKit2/ChangeLog

    r166357 r166360  
     12014-03-27  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Connection::dispatchOneMessage() can be re-entered while handling Cmd-key menu
     4        equivalents, ASSERT(!_data->_keyDownEventBeingResent)
     5        https://bugs.webkit.org/show_bug.cgi?id=130767
     6        <rdar://problem/16307487>
     7
     8        Reviewed by Darin Adler.
     9
     10        * Shared/WebKit2Initialize.cpp: (WebKit::InitializeWebKit2): Added NSModalPanelRunLoopMode
     11        to RunLoop event source and timer modes.
     12
    1132014-03-27  Jae Hyun Park  <jaepark@webkit.org>
    214

  • trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp

    r163886 r166360  
    2929#include "Logging.h"
    3030#include <WebCore/Logging.h>
     31#include <WebCore/MainRunLoop.h>
    3132#include <runtime/InitializeThreading.h>
    3233#include <wtf/MainThread.h>
    33 #include <wtf/RunLoop.h>
    3434
    3535#if PLATFORM(COCOA)
    … …  
    5353    JSC::initializeThreading();
    5454    WTF::initializeMainThread();
    55     RunLoop::initializeMainRunLoop();
     55    WebCore::initializeMainRunLoop();
    5656
    5757#if !LOG_DISABLED
Note: See TracChangeset for help on using the changeset viewer.