Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(703)

Unified Diff: Source/core/html/HTMLImageElement.h

Issue 696123002: Revert of Use Shadow DOM to display fallback content for images (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/HTMLElement.h ('k') | Source/core/html/HTMLImageElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLImageElement.h
diff --git a/Source/core/html/HTMLImageElement.h b/Source/core/html/HTMLImageElement.h
index 402b5ceb418a8309661b8a9158c8b9bf160c8d19..1fceb3d75797573aed9677d44a935dc4aaa4340f 100644
--- a/Source/core/html/HTMLImageElement.h
+++ b/Source/core/html/HTMLImageElement.h
@@ -34,7 +34,6 @@
class HTMLFormElement;
class ImageCandidate;
-class ShadowRoot;
class HTMLImageElement final : public HTMLElement, public CanvasImageSource {
DEFINE_WRAPPERTYPEINFO();
@@ -57,7 +56,7 @@
bool isServerMap() const;
- virtual String altText() const override final;
+ const AtomicString& altText() const;
ImageResource* cachedImage() const { return imageLoader().image(); }
void setImageResource(ImageResource* i) { imageLoader().setImage(i); };
@@ -87,8 +86,6 @@
virtual HTMLFormElement* formOwner() const override;
void formRemovedFromTree(const Node& formRoot);
- virtual void ensureFallbackContent() override final;
- virtual void ensurePrimaryContent() override final;
// CanvasImageSourceImplementations
virtual PassRefPtr<Image> getSourceImageForCanvas(SourceImageMode, SourceImageStatus*) const override;
@@ -99,18 +96,11 @@
// public so that HTMLPictureElement can call this as well.
void selectSourceURL(ImageLoader::UpdateFromElementBehavior);
- void reattachFallbackContent();
- void setUseFallbackContent();
- void setIsFallbackImage() { m_isFallbackImage = true; }
-
protected:
explicit HTMLImageElement(Document&, HTMLFormElement* = 0, bool createdByParser = false);
virtual void didMoveToNewDocument(Document& oldDocument) override;
- virtual bool useFallbackContent() const { return m_useFallbackContent; }
- virtual void didAddUserAgentShadowRoot(ShadowRoot&) override;
- virtual PassRefPtr<RenderStyle> customStyleForRenderer() override;
private:
virtual bool areAuthorShadowsAllowed() const override { return false; }
@@ -156,8 +146,6 @@
unsigned m_elementCreatedByParser : 1;
// Intrinsic sizing is viewport dependant if the 'w' descriptor was used for the picked resource.
unsigned m_intrinsicSizingViewportDependant : 1;
- unsigned m_useFallbackContent : 1;
- unsigned m_isFallbackImage : 1;
};
} // namespace blink
« no previous file with comments | « Source/core/html/HTMLElement.h ('k') | Source/core/html/HTMLImageElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698