Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Unreviewed, reverting r295278.
https://bugs.webkit.org/show_bug.cgi?id=241336

Causes crashes

Reverted changeset:

"Add a new DrawDecomposedGlyphs display list item to avoid repeatedly sending glyphs when using the GlyphDisplayListCache"
https://bugs.webkit.org/show_bug.cgi?id=240497
https://commits.webkit.org/r295278

Canonical link: https://commits.webkit.org/251331@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@295285 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
webkit-commit-queue committed Jun 6, 2022
1 parent 1a12dd2 commit 51c123d
Show file tree
Hide file tree
Showing 84 changed files with 220 additions and 1,429 deletions.
@@ -1,3 +1,6 @@

(draw-decomposed-glyphs extent at (0,0) size 0x0)
(draw-glyphs
(local-anchor (0,0))
(anchor-point (0,0))
(length 9) extent at (0,0) size 0x0)

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

8 changes: 0 additions & 8 deletions Source/WTF/wtf/PlatformHave.h
Expand Up @@ -1203,11 +1203,3 @@
#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 160000)
#define HAVE_DDRESULT_DISABLE_URL_SCHEME_CHECKING 1
#endif

#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 130000) \
|| (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 160000) \
|| (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 160000) \
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED >= 160000) \
|| (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 90000)
#define HAVE_CORE_TEXT_FIX_FOR_RADAR_93925620 1
#endif
2 changes: 0 additions & 2 deletions Source/WebCore/Headers.cmake
Expand Up @@ -1468,7 +1468,6 @@ set(WebCore_PRIVATE_FRAMEWORK_HEADERS
platform/graphics/ContentTypeUtilities.h
platform/graphics/DashArray.h
platform/graphics/DecodingOptions.h
platform/graphics/DecomposedGlyphs.h
platform/graphics/DestinationColorSpace.h
platform/graphics/DisplayRefreshMonitor.h
platform/graphics/DisplayRefreshMonitorClient.h
Expand Down Expand Up @@ -1594,7 +1593,6 @@ set(WebCore_PRIVATE_FRAMEWORK_HEADERS
platform/graphics/PlatformVideoMatrixCoefficients.h
platform/graphics/PlatformVideoTrackConfiguration.h
platform/graphics/PlatformVideoTransferCharacteristics.h
platform/graphics/PositionedGlyphs.h
platform/graphics/Region.h
platform/graphics/RenderingResourceIdentifier.h
platform/graphics/RenderingMode.h
Expand Down
5 changes: 1 addition & 4 deletions Source/WebCore/Sources.txt
@@ -1,4 +1,4 @@
// Copyright (C) 2017-2022 Apple Inc. All rights reserved.
// Copyright (C) 2017-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
Expand Down Expand Up @@ -2030,7 +2030,6 @@ platform/graphics/ColorUtilities.cpp
platform/graphics/ComplexTextController.cpp
platform/graphics/ContentTypeUtilities.cpp
platform/graphics/CrossfadeGeneratedImage.cpp
platform/graphics/DecomposedGlyphs.cpp
platform/graphics/DestinationColorSpace.cpp
platform/graphics/DisplayRefreshMonitor.cpp
platform/graphics/DisplayRefreshMonitorClient.cpp
Expand Down Expand Up @@ -2102,7 +2101,6 @@ platform/graphics/PixelBufferConversion.cpp
platform/graphics/PixelBufferFormat.cpp
platform/graphics/PixelFormat.cpp
platform/graphics/PlatformTimeRanges.cpp
platform/graphics/PositionedGlyphs.cpp
platform/graphics/Region.cpp
platform/graphics/RoundedRect.cpp
platform/graphics/ShadowBlur.cpp
Expand Down Expand Up @@ -2319,7 +2317,6 @@ rendering/Grid.cpp
rendering/GridBaselineAlignment.cpp
rendering/GridLayoutFunctions.cpp
rendering/GridTrackSizingAlgorithm.cpp
rendering/GlyphDisplayListCache.cpp
rendering/HighlightData.cpp
rendering/HitTestLocation.cpp
rendering/HitTestResult.cpp
Expand Down
18 changes: 0 additions & 18 deletions Source/WebCore/WebCore.xcodeproj/project.pbxproj
Expand Up @@ -1014,9 +1014,6 @@
31FB1A5D120A5D0600DC02A0 /* DeviceMotionEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 31FB1A55120A5D0600DC02A0 /* DeviceMotionEvent.h */; };
31FB1A66120A5D3F00DC02A0 /* JSDeviceMotionEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 31FB1A64120A5D3F00DC02A0 /* JSDeviceMotionEvent.h */; };
31FE6DFA15004C2A0004EBC4 /* NotificationPermissionCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 31EC1DAC14FF26EA00C94662 /* NotificationPermissionCallback.h */; settings = {ATTRIBUTES = (Private, ); }; };
321111B7283AE4410067D300 /* TextRunHash.h in Headers */ = {isa = PBXBuildFile; fileRef = 321111B6283AE4400067D300 /* TextRunHash.h */; settings = {ATTRIBUTES = (Private, ); }; };
32A70D532836134B0080060C /* DecomposedGlyphs.h in Headers */ = {isa = PBXBuildFile; fileRef = 32A70D522836134A0080060C /* DecomposedGlyphs.h */; settings = {ATTRIBUTES = (Private, ); }; };
32A70D582836138E0080060C /* PositionedGlyphs.h in Headers */ = {isa = PBXBuildFile; fileRef = 32A70D562836138D0080060C /* PositionedGlyphs.h */; settings = {ATTRIBUTES = (Private, ); }; };
33503C9A10179A74003B47E1 /* NotificationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 33503C9910179A74003B47E1 /* NotificationClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
33503CA410179AD7003B47E1 /* JSNotification.h in Headers */ = {isa = PBXBuildFile; fileRef = 33503CA010179AD7003B47E1 /* JSNotification.h */; settings = {ATTRIBUTES = (Private, ); }; };
33D0212D131DB37B004091A8 /* CookieStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = E13F01EA1270E10D00DFBA71 /* CookieStorage.h */; settings = {ATTRIBUTES = (Private, ); }; };
Expand Down Expand Up @@ -8490,12 +8487,6 @@
31FB1A56120A5D0600DC02A0 /* DeviceMotionEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DeviceMotionEvent.idl; sourceTree = "<group>"; };
31FB1A63120A5D3F00DC02A0 /* JSDeviceMotionEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDeviceMotionEvent.cpp; sourceTree = "<group>"; };
31FB1A64120A5D3F00DC02A0 /* JSDeviceMotionEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDeviceMotionEvent.h; sourceTree = "<group>"; };
321111B6283AE4400067D300 /* TextRunHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextRunHash.h; sourceTree = "<group>"; };
32A70D522836134A0080060C /* DecomposedGlyphs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DecomposedGlyphs.h; sourceTree = "<group>"; };
32A70D542836135A0080060C /* DecomposedGlyphs.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DecomposedGlyphs.cpp; sourceTree = "<group>"; };
32A70D552836138D0080060C /* PositionedGlyphs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PositionedGlyphs.cpp; sourceTree = "<group>"; };
32A70D562836138D0080060C /* PositionedGlyphs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PositionedGlyphs.h; sourceTree = "<group>"; };
32B0B0CF283C7483006217C6 /* GlyphDisplayListCache.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GlyphDisplayListCache.cpp; sourceTree = "<group>"; };
331FF67DE197B57393C46A7F /* RenderMathMLPadded.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderMathMLPadded.h; sourceTree = "<group>"; };
331FF67DE197B57393C46AA7 /* RenderMathMLSpace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderMathMLSpace.h; sourceTree = "<group>"; };
333F704E0FB49CA2008E12A6 /* Notification.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Notification.idl; sourceTree = "<group>"; };
Expand Down Expand Up @@ -29181,8 +29172,6 @@
2D2FC0551460CD6F00263633 /* CrossfadeGeneratedImage.h */,
A8CB41020E85B8A50032C4F0 /* DashArray.h */,
555130001E7CCCCA00A69E38 /* DecodingOptions.h */,
32A70D542836135A0080060C /* DecomposedGlyphs.cpp */,
32A70D522836134A0080060C /* DecomposedGlyphs.h */,
BC2CCA0F2655DDB200B8C035 /* DestinationColorSpace.cpp */,
BC2CCA0E2655DDB200B8C035 /* DestinationColorSpace.h */,
49FC7A4F1444AF5F00A5D864 /* DisplayRefreshMonitor.cpp */,
Expand Down Expand Up @@ -29391,8 +29380,6 @@
CD1F9AFD26FD38CB00617EB6 /* PlatformVideoMatrixCoefficients.h */,
CDD08AC1277E554E00EA3755 /* PlatformVideoTrackConfiguration.h */,
CD1F9AFC26FD38CA00617EB6 /* PlatformVideoTransferCharacteristics.h */,
32A70D552836138D0080060C /* PositionedGlyphs.cpp */,
32A70D562836138D0080060C /* PositionedGlyphs.h */,
BCAB417F13E356E800D8AAF3 /* Region.cpp */,
BCAB418013E356E800D8AAF3 /* Region.h */,
7299BC6623D686C600CC6883 /* RenderingMode.h */,
Expand All @@ -29418,7 +29405,6 @@
722AF2E327E1CF110078D997 /* TextBoxIterator.h */,
376DCCE013B4F966002EBEFC /* TextRun.cpp */,
A824B4640E2EF2EA0081A7B7 /* TextRun.h */,
321111B6283AE4400067D300 /* TextRunHash.h */,
CD1E7346167BC78E009A885D /* TextTrackRepresentation.cpp */,
CDD1E525167BA56400CE820B /* TextTrackRepresentation.h */,
1AF89A411518FDEA00E547B5 /* TiledBacking.h */,
Expand Down Expand Up @@ -32269,7 +32255,6 @@
9A528E8117D7F52F00AA9518 /* FloatingObjects.cpp */,
9A528E8217D7F52F00AA9518 /* FloatingObjects.h */,
935C477409AC4D8D00A6AAB4 /* GapRects.h */,
32B0B0CF283C7483006217C6 /* GlyphDisplayListCache.cpp */,
5597FCCB2076C06800D35BB0 /* GlyphDisplayListCache.h */,
E112F4701E3A85F200D6CDFD /* Grid.cpp */,
E112F46F1E3A85D800D6CDFD /* Grid.h */,
Expand Down Expand Up @@ -34542,7 +34527,6 @@
715AD7202050513200D592DC /* DeclarativeAnimation.h in Headers */,
A8C228A111D5722E00D5A7D3 /* DecodedDataDocumentParser.h in Headers */,
555130011E7CCCCB00A69E38 /* DecodingOptions.h in Headers */,
32A70D532836134B0080060C /* DecomposedGlyphs.h in Headers */,
4162A451101145AE00DFF3ED /* DedicatedWorkerGlobalScope.h in Headers */,
41A3D58F101C152D00316D07 /* DedicatedWorkerThread.h in Headers */,
FD06DFA6134A4DEF006F5D7D /* DefaultAudioDestinationNode.h in Headers */,
Expand Down Expand Up @@ -37028,7 +37012,6 @@
37F567CE165358F400DDE92B /* PopupOpeningObserver.h in Headers */,
93F199DE08245E59001E9ABC /* Position.h in Headers */,
9746AF2C14F4DDE6003E7A70 /* PositionCallback.h in Headers */,
32A70D582836138E0080060C /* PositionedGlyphs.h in Headers */,
9746AF3014F4DDE6003E7A70 /* PositionErrorCallback.h in Headers */,
37919C240B7D188600A56998 /* PositionIterator.h in Headers */,
9746AF3214F4DDE6003E7A70 /* PositionOptions.h in Headers */,
Expand Down Expand Up @@ -38082,7 +38065,6 @@
F48B7D5325C341E6009E75DD /* TextRecognitionResult.h in Headers */,
93F198F608245E59001E9ABC /* TextResourceDecoder.h in Headers */,
A824B4650E2EF2EA0081A7B7 /* TextRun.h in Headers */,
321111B7283AE4410067D300 /* TextRunHash.h in Headers */,
448B1B7A0F3A2F9B0047A9E2 /* TextSizeAdjustment.h in Headers */,
9759E94014EF1CF80026A2DD /* TextTrack.h in Headers */,
CD1F9B212702565E00617EB6 /* TextTrackClient.h in Headers */,
Expand Down
8 changes: 0 additions & 8 deletions Source/WebCore/dom/Document.cpp
Expand Up @@ -91,7 +91,6 @@
#include "FullscreenManager.h"
#include "GCReachableRef.h"
#include "GenericCachedHTMLCollection.h"
#include "GlyphDisplayListCache.h"
#include "HTMLAllCollection.h"
#include "HTMLAnchorElement.h"
#include "HTMLAttachmentElement.h"
Expand Down Expand Up @@ -9177,13 +9176,6 @@ bool Document::isSameSiteForCookies(const URL& url) const
return domain.matches(url);
}

GlyphDisplayListCache& Document::glyphDisplayListCache()
{
if (!m_glyphDisplayListCache)
m_glyphDisplayListCache = makeUnique<GlyphDisplayListCache>();
return *m_glyphDisplayListCache;
}

} // namespace WebCore

#undef DOCUMENT_RELEASE_LOG
Expand Down

0 comments on commit 51c123d

Please sign in to comment.