[webkit-changes] [WebKit/WebKit] 6d24d3: Simplify RenderImageResource by always using a Sty...

[Commit Queue]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 6d24d35f975f37b28278e3edfa4fb3be49153245
      https://github.com/WebKit/WebKit/commit/6d24d35f975f37b28278e3edfa4fb3be49153245
  Author: Sam Weinig <sam at webkit.org>
  Date:   2024-07-26 (Fri, 26 Jul 2024)

  Changed paths:
    M Source/WebCore/SmartPointerExpectations/UncountedCallArgsCheckerExpectations
    M Source/WebCore/Sources.txt
    M Source/WebCore/WebCore.xcodeproj/project.pbxproj
    M Source/WebCore/css/CSSImageValue.cpp
    M Source/WebCore/css/CSSImageValue.h
    M Source/WebCore/css/parser/CSSParserContext.h
    M Source/WebCore/rendering/RenderElement.cpp
    M Source/WebCore/rendering/RenderImage.cpp
    M Source/WebCore/rendering/RenderImageResource.cpp
    M Source/WebCore/rendering/RenderImageResource.h
    R Source/WebCore/rendering/RenderImageResourceStyleImage.cpp
    R Source/WebCore/rendering/RenderImageResourceStyleImage.h
    M Source/WebCore/rendering/mathml/RenderMathMLScripts.h
    M Source/WebCore/rendering/style/ContentData.cpp
    M Source/WebCore/rendering/style/StyleCachedImage.cpp
    M Source/WebCore/rendering/style/StyleCachedImage.h
    M Source/WebCore/rendering/style/StyleCursorImage.cpp
    M Source/WebCore/rendering/style/StyleCursorImage.h
    M Source/WebCore/rendering/style/StyleGeneratedImage.cpp
    M Source/WebCore/rendering/style/StyleGeneratedImage.h
    M Source/WebCore/rendering/style/StyleImage.h
    M Source/WebCore/rendering/style/StyleMultiImage.cpp
    M Source/WebCore/rendering/style/StyleMultiImage.h

  Log Message:
  -----------
  Simplify RenderImageResource by always using a StyleImage, even for the <img> case
https://bugs.webkit.org/show_bug.cgi?id=276904

Reviewed by Darin Adler.

Remove RenderImageResource hierarchy by wrapping raw CachedImages
from <img> tags in StyleCachedImage. Since StyleCachedImage already
needed to behave the same, this removes one potential divergent path.

* Source/WebCore/SmartPointerExpectations/UncountedCallArgsCheckerExpectations:
* Source/WebCore/Sources.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/css/CSSImageValue.cpp:
(WebCore::CSSImageValue::CSSImageValue):
(WebCore::CSSImageValue::create):
* Source/WebCore/css/CSSImageValue.h:
* Source/WebCore/css/parser/CSSParserContext.h:
(WebCore::makeResolvedURL):
* Source/WebCore/rendering/RenderElement.cpp:
* Source/WebCore/rendering/RenderImage.cpp:
(WebCore::RenderImage::RenderImage):
* Source/WebCore/rendering/RenderImageResource.cpp:
(WebCore::RenderImageResource::RenderImageResource):
(WebCore::RenderImageResource::initialize):
(WebCore::RenderImageResource::shutdown):
(WebCore::RenderImageResource::setCachedImage):
(WebCore::RenderImageResource::resetAnimation):
(WebCore::RenderImageResource::image const):
(WebCore::RenderImageResource::setContainerContext):
(WebCore::RenderImageResource::imageSize const):
* Source/WebCore/rendering/RenderImageResource.h:
(WebCore::RenderImageResource::initialize): Deleted.
(WebCore::RenderImageResource::cachedImage const): Deleted.
(WebCore::RenderImageResource::image): Deleted.
(WebCore::RenderImageResource::errorOccurred const): Deleted.
(WebCore::RenderImageResource::imageHasRelativeWidth const): Deleted.
(WebCore::RenderImageResource::imageHasRelativeHeight const): Deleted.
(WebCore::RenderImageResource::imageSize const): Deleted.
(WebCore::RenderImageResource::intrinsicSize const): Deleted.
(WebCore::RenderImageResource::imagePtr const): Deleted.
(WebCore::RenderImageResource::renderer const): Deleted.
* Source/WebCore/rendering/RenderImageResourceStyleImage.cpp: Removed.
* Source/WebCore/rendering/RenderImageResourceStyleImage.h: Removed.
* Source/WebCore/rendering/style/ContentData.cpp:
* Source/WebCore/rendering/style/StyleCachedImage.cpp:
(WebCore::StyleCachedImage::create):
(WebCore::StyleCachedImage::StyleCachedImage):
* Source/WebCore/rendering/style/StyleCachedImage.h:

Canonical link: https://commits.webkit.org/281408@main



To unsubscribe from these emails, change your notification settings at https://github.com/WebKit/WebKit/settings/notifications