Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: d768ef7903c204be6bb0b3fb464f2b5628920e01
https://github.com/WebKit/WebKit/commit/d768ef7903c204be6bb0b3fb464f2b5628920e01
Author: Abrar Rahman Protyasha <[email protected]>
Date: 2025-09-11 (Thu, 11 Sep 2025)
Changed paths:
M Source/WebCore/Headers.cmake
M Source/WebCore/SaferCPPExpectations/ForwardDeclCheckerExpectations
M Source/WebCore/SaferCPPExpectations/UncheckedCallArgsCheckerExpectations
M Source/WebCore/SaferCPPExpectations/UncheckedLocalVarsCheckerExpectations
M Source/WebCore/SaferCPPExpectations/UncountedCallArgsCheckerExpectations
M Source/WebCore/Sources.txt
M Source/WebCore/WebCore.order
M Source/WebCore/WebCore.xcodeproj/project.pbxproj
M Source/WebCore/html/HTMLEmbedElement.cpp
M Source/WebCore/html/HTMLEmbedElement.h
M Source/WebCore/html/HTMLFrameElementBase.cpp
M Source/WebCore/html/HTMLObjectElement.cpp
M Source/WebCore/html/HTMLObjectElement.h
M Source/WebCore/html/HTMLPlugInElement.cpp
M Source/WebCore/html/HTMLPlugInElement.h
R Source/WebCore/html/HTMLPlugInImageElement.cpp
R Source/WebCore/html/HTMLPlugInImageElement.h
M Source/WebCore/html/OffscreenCanvas.cpp
M Source/WebCore/loader/SubframeLoader.cpp
M Source/WebCore/loader/SubframeLoader.h
M Source/WebCore/page/LocalFrameView.cpp
M Source/WebCore/rendering/HitTestResult.cpp
M Source/WebCore/rendering/mac/RenderThemeMac.mm
M Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
M Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
M Source/WebKit/mac/WebKit2.order
M Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm
M Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm
M Tools/Scripts/do-webcore-rename
Log Message:
-----------
Merge WebCore::HTMLPlugInImageElement into WebCore::HTMLPlugInElement
https://bugs.webkit.org/show_bug.cgi?id=298532
rdar://160097146
Reviewed by Tim Horton.
HTMLPlugInImageElement is the only class that derives from
HTMLPlugInElement, so in this patch we merge the two classes together.
Among other things, this slightly shortens the inheritance trees for
HTMLObjectElement and HTMLEmbedElement.
This is a mostly mechanical patch which introduces no change in
functionality and simply lifts code from HTMLPlugInImageElement to
HTMLPlugInElement.
* Source/WebCore/Headers.cmake:
* Source/WebCore/SaferCPPExpectations/UncheckedCallArgsCheckerExpectations:
* Source/WebCore/SaferCPPExpectations/UncheckedLocalVarsCheckerExpectations:
* Source/WebCore/SaferCPPExpectations/UncountedCallArgsCheckerExpectations:
* Source/WebCore/Sources.txt:
* Source/WebCore/WebCore.order:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/html/HTMLEmbedElement.cpp:
(WebCore::HTMLEmbedElement::HTMLEmbedElement):
(WebCore::HTMLEmbedElement::renderWidgetLoadingPlugin const):
(WebCore::HTMLEmbedElement::collectPresentationalHintsForAttribute):
(WebCore::HTMLEmbedElement::attributeChanged):
(WebCore::HTMLEmbedElement::rendererIsNeeded):
(WebCore::HTMLEmbedElement::isURLAttribute const):
(WebCore::HTMLEmbedElement::addSubresourceAttributeURLs const):
* Source/WebCore/html/HTMLEmbedElement.h:
* Source/WebCore/html/HTMLFrameElementBase.cpp:
* Source/WebCore/html/HTMLObjectElement.cpp:
(WebCore::HTMLObjectElement::HTMLObjectElement):
(WebCore::HTMLObjectElement::hasPresentationalHintsForAttribute const):
(WebCore::HTMLObjectElement::collectPresentationalHintsForAttribute):
(WebCore::HTMLObjectElement::attributeChanged):
(WebCore::HTMLObjectElement::insertedIntoAncestor):
(WebCore::HTMLObjectElement::removedFromAncestor):
(WebCore::HTMLObjectElement::childrenChanged):
(WebCore::HTMLObjectElement::isURLAttribute const):
(WebCore::HTMLObjectElement::addSubresourceAttributeURLs const):
(WebCore::HTMLObjectElement::didMoveToNewDocument):
* Source/WebCore/html/HTMLObjectElement.h:
* Source/WebCore/html/HTMLPlugInElement.cpp:
(WebCore::HTMLPlugInElement::pluginElementTypeFlags):
(WebCore::HTMLPlugInElement::HTMLPlugInElement):
(WebCore::HTMLPlugInElement::~HTMLPlugInElement):
(WebCore::HTMLPlugInElement::willDetachRenderers):
(WebCore::HTMLPlugInElement::createPluginRenderer):
(WebCore::HTMLPlugInElement::createElementRenderer):
(WebCore::HTMLPlugInElement::swapRendererTimerFired):
(WebCore::HTMLPlugInElement::setDisplayState):
(WebCore::HTMLPlugInElement::didAddUserAgentShadowRoot):
(WebCore::HTMLPlugInElement::requestObject):
(WebCore::HTMLPlugInElement::updateImageLoaderWithNewURLSoon):
(WebCore::HTMLPlugInElement::scheduleUpdateForAfterStyleResolution):
(WebCore::HTMLPlugInElement::shouldBypassCSPForPDFPlugin const):
(WebCore::HTMLPlugInElement::renderEmbeddedObject const):
(WebCore::HTMLPlugInElement::canLoadURL const):
(WebCore::HTMLPlugInElement::wouldLoadAsPlugIn):
(WebCore::HTMLPlugInElement::isImageType):
(WebCore::HTMLPlugInElement::updateAfterStyleResolution):
(WebCore::HTMLPlugInElement::didMoveToNewDocument):
(WebCore::HTMLPlugInElement::childShouldCreateRenderer const):
(WebCore::HTMLPlugInElement::willRecalcStyle):
(WebCore::HTMLPlugInElement::didRecalcStyle):
(WebCore::HTMLPlugInElement::didAttachRenderers):
(WebCore::HTMLPlugInElement::prepareForDocumentSuspension):
(WebCore::HTMLPlugInElement::resumeFromDocumentSuspension):
(WebCore::HTMLPlugInElement::canLoadPlugInContent const):
* Source/WebCore/html/HTMLPlugInElement.h:
(WebCore::HTMLPlugInElement::serviceType const):
(WebCore::HTMLPlugInElement::url const):
(WebCore::HTMLPlugInElement::needsWidgetUpdate const):
(WebCore::HTMLPlugInElement::setNeedsWidgetUpdate):
(WebCore::HTMLPlugInElement::imageLoader):
Drive-by fix: Make DisplayState an enum class.
* Source/WebCore/html/HTMLPlugInImageElement.cpp: Removed.
* Source/WebCore/html/HTMLPlugInImageElement.h: Removed.
* Source/WebCore/loader/SubframeLoader.cpp:
(WebCore::FrameLoader::SubframeLoader::pluginIsLoadable const):
(WebCore::FrameLoader::SubframeLoader::requestPlugin):
(WebCore::FrameLoader::SubframeLoader::requestObject):
(WebCore::FrameLoader::SubframeLoader::loadPlugin):
* Source/WebCore/loader/SubframeLoader.h:
* Source/WebCore/page/LocalFrameView.cpp:
(WebCore::LocalFrameView::addEmbeddedObjectToUpdate):
(WebCore::LocalFrameView::updateEmbeddedObject):
* Source/WebCore/rendering/HitTestResult.cpp:
(WebCore::HitTestResult::absolutePDFURL const):
* Source/WebCore/rendering/mac/RenderThemeMac.mm:
* Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp:
* Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::performImmediateActionHitTestAtLocation):
* Source/WebKit/mac/WebKit2.order:
* Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm:
* Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm:
* Tools/Scripts/do-webcore-rename:
Rename the planned rename candidate now that PlugInImageElement no
longer exists. We should also probably consider dropping the rename
plan.
Canonical link: https://commits.webkit.org/299843@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
