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

Side by Side Diff: Source/core/rendering/RenderEmbeddedObject.h

Issue 246933007: Make <iframe> containing SVG behave as every other <iframe> (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add NeedsRebaseline to test for landing Created 6 years, 8 months 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Simon Hausmann <hausmann@kde.org> 3 * (C) 2000 Simon Hausmann <hausmann@kde.org>
4 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 const RenderObjectChildList* children() const { return &m_children; } 55 const RenderObjectChildList* children() const { return &m_children; }
56 RenderObjectChildList* children() { return &m_children; } 56 RenderObjectChildList* children() { return &m_children; }
57 57
58 protected: 58 protected:
59 virtual void layout() OVERRIDE FINAL; 59 virtual void layout() OVERRIDE FINAL;
60 60
61 private: 61 private:
62 virtual const char* renderName() const OVERRIDE { return "RenderEmbeddedObje ct"; } 62 virtual const char* renderName() const OVERRIDE { return "RenderEmbeddedObje ct"; }
63 virtual bool isEmbeddedObject() const OVERRIDE FINAL { return true; } 63 virtual bool isEmbeddedObject() const OVERRIDE FINAL { return true; }
64 virtual RenderBox* embeddedContentBox() const OVERRIDE FINAL;
64 65
65 void paintSnapshotImage(PaintInfo&, const LayoutPoint&, Image*); 66 void paintSnapshotImage(PaintInfo&, const LayoutPoint&, Image*);
66 virtual void paintContents(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL; 67 virtual void paintContents(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL;
67 68
68 virtual LayerType layerTypeRequired() const OVERRIDE FINAL; 69 virtual LayerType layerTypeRequired() const OVERRIDE FINAL;
69 70
70 virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier) OV ERRIDE FINAL; 71 virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier) OV ERRIDE FINAL;
71 72
72 bool getReplacementTextGeometry(const LayoutPoint& accumulatedOffset, FloatR ect& contentRect, Path&, FloatRect& replacementTextRect, Font&, TextRun&, float& textWidth) const; 73 bool getReplacementTextGeometry(const LayoutPoint& accumulatedOffset, FloatR ect& contentRect, Path&, FloatRect& replacementTextRect, Font&, TextRun&, float& textWidth) const;
73 74
74 virtual bool canHaveChildren() const OVERRIDE FINAL; 75 virtual bool canHaveChildren() const OVERRIDE FINAL;
75 virtual RenderObjectChildList* virtualChildren() OVERRIDE FINAL { return chi ldren(); } 76 virtual RenderObjectChildList* virtualChildren() OVERRIDE FINAL { return chi ldren(); }
76 virtual const RenderObjectChildList* virtualChildren() const OVERRIDE FINAL { return children(); } 77 virtual const RenderObjectChildList* virtualChildren() const OVERRIDE FINAL { return children(); }
77 78
78 virtual CompositingReasons additionalCompositingReasons(CompositingTriggerFl ags) const OVERRIDE; 79 virtual CompositingReasons additionalCompositingReasons(CompositingTriggerFl ags) const OVERRIDE;
79 80
80 bool m_hasFallbackContent; // FIXME: This belongs on HTMLObjectElement. 81 bool m_hasFallbackContent; // FIXME: This belongs on HTMLObjectElement.
81 82
82 bool m_showsUnavailablePluginIndicator; 83 bool m_showsUnavailablePluginIndicator;
83 PluginUnavailabilityReason m_pluginUnavailabilityReason; 84 PluginUnavailabilityReason m_pluginUnavailabilityReason;
84 String m_unavailablePluginReplacementText; 85 String m_unavailablePluginReplacementText;
85 RenderObjectChildList m_children; 86 RenderObjectChildList m_children;
86 }; 87 };
87 88
88 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderEmbeddedObject, isEmbeddedObject()); 89 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderEmbeddedObject, isEmbeddedObject());
89 90
90 } // namespace WebCore 91 } // namespace WebCore
91 92
92 #endif // RenderEmbeddedObject_h 93 #endif // RenderEmbeddedObject_h
OLDNEW
« no previous file with comments | « LayoutTests/svg/as-iframe/svg-in-iframe.html ('k') | Source/core/rendering/RenderEmbeddedObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698