Diff
Modified: trunk/Source/WebCore/ChangeLog (157167 => 157168)
--- trunk/Source/WebCore/ChangeLog 2013-10-09 14:54:46 UTC (rev 157167)
+++ trunk/Source/WebCore/ChangeLog 2013-10-09 15:24:05 UTC (rev 157168)
@@ -1,3 +1,21 @@
+2013-10-08 Anders Carlsson <[email protected]>
+
+ Remove RunLoopMac.mm
+ https://bugs.webkit.org/show_bug.cgi?id=122527
+
+ Reviewed by Antti Koivisto.
+
+ RunLoop::setUseApplicationRunLoopOnMainRunLoop() is no longer used, so we can just use the run() and stop()
+ implementations from RunLoopCF.
+
+ * WebCore.exp.in:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/RunLoop.cpp:
+ * platform/RunLoop.h:
+ * platform/cf/RunLoopCF.cpp:
+ (WebCore::RunLoop::stop):
+ * platform/mac/RunLoopMac.mm: Removed.
+
2013-10-09 Mario Sanchez Prada <[email protected]>
[ATK] Implement new API in AtkText: atk_text_get_string_at_offset()
Modified: trunk/Source/WebCore/WebCore.exp.in (157167 => 157168)
--- trunk/Source/WebCore/WebCore.exp.in 2013-10-09 14:54:46 UTC (rev 157167)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-10-09 15:24:05 UTC (rev 157168)
@@ -1024,7 +1024,6 @@
__ZN7WebCore7IntSizeC1ERK6CGSize
__ZN7WebCore7RunLoop14runForDurationEd
__ZN7WebCore7RunLoop21initializeMainRunLoopEv
-__ZN7WebCore7RunLoop37setUseApplicationRunLoopOnMainRunLoopEv
__ZN7WebCore7RunLoop3runEv
__ZN7WebCore7RunLoop4mainEv
__ZN7WebCore7RunLoop4stopEv
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (157167 => 157168)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-10-09 14:54:46 UTC (rev 157167)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-10-09 15:24:05 UTC (rev 157168)
@@ -4691,7 +4691,6 @@
BC06EE040BFD71AA00856E9D /* JSHTMLTableElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC06EE020BFD71AA00856E9D /* JSHTMLTableElement.cpp */; };
BC06EE050BFD71AA00856E9D /* JSHTMLTableElement.h in Headers */ = {isa = PBXBuildFile; fileRef = BC06EE030BFD71AA00856E9D /* JSHTMLTableElement.h */; };
BC073BAA0C399B1F000F5979 /* FloatConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = BC073BA90C399B1F000F5979 /* FloatConversion.h */; };
- BC0B358314C4F9540055E22A /* RunLoopMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC0B358214C4F9540055E22A /* RunLoopMac.mm */; };
BC0B358714C4F9830055E22A /* RunLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC0B358514C4F9830055E22A /* RunLoop.cpp */; };
BC0B358814C4F9830055E22A /* RunLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = BC0B358614C4F9830055E22A /* RunLoop.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC0B36A40CD3C67C00AC7EB5 /* Console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC0B36A10CD3C67C00AC7EB5 /* Console.cpp */; };
@@ -11554,7 +11553,6 @@
BC06F24C06D18A7E004A6FA3 /* XSLTProcessor.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = XSLTProcessor.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
BC06F24D06D18A7E004A6FA3 /* XSLTProcessorLibxslt.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XSLTProcessorLibxslt.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
BC073BA90C399B1F000F5979 /* FloatConversion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FloatConversion.h; sourceTree = "<group>"; };
- BC0B358214C4F9540055E22A /* RunLoopMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RunLoopMac.mm; sourceTree = "<group>"; };
BC0B358514C4F9830055E22A /* RunLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RunLoop.cpp; sourceTree = "<group>"; };
BC0B358614C4F9830055E22A /* RunLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RunLoop.h; sourceTree = "<group>"; };
BC0B36A10CD3C67C00AC7EB5 /* Console.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Console.cpp; sourceTree = "<group>"; };
@@ -15162,7 +15160,6 @@
29E4D8E016B0959800C84704 /* PlatformSpeechSynthesizerMac.mm */,
0081FEFE16B0A2B6008AAA7A /* PublicSuffixMac.mm */,
E4D687760ED7AE3D006EA978 /* PurgeableBufferMac.cpp */,
- BC0B358214C4F9540055E22A /* RunLoopMac.mm */,
BCAE1FA512939DB7004CB026 /* ScrollAnimatorMac.h */,
BC51156D12B1749C00C96754 /* ScrollAnimatorMac.mm */,
BC8B853C0E7C7F1100AB6984 /* ScrollbarThemeMac.h */,
@@ -27022,7 +27019,6 @@
078E090217D14CEE00420AA1 /* MediaStreamTrack.cpp in Sources */,
BC0B358714C4F9830055E22A /* RunLoop.cpp in Sources */,
29A309AC1561C99B00BBD8E5 /* RunLoopCF.cpp in Sources */,
- BC0B358314C4F9540055E22A /* RunLoopMac.mm in Sources */,
7C2BDD3D17C7F98C0038FF15 /* JSDOMGlobalObjectTask.cpp in Sources */,
1A569D1E0D7E2B82007C3983 /* runtime_array.cpp in Sources */,
1A569D200D7E2B82007C3983 /* runtime_method.cpp in Sources */,
Modified: trunk/Source/WebCore/platform/RunLoop.cpp (157167 => 157168)
--- trunk/Source/WebCore/platform/RunLoop.cpp 2013-10-09 14:54:46 UTC (rev 157167)
+++ trunk/Source/WebCore/platform/RunLoop.cpp 2013-10-09 15:24:05 UTC (rev 157168)
@@ -31,12 +31,6 @@
namespace WebCore {
-#if !PLATFORM(MAC)
-void RunLoop::setUseApplicationRunLoopOnMainRunLoop()
-{
-}
-#endif
-
static RunLoop* s_mainRunLoop;
// Helper class for ThreadSpecificData.
Modified: trunk/Source/WebCore/platform/RunLoop.h (157167 => 157168)
--- trunk/Source/WebCore/platform/RunLoop.h 2013-10-09 14:54:46 UTC (rev 157167)
+++ trunk/Source/WebCore/platform/RunLoop.h 2013-10-09 15:24:05 UTC (rev 157168)
@@ -52,9 +52,6 @@
// can be called from any thread).
static void initializeMainRunLoop();
- // Must be called before entering main run loop. If called, application style run loop will be used, handling events.
- static void setUseApplicationRunLoopOnMainRunLoop();
-
static RunLoop* current();
static RunLoop* main();
static bool isMain();
Modified: trunk/Source/WebCore/platform/cf/RunLoopCF.cpp (157167 => 157168)
--- trunk/Source/WebCore/platform/cf/RunLoopCF.cpp 2013-10-09 14:54:46 UTC (rev 157167)
+++ trunk/Source/WebCore/platform/cf/RunLoopCF.cpp 2013-10-09 15:24:05 UTC (rev 157168)
@@ -63,7 +63,6 @@
CFRunLoopWakeUp(m_runLoop.get());
}
-#if !PLATFORM(MAC) || PLATFORM(IOS)
void RunLoop::run()
{
current()->m_nestingLevel++;
@@ -81,7 +80,6 @@
ASSERT(m_runLoop == CFRunLoopGetCurrent());
CFRunLoopStop(m_runLoop.get());
}
-#endif
// RunLoop::Timer
Deleted: trunk/Source/WebCore/platform/mac/RunLoopMac.mm (157167 => 157168)
--- trunk/Source/WebCore/platform/mac/RunLoopMac.mm 2013-10-09 14:54:46 UTC (rev 157167)
+++ trunk/Source/WebCore/platform/mac/RunLoopMac.mm 2013-10-09 15:24:05 UTC (rev 157168)
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-#import "config.h"
-#import "RunLoop.h"
-
-namespace WebCore {
-
-static bool s_useApplicationRunLoopOnMainRunLoop;
-
-void RunLoop::setUseApplicationRunLoopOnMainRunLoop()
-{
- s_useApplicationRunLoopOnMainRunLoop = true;
-}
-
-void RunLoop::run()
-{
- current()->m_nestingLevel++;
- if (current() == main() && current()->m_nestingLevel == 1 && s_useApplicationRunLoopOnMainRunLoop) {
- // Use -[NSApplication run] for the main run loop.
- [NSApp run];
- } else {
- @autoreleasepool {
- CFRunLoopRun();
- }
- }
- current()->m_nestingLevel--;
-}
-
-void RunLoop::stop()
-{
- ASSERT(m_runLoop == CFRunLoopGetCurrent());
-
- // Nesting level can be 0 if the run loop is started externally (such as the case for XPC services).
- if (m_runLoop == main()->m_runLoop && m_nestingLevel <= 1 && s_useApplicationRunLoopOnMainRunLoop) {
- ASSERT([NSApp isRunning]);
- [NSApp stop:nil];
- NSEvent *event = [NSEvent otherEventWithType:NSApplicationDefined
- location:NSMakePoint(0, 0)
- modifierFlags:0
- timestamp:0.0
- windowNumber:0
- context:nil
- subtype: 0
- data1:0
- data2:0];
- [NSApp postEvent:event atStart:true];
- } else
- CFRunLoopStop(m_runLoop.get());
-}
-
-} // namespace WebCore
