Break cyclic dependency between GraphicsLayer and GraphicsLayerContentsDisplayDelegate #6140
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mwyrzykowski
added
Layout and Rendering
|
EWS run on previous version of this PR (hash fb938f4)
|
smfr
approved these changes
Nov 4, 2022
| #pragma once | ||
|
|
||
| namespace WebCore { | ||
| enum class GraphicsLayerCompositingCoordinatesOrientation : uint8_t { TopDown, BottomUp }; |
There was a problem hiding this comment.
I'd be OK omitting the "GraphicsLayer" prefix.
…tsDisplayDelegate https://bugs.webkit.org/show_bug.cgi?id=247494 <radar://101965027> Reviewed by NOBODY (OOPS!). GraphicsLayer.h uses a RefPtr<ContentsDisplayDelegate> which requires the full definition on windows, but ContentsDisplayDelegate includes GraphicsLayer.h for the purpose of using a nested enum. Break this by moving the enum class to its own header file. * Source/WebCore/Headers.cmake: Add new files. * Source/WebCore/platform/graphics/CompositingCoordinatesOrientation.h: Copied from Source/WebCore/platform/graphics/GraphicsLayerContentsDisplayDelegate.cpp. Move enum class to its own header file. * Source/WebCore/WebCore.xcodeproj/project.pbxproj: * Source/WebCore/platform/graphics/GraphicsLayer.h: (WebCore::GraphicsLayer::setContentsOrientation): (WebCore::GraphicsLayer::contentsOrientation const): * Source/WebCore/platform/graphics/GraphicsLayerContentsDisplayDelegate.cpp: (WebCore::GraphicsLayerContentsDisplayDelegate::orientation const): * Source/WebCore/platform/graphics/GraphicsLayerContentsDisplayDelegate.h: * Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp: * Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h: * Source/WebCore/platform/graphics/ca/PlatformCALayerClient.h: (WebCore::PlatformCALayerClient::platformCALayerContentsOrientation const): * Source/WebCore/platform/graphics/ca/TileCoverageMap.h: * Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm: (WebCore::PlatformCALayer::drawLayerContents): * Source/WebCore/platform/graphics/cocoa/WebProcessGraphicsContextGLCocoa.mm: * Source/WebKit/WebProcess/GPU/graphics/cocoa/RemoteGraphicsContextGLProxyCocoa.mm: Rename nested enum.
mwyrzykowski
force-pushed
the
eng/Break-cyclic-dependency-between-GraphicsLayer-and-GraphicsLayerContentsDisplayDelegate
branch
from
fb938f4
to
4c22fa0
Compare
|
EWS run on current version of this PR (hash 4c22fa0)
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
4c22fa0
4c22fa0
🛠 🧪 win🛠 mac-debug🛠 wincairo🧪 ios-wk2🧪 gtk-wk2🧪 api-ios🧪 api-mac🧪 api-gtk🛠 tv🧪 mac-wk1🛠 tv-sim🧪 mac-wk2🛠 watch🧪 mac-AS-debug-wk2🛠 watch-sim🧪 mac-wk2-stress