Diff
Modified: trunk/Source/WebCore/ChangeLog (270158 => 270159)
--- trunk/Source/WebCore/ChangeLog 2020-11-22 05:51:10 UTC (rev 270158)
+++ trunk/Source/WebCore/ChangeLog 2020-11-22 06:09:32 UTC (rev 270159)
@@ -1,3 +1,14 @@
+2020-11-21 Ada Chan <[email protected]>
+
+ Convert PlatformXRCocoa.cpp to Objective C++
+ https://bugs.webkit.org/show_bug.cgi?id=219242
+
+ Reviewed by Tim Horton.
+
+ * SourcesCocoa.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/xr/cocoa/PlatformXRCocoa.mm: Renamed from Source/WebCore/platform/xr/cocoa/PlatformXRCocoa.cpp.
+
2020-11-21 Sihui Liu <[email protected]>
Implement audio capture for SpeechRecognition on macOS
Modified: trunk/Source/WebCore/SourcesCocoa.txt (270158 => 270159)
--- trunk/Source/WebCore/SourcesCocoa.txt 2020-11-22 05:51:10 UTC (rev 270158)
+++ trunk/Source/WebCore/SourcesCocoa.txt 2020-11-22 06:09:32 UTC (rev 270159)
@@ -588,7 +588,7 @@
platform/text/mac/TextBoundaries.mm
platform/text/mac/TextCheckingMac.mm
platform/text/mac/TextEncodingRegistryMac.mm
-platform/xr/cocoa/PlatformXRCocoa.cpp
+platform/xr/cocoa/PlatformXRCocoa.mm
rendering/RenderThemeCocoa.mm
rendering/RenderThemeIOS.mm
rendering/RenderThemeMac.mm
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (270158 => 270159)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-11-22 05:51:10 UTC (rev 270158)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-11-22 06:09:32 UTC (rev 270159)
@@ -8858,7 +8858,7 @@
526724F21CB2FDF60075974D /* TextTrackRepresentationCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrackRepresentationCocoa.h; sourceTree = "<group>"; };
526B3F0122FB7BDD0076D37D /* WHLSLPruneUnreachableStandardLibraryFunctions.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WHLSLPruneUnreachableStandardLibraryFunctions.cpp; sourceTree = "<group>"; };
526B3F0322FB7BDE0076D37D /* WHLSLPruneUnreachableStandardLibraryFunctions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLPruneUnreachableStandardLibraryFunctions.h; sourceTree = "<group>"; };
- 5273CC74256103CF00850007 /* PlatformXRCocoa.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformXRCocoa.cpp; sourceTree = "<group>"; };
+ 5273CC74256103CF00850007 /* PlatformXRCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformXRCocoa.mm; sourceTree = "<group>"; };
5273CC75256103CF00850007 /* PlatformXRCocoa.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlatformXRCocoa.h; sourceTree = "<group>"; };
5273CC9A2563B21200850007 /* JSWebXRTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebXRTest.cpp; sourceTree = "<group>"; };
5273CC9E2563B37600850007 /* JSWebFakeXRDevice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebFakeXRDevice.cpp; sourceTree = "<group>"; };
@@ -20622,8 +20622,8 @@
5273CC722561039B00850007 /* cocoa */ = {
isa = PBXGroup;
children = (
- 5273CC74256103CF00850007 /* PlatformXRCocoa.cpp */,
5273CC75256103CF00850007 /* PlatformXRCocoa.h */,
+ 5273CC74256103CF00850007 /* PlatformXRCocoa.mm */,
);
path = cocoa;
sourceTree = "<group>";
Deleted: trunk/Source/WebCore/platform/xr/cocoa/PlatformXRCocoa.cpp (270158 => 270159)
--- trunk/Source/WebCore/platform/xr/cocoa/PlatformXRCocoa.cpp 2020-11-22 05:51:10 UTC (rev 270158)
+++ trunk/Source/WebCore/platform/xr/cocoa/PlatformXRCocoa.cpp 2020-11-22 06:09:32 UTC (rev 270159)
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2020 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 "PlatformXRCocoa.h"
-
-#if ENABLE(WEBXR) && PLATFORM(COCOA)
-
-#include <WebKitAdditions/PlatformXRAdditions.cpp>
-
-#endif
Copied: trunk/Source/WebCore/platform/xr/cocoa/PlatformXRCocoa.mm (from rev 270158, trunk/Source/WebCore/platform/xr/cocoa/PlatformXRCocoa.cpp) (0 => 270159)
--- trunk/Source/WebCore/platform/xr/cocoa/PlatformXRCocoa.mm (rev 0)
+++ trunk/Source/WebCore/platform/xr/cocoa/PlatformXRCocoa.mm 2020-11-22 06:09:32 UTC (rev 270159)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2020 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 "PlatformXRCocoa.h"
+
+#if ENABLE(WEBXR) && PLATFORM(COCOA)
+
+#import <WebKitAdditions/PlatformXRAdditions.mm>
+
+#endif
