Diff
Modified: trunk/Source/WebCore/ChangeLog (257923 => 257924)
--- trunk/Source/WebCore/ChangeLog 2020-03-05 18:07:20 UTC (rev 257923)
+++ trunk/Source/WebCore/ChangeLog 2020-03-05 18:10:52 UTC (rev 257924)
@@ -1,3 +1,16 @@
+2020-03-05 Simon Fraser <simon.fra...@apple.com>
+
+ Change ScrollingTreeMac.cpp to a .mm file
+ https://bugs.webkit.org/show_bug.cgi?id=208652
+
+ Reviewed by Antti Koivisto.
+
+ Simple file rename.
+
+ * SourcesCocoa.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * page/scrolling/mac/ScrollingTreeMac.mm: Renamed from Source/WebCore/page/scrolling/mac/ScrollingTreeMac.cpp.
+
2020-03-05 Jason Lawrence <lawrenc...@apple.com>
Unreviewed, rolling out r257905.
Modified: trunk/Source/WebCore/SourcesCocoa.txt (257923 => 257924)
--- trunk/Source/WebCore/SourcesCocoa.txt 2020-03-05 18:07:20 UTC (rev 257923)
+++ trunk/Source/WebCore/SourcesCocoa.txt 2020-03-05 18:10:52 UTC (rev 257924)
@@ -160,7 +160,7 @@
page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm
page/scrolling/mac/ScrollingTreeOverflowScrollingNodeMac.mm
page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.mm
-page/scrolling/mac/ScrollingTreeMac.cpp
+page/scrolling/mac/ScrollingTreeMac.mm
platform/audio/AudioSession.cpp
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (257923 => 257924)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-03-05 18:07:20 UTC (rev 257923)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-03-05 18:10:52 UTC (rev 257924)
@@ -5867,7 +5867,7 @@
0FDCD7F21D47E655009F08BC /* LogInitialization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogInitialization.h; sourceTree = "<group>"; };
0FDF45A61BD1C6FD00E4FA8C /* PlatformCAAnimation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformCAAnimation.cpp; sourceTree = "<group>"; };
0FDF45A81BD1C82500E4FA8C /* TimingFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimingFunction.cpp; sourceTree = "<group>"; };
- 0FE5806119327A6200DE32EB /* ScrollingTreeMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollingTreeMac.cpp; sourceTree = "<group>"; };
+ 0FE5806119327A6200DE32EB /* ScrollingTreeMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollingTreeMac.mm; sourceTree = "<group>"; };
0FE5806219327A6200DE32EB /* ScrollingTreeMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingTreeMac.h; sourceTree = "<group>"; };
0FE5FBCA1C3DD51E0007A2CA /* DisplayList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DisplayList.cpp; sourceTree = "<group>"; };
0FE5FBCB1C3DD51E0007A2CA /* DisplayList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DisplayList.h; sourceTree = "<group>"; };
@@ -17378,8 +17378,8 @@
1AF62F2314DAFE910041556C /* ScrollingThreadMac.mm */,
93C4A4131629DF5A00C3EB6E /* ScrollingTreeFrameScrollingNodeMac.h */,
93C4A4141629DF5A00C3EB6E /* ScrollingTreeFrameScrollingNodeMac.mm */,
- 0FE5806119327A6200DE32EB /* ScrollingTreeMac.cpp */,
0FE5806219327A6200DE32EB /* ScrollingTreeMac.h */,
+ 0FE5806119327A6200DE32EB /* ScrollingTreeMac.mm */,
0FC0516A219B5EBE0031C39E /* ScrollingTreeOverflowScrollingNodeMac.h */,
0FC05168219B5EBE0031C39E /* ScrollingTreeOverflowScrollingNodeMac.mm */,
0F37F0842202ACB700A89C0B /* ScrollingTreeScrollingNodeDelegateMac.h */,
Deleted: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeMac.cpp (257923 => 257924)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeMac.cpp 2020-03-05 18:07:20 UTC (rev 257923)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeMac.cpp 2020-03-05 18:10:52 UTC (rev 257924)
@@ -1,74 +0,0 @@
-/*
- * 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 "ScrollingTreeMac.h"
-
-#include "ScrollingTreeFixedNode.h"
-#include "ScrollingTreeFrameHostingNode.h"
-#include "ScrollingTreeFrameScrollingNodeMac.h"
-#include "ScrollingTreeOverflowScrollProxyNode.h"
-#include "ScrollingTreeOverflowScrollingNodeMac.h"
-#include "ScrollingTreePositionedNode.h"
-#include "ScrollingTreeStickyNode.h"
-
-#if ENABLE(ASYNC_SCROLLING) && ENABLE(SCROLLING_THREAD)
-
-using namespace WebCore;
-
-Ref<ScrollingTreeMac> ScrollingTreeMac::create(AsyncScrollingCoordinator& scrollingCoordinator)
-{
- return adoptRef(*new ScrollingTreeMac(scrollingCoordinator));
-}
-
-ScrollingTreeMac::ScrollingTreeMac(AsyncScrollingCoordinator& scrollingCoordinator)
- : ThreadedScrollingTree(scrollingCoordinator)
-{
-}
-
-Ref<ScrollingTreeNode> ScrollingTreeMac::createScrollingTreeNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
-{
- switch (nodeType) {
- case ScrollingNodeType::MainFrame:
- case ScrollingNodeType::Subframe:
- return ScrollingTreeFrameScrollingNodeMac::create(*this, nodeType, nodeID);
- case ScrollingNodeType::FrameHosting:
- return ScrollingTreeFrameHostingNode::create(*this, nodeID);
- case ScrollingNodeType::Overflow:
- return ScrollingTreeOverflowScrollingNodeMac::create(*this, nodeID);
- case ScrollingNodeType::OverflowProxy:
- return ScrollingTreeOverflowScrollProxyNode::create(*this, nodeID);
- case ScrollingNodeType::Fixed:
- return ScrollingTreeFixedNode::create(*this, nodeID);
- case ScrollingNodeType::Sticky:
- return ScrollingTreeStickyNode::create(*this, nodeID);
- case ScrollingNodeType::Positioned:
- return ScrollingTreePositionedNode::create(*this, nodeID);
- }
- ASSERT_NOT_REACHED();
- return ScrollingTreeFixedNode::create(*this, nodeID);
-}
-
-#endif // ENABLE(ASYNC_SCROLLING) && ENABLE(SCROLLING_THREAD)
Copied: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeMac.mm (from rev 257923, trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeMac.cpp) (0 => 257924)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeMac.mm (rev 0)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeMac.mm 2020-03-05 18:10:52 UTC (rev 257924)
@@ -0,0 +1,74 @@
+/*
+ * 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 "ScrollingTreeMac.h"
+
+#include "ScrollingTreeFixedNode.h"
+#include "ScrollingTreeFrameHostingNode.h"
+#include "ScrollingTreeFrameScrollingNodeMac.h"
+#include "ScrollingTreeOverflowScrollProxyNode.h"
+#include "ScrollingTreeOverflowScrollingNodeMac.h"
+#include "ScrollingTreePositionedNode.h"
+#include "ScrollingTreeStickyNode.h"
+
+#if ENABLE(ASYNC_SCROLLING) && ENABLE(SCROLLING_THREAD)
+
+using namespace WebCore;
+
+Ref<ScrollingTreeMac> ScrollingTreeMac::create(AsyncScrollingCoordinator& scrollingCoordinator)
+{
+ return adoptRef(*new ScrollingTreeMac(scrollingCoordinator));
+}
+
+ScrollingTreeMac::ScrollingTreeMac(AsyncScrollingCoordinator& scrollingCoordinator)
+ : ThreadedScrollingTree(scrollingCoordinator)
+{
+}
+
+Ref<ScrollingTreeNode> ScrollingTreeMac::createScrollingTreeNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
+{
+ switch (nodeType) {
+ case ScrollingNodeType::MainFrame:
+ case ScrollingNodeType::Subframe:
+ return ScrollingTreeFrameScrollingNodeMac::create(*this, nodeType, nodeID);
+ case ScrollingNodeType::FrameHosting:
+ return ScrollingTreeFrameHostingNode::create(*this, nodeID);
+ case ScrollingNodeType::Overflow:
+ return ScrollingTreeOverflowScrollingNodeMac::create(*this, nodeID);
+ case ScrollingNodeType::OverflowProxy:
+ return ScrollingTreeOverflowScrollProxyNode::create(*this, nodeID);
+ case ScrollingNodeType::Fixed:
+ return ScrollingTreeFixedNode::create(*this, nodeID);
+ case ScrollingNodeType::Sticky:
+ return ScrollingTreeStickyNode::create(*this, nodeID);
+ case ScrollingNodeType::Positioned:
+ return ScrollingTreePositionedNode::create(*this, nodeID);
+ }
+ ASSERT_NOT_REACHED();
+ return ScrollingTreeFixedNode::create(*this, nodeID);
+}
+
+#endif // ENABLE(ASYNC_SCROLLING) && ENABLE(SCROLLING_THREAD)
