- Revision
- 295670
- Author
- [email protected]
- Date
- 2022-06-20 01:07:52 -0700 (Mon, 20 Jun 2022)
Log Message
IPC::FontReference is a redundant type alias in wrong software layer
https://bugs.webkit.org/show_bug.cgi?id=241712
Patch by Kimmo Kinnunen <[email protected]> on 2022-06-20
Reviewed by Cameron McCormack and Wenson Hsieh.
Instead, use the aliased type Ref<Font>.
* Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.messages.in:
* Source/WebKit/Platform/IPC/FontReference.h: Removed.
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
Canonical link: https://commits.webkit.org/251675@main
Modified Paths
Removed Paths
Diff
Modified: trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.messages.in (295669 => 295670)
--- trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.messages.in 2022-06-20 07:43:00 UTC (rev 295669)
+++ trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.messages.in 2022-06-20 08:07:52 UTC (rev 295670)
@@ -33,7 +33,7 @@
GetShareableBitmapForImageBuffer(WebCore::RenderingResourceIdentifier imageBuffer, enum:uint8_t WebCore::PreserveResolution preserveResolution) -> (WebKit::ShareableBitmap::Handle handle) Synchronous NotStreamEncodableReply
GetFilteredImageForImageBuffer(WebCore::RenderingResourceIdentifier imageBuffer, IPC::FilterReference filter) -> (WebKit::ShareableBitmap::Handle handle) Synchronous NotStreamEncodableReply
CacheNativeImage(WebKit::ShareableBitmap::Handle handle, WebCore::RenderingResourceIdentifier renderingResourceIdentifier) NotStreamEncodable
- CacheFont(IPC::FontReference font) NotStreamEncodable
+ CacheFont(Ref<WebCore::Font> font) NotStreamEncodable
CacheDecomposedGlyphs(Ref<WebCore::DecomposedGlyphs> decomposedGlyphs) NotStreamEncodable
DeleteAllFonts()
ReleaseRemoteResource(WebCore::RenderingResourceIdentifier renderingResourceIdentifier)
Deleted: trunk/Source/WebKit/Platform/IPC/FontReference.h (295669 => 295670)
--- trunk/Source/WebKit/Platform/IPC/FontReference.h 2022-06-20 07:43:00 UTC (rev 295669)
+++ trunk/Source/WebKit/Platform/IPC/FontReference.h 2022-06-20 08:07:52 UTC (rev 295670)
@@ -1,40 +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.
- */
-
-#pragma once
-
-#include <wtf/Ref.h>
-
-namespace WebCore {
-
-class Font;
-
-} // namespace WebCore
-
-namespace IPC {
-
-using FontReference = Ref<WebCore::Font>;
-
-} // namespace IPC
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (295669 => 295670)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-06-20 07:43:00 UTC (rev 295669)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-06-20 08:07:52 UTC (rev 295670)
@@ -1569,7 +1569,6 @@
9B5499B22362A7EC00DF8BA5 /* _WKTextManipulationExclusionRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B5499B02362A7EC00DF8BA5 /* _WKTextManipulationExclusionRule.h */; settings = {ATTRIBUTES = (Private, ); }; };
9B5BEC262400F4A90070C6EF /* WebMediaStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B5BEC242400F4A90070C6EF /* WebMediaStrategy.h */; };
9B5BEC2A240101580070C6EF /* RemoteAudioDestinationProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B5BEC28240101580070C6EF /* RemoteAudioDestinationProxy.h */; };
- 9BD8AB4A25820E53005386F8 /* FontReference.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BD8AB4925820E52005386F8 /* FontReference.h */; };
9EC532A32447FBAD00215216 /* GeolocationIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 9EC532A22447FBAD00215216 /* GeolocationIdentifier.h */; };
9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FB5F393169E6A80002C25BF /* WKContextPrivateMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
A1046EA12079263100F0C5D8 /* WKPDFView.h in Headers */ = {isa = PBXBuildFile; fileRef = A1046E9F2079263100F0C5D8 /* WKPDFView.h */; };
@@ -5890,7 +5889,6 @@
9B5BEC28240101580070C6EF /* RemoteAudioDestinationProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteAudioDestinationProxy.h; sourceTree = "<group>"; };
9B5BEC29240101580070C6EF /* RemoteAudioDestinationProxy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteAudioDestinationProxy.cpp; sourceTree = "<group>"; };
9BC59D6C1EFCCCB6001E8D09 /* CallbackID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallbackID.h; sourceTree = "<group>"; };
- 9BD8AB4925820E52005386F8 /* FontReference.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontReference.h; sourceTree = "<group>"; };
9BF5EC6325410E9900984E77 /* JSIPCBinding.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JSIPCBinding.cpp; sourceTree = "<group>"; };
9EC532A22447FBAD00215216 /* GeolocationIdentifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeolocationIdentifier.h; sourceTree = "<group>"; };
9F54F88E16488E87007DF81A /* AuxiliaryProcessMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AuxiliaryProcessMac.mm; sourceTree = "<group>"; };
@@ -8272,7 +8270,6 @@
BC032D9F10F437D10058C15A /* Encoder.cpp */,
BC032DA010F437D10058C15A /* Encoder.h */,
7246963A275B7E6700A9156A /* FilterReference.h */,
- 9BD8AB4925820E52005386F8 /* FontReference.h */,
4151E5C31FBB90A900E47E2D /* FormDataReference.h */,
C0CE72AC1247E78D00BC0EC4 /* HandleMessage.h */,
A31F60A225CC7DB800AF14F4 /* IPCSemaphore.h */,
@@ -14119,7 +14116,6 @@
DD4DB789280F9471001700D4 /* FindNodes.js in Headers */,
C59C4A5918B81174007BDCB6 /* FocusedElementInformation.h in Headers */,
BCE81D8D1319F7EF00241910 /* FontInfo.h in Headers */,
- 9BD8AB4A25820E53005386F8 /* FontReference.h in Headers */,
DD4DB78A280F9471001700D4 /* FormElementClear.js in Headers */,
DD4DB78B280F9471001700D4 /* FormSubmit.js in Headers */,
1A14F8E21D74C834006CBEC6 /* FrameInfoData.h in Headers */,
