Diff
Modified: trunk/Source/WebCore/ChangeLog (285140 => 285141)
--- trunk/Source/WebCore/ChangeLog 2021-11-01 22:50:11 UTC (rev 285140)
+++ trunk/Source/WebCore/ChangeLog 2021-11-01 23:05:46 UTC (rev 285141)
@@ -1,3 +1,20 @@
+2021-11-01 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Rename GPUDevice to GPUPrewarming because it conflicts with WebGPU's GPUDevice
+ https://bugs.webkit.org/show_bug.cgi?id=232549
+
+ Reviewed by Tim Horton.
+
+ We should have called it GPUPrewarming from the beginning, because that's what it does.
+
+ No new tests because there is no behavior change.
+
+ * SourcesCocoa.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * page/ProcessWarming.cpp:
+ * platform/graphics/gpu/GPUPrewarming.h: Renamed from Source/WebCore/platform/graphics/gpu/GPUDevice.h.
+ * platform/graphics/gpu/cocoa/GPUPrewarmingMetal.mm: Renamed from Source/WebCore/platform/graphics/gpu/cocoa/GPUDeviceMetal.mm.
+
2021-11-01 Alan Bujtas <za...@apple.com>
[LFC][IFC] Stop measuring text while collecting inline items when content needs bidi split
Modified: trunk/Source/WebCore/SourcesCocoa.txt (285140 => 285141)
--- trunk/Source/WebCore/SourcesCocoa.txt 2021-11-01 22:50:11 UTC (rev 285140)
+++ trunk/Source/WebCore/SourcesCocoa.txt 2021-11-01 23:05:46 UTC (rev 285141)
@@ -401,7 +401,7 @@
platform/graphics/cv/PixelBufferConformerCV.cpp
platform/graphics/cv/GraphicsContextGLCVANGLE.cpp
platform/graphics/coreimage/FilterEffectRendererCoreImage.mm
-platform/graphics/gpu/cocoa/GPUDeviceMetal.mm
+platform/graphics/gpu/cocoa/GPUPrewarmingMetal.mm
platform/graphics/ios/DisplayRefreshMonitorIOS.mm
platform/graphics/ios/IconIOS.mm
platform/graphics/mac/ColorMac.mm
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (285140 => 285141)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-11-01 22:50:11 UTC (rev 285140)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-11-01 23:05:46 UTC (rev 285141)
@@ -7080,8 +7080,8 @@
1CDD45E40BA9C84600F90147 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebCore.xcconfig; sourceTree = "<group>"; };
1CDD45E60BA9C84600F90147 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
- 1CE3497A26B33B7A008306BD /* GPUDevice.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUDevice.h; sourceTree = "<group>"; };
- 1CE3497C26B33BAE008306BD /* GPUDeviceMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUDeviceMetal.mm; sourceTree = "<group>"; };
+ 1CE3497A26B33B7A008306BD /* GPUPrewarming.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUPrewarming.h; sourceTree = "<group>"; };
+ 1CE3497C26B33BAE008306BD /* GPUPrewarmingMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUPrewarmingMetal.mm; sourceTree = "<group>"; };
1CE8863E26105A5F000C816C /* InMemoryDisplayList.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InMemoryDisplayList.cpp; sourceTree = "<group>"; };
1CE8863F26105A5F000C816C /* InMemoryDisplayList.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InMemoryDisplayList.h; sourceTree = "<group>"; };
1CE8D12526185BD800FC3AEF /* DisplayListItemBufferIdentifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DisplayListItemBufferIdentifier.h; sourceTree = "<group>"; };
@@ -18644,11 +18644,11 @@
1A569CC40D7E2B60007C3983 /* bridge */ = {
isa = PBXGroup;
children = (
+ 59B5977111086556007159E8 /* jsc */,
+ 1A569CE20D7E2B82007C3983 /* objc */,
599E758F11055A1F00D904FA /* Bridge.h */,
1A71D5790F33819000F9CE4E /* IdentifierRep.cpp */,
1A71D57A0F33819000F9CE4E /* IdentifierRep.h */,
- 59B5977111086556007159E8 /* jsc */,
- 1A569CE20D7E2B82007C3983 /* objc */,
1A569CEF0D7E2B82007C3983 /* runtime_array.cpp */,
1A569CF00D7E2B82007C3983 /* runtime_array.h */,
1A569CF10D7E2B82007C3983 /* runtime_method.cpp */,
@@ -19240,7 +19240,7 @@
isa = PBXGroup;
children = (
1CE3497B26B33B8C008306BD /* cocoa */,
- 1CE3497A26B33B7A008306BD /* GPUDevice.h */,
+ 1CE3497A26B33B7A008306BD /* GPUPrewarming.h */,
);
path = gpu;
sourceTree = "<group>";
@@ -19248,7 +19248,7 @@
1CE3497B26B33B8C008306BD /* cocoa */ = {
isa = PBXGroup;
children = (
- 1CE3497C26B33BAE008306BD /* GPUDeviceMetal.mm */,
+ 1CE3497C26B33BAE008306BD /* GPUPrewarmingMetal.mm */,
);
path = cocoa;
sourceTree = "<group>";
Modified: trunk/Source/WebCore/page/ProcessWarming.cpp (285140 => 285141)
--- trunk/Source/WebCore/page/ProcessWarming.cpp 2021-11-01 22:50:11 UTC (rev 285140)
+++ trunk/Source/WebCore/page/ProcessWarming.cpp 2021-11-01 23:05:46 UTC (rev 285141)
@@ -43,7 +43,7 @@
#include "XMLNames.h"
#if ENABLE(GPU_DRIVER_PREWARMING)
-#include "GPUDevice.h"
+#include "GPUPrewarming.h"
#endif
namespace WebCore {
Deleted: trunk/Source/WebCore/platform/graphics/gpu/GPUDevice.h (285140 => 285141)
--- trunk/Source/WebCore/platform/graphics/gpu/GPUDevice.h 2021-11-01 22:50:11 UTC (rev 285140)
+++ trunk/Source/WebCore/platform/graphics/gpu/GPUDevice.h 2021-11-01 23:05:46 UTC (rev 285141)
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2021 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.
- */
-
-#pragma once
-
-namespace WebCore {
-
-void prewarmGPU();
-
-}
Copied: trunk/Source/WebCore/platform/graphics/gpu/GPUPrewarming.h (from rev 285138, trunk/Source/WebCore/platform/graphics/gpu/GPUDevice.h) (0 => 285141)
--- trunk/Source/WebCore/platform/graphics/gpu/GPUPrewarming.h (rev 0)
+++ trunk/Source/WebCore/platform/graphics/gpu/GPUPrewarming.h 2021-11-01 23:05:46 UTC (rev 285141)
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2021 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.
+ */
+
+#pragma once
+
+namespace WebCore {
+
+void prewarmGPU();
+
+}
Deleted: trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPUDeviceMetal.mm (285140 => 285141)
--- trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPUDeviceMetal.mm 2021-11-01 22:50:11 UTC (rev 285140)
+++ trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPUDeviceMetal.mm 2021-11-01 23:05:46 UTC (rev 285141)
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2018 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 "GPUDevice.h"
-
-#import <Metal/Metal.h>
-
-namespace WebCore {
-
-void prewarmGPU()
-{
-#if PLATFORM(MAC)
- // Call MTLCopyAllDevices() on a background thread to avoid hanging the main thread.
- dispatch_async(dispatch_get_global_queue(0, 0), ^{
- auto devices = adoptNS(MTLCopyAllDevices());
- });
-#endif
-}
-
-} // namespace WebCore
Copied: trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPUPrewarmingMetal.mm (from rev 285138, trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPUDeviceMetal.mm) (0 => 285141)
--- trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPUPrewarmingMetal.mm (rev 0)
+++ trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPUPrewarmingMetal.mm 2021-11-01 23:05:46 UTC (rev 285141)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2018 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 "GPUPrewarming.h"
+
+#import <Metal/Metal.h>
+
+namespace WebCore {
+
+void prewarmGPU()
+{
+#if PLATFORM(MAC)
+ // Call MTLCopyAllDevices() on a background thread to avoid hanging the main thread.
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ auto devices = adoptNS(MTLCopyAllDevices());
+ });
+#endif
+}
+
+} // namespace WebCore
