Changeset 186392 in webkit for trunk/Source/WebCore/css/CSSValue.cpp

Timestamp:

Jul 6, 2015, 6:16:24 PM (10 years ago)

Author:

Simon Fraser

Message:

Revert use of SVG <mask> elements for -webkit-mask-image (r176798, r177494)
​https://bugs.webkit.org/show_bug.cgi?id=146653

Reviewed by Dean Jackson.

Fixes rdar://problem/21435233.

r177494 caused a number of regressions (bugs 141857, 146509, 146561), added new layering violations, and
was not being maintained, so revert it.

This patch reverts r176798.

• CMakeLists.txt:
• WebCore.vcxproj/WebCore.vcxproj:
• WebCore.vcxproj/WebCore.vcxproj.filters:
• WebCore.xcodeproj/project.pbxproj:
• css/CSSValue.cpp:

(WebCore::CSSValue::cssText): Deleted.
(WebCore::CSSValue::destroy): Deleted.

• css/CSSValue.h:

(WebCore::CSSValue::isWebKitCSSResourceValue): Deleted.

• css/StyleBuilderConverter.h:

(WebCore::maskImageValueFromIterator): Deleted.

• css/StyleResolver.cpp:

(WebCore::StyleResolver::State::clear): Deleted.

• css/StyleResolver.h:

(WebCore::StyleResolver::State::maskImagesWithPendingSVGDocuments): Deleted.

• css/WebKitCSSResourceValue.cpp: Removed.
• css/WebKitCSSResourceValue.h: Removed.
• loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::addCachedResource): Deleted.

• loader/cache/CachedResourceLoader.h:
• loader/cache/CachedSVGDocument.cpp:

(WebCore::CachedSVGDocument::finishLoading):
(WebCore::CachedSVGDocument::CachedSVGDocument): Deleted.

• loader/cache/CachedSVGDocument.h:
• loader/cache/CachedSVGDocumentReference.cpp:

(WebCore::CachedSVGDocumentReference::CachedSVGDocumentReference):
(WebCore::CachedSVGDocumentReference::~CachedSVGDocumentReference):
(WebCore::CachedSVGDocumentReference::load):

• loader/cache/CachedSVGDocumentReference.h:
• page/FrameView.cpp:

(WebCore::FrameView::containsSVGDocument): Deleted.

• page/FrameView.h:
• page/Page.cpp:

(WebCore::Page::createPageFromBuffer): Deleted.

• page/Page.h:
• platform/ScrollView.h:

(WebCore::ScrollView::containsSVGDocument): Deleted.

• platform/graphics/MaskImageOperation.cpp: Removed.
• platform/graphics/MaskImageOperation.h: Removed.
• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::RenderLayer): Deleted.

• rendering/RenderLayer.h:
• rendering/RenderLayerFilterInfo.cpp:
• rendering/RenderLayerFilterInfo.h:
• rendering/RenderLayerMaskImageInfo.h: Removed.
• rendering/style/FillLayer.cpp:

(WebCore::FillLayer::operator==):
(WebCore::FillLayer::cullEmptyLayers):
(WebCore::layerImagesIdentical):
(WebCore::FillLayer::FillLayer): Deleted.
(WebCore::FillLayer::operator=): Deleted.
(WebCore::FillLayer::hasNonEmptyMaskImage): Deleted.
(WebCore::FillLayer::imagesAreLoaded): Deleted.

• rendering/style/FillLayer.h:

(WebCore::FillLayer::maskImage): Deleted.
(WebCore::FillLayer::imageOrMaskImage): Deleted.
(WebCore::FillLayer::setMaskImage): Deleted.
(WebCore::FillLayer::clearMaskImage): Deleted.
(WebCore::FillLayer::hasMaskImage): Deleted.

• rendering/svg/RenderSVGResourceMasker.cpp:

(WebCore::RenderSVGResourceMasker::applyResource):
(WebCore::RenderSVGResourceMasker::applySVGMask): Deleted.
(WebCore::RenderSVGResourceMasker::drawMaskForRenderer): Deleted.

• rendering/svg/RenderSVGResourceMasker.h:
• svg/SVGMaskElement.cpp:

(WebCore::SVGMaskElement::createElementRenderer):
(WebCore::SVGMaskElement::addClientRenderLayer): Deleted.
(WebCore::SVGMaskElement::removeClientRenderLayer): Deleted.

• svg/SVGMaskElement.h:
• svg/SVGUseElement.cpp:

(WebCore::SVGUseElement::updateExternalDocument):

• svg/graphics/SVGImage.cpp:

(WebCore::SVGImage::dataChanged):

File:

• trunk/Source/WebCore/css/CSSValue.cpp (modified) (3 diffs)

trunk/Source/WebCore/css/CSSValue.cpp

@@ -58 +58 @@
 #include "SVGPaint.h"
 #include "WebKitCSSFilterValue.h"
-#include "WebKitCSSResourceValue.h"
 #include "WebKitCSSTransformValue.h"
 
@@ -330 +329 @@
         return downcast<CSSAnimationTriggerScrollValue>(*this).customCSSText();
 #endif
-    case WebKitCSSResourceClass:
-        return downcast<WebKitCSSResourceValue>(*this).customCSSText();
     case CSSContentDistributionClass:
         return downcast<CSSContentDistributionValue>(*this).customCSSText();
@@ -454 +451 @@
         return;
 #endif
-    case WebKitCSSResourceClass:
-        delete downcast<WebKitCSSResourceValue>(this);
-        return;
     case CSSContentDistributionClass:
         delete downcast<CSSContentDistributionValue>(this);