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

Unified Diff: third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp

Issue 1307013004: Propagate scrolling/marginwidth/marginheight property values to child frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sync + fix html_viewer compile Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp b/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp
index 75865b6889054698df58dfc4a1fdf6b7b5a251e5..7aa50d4db81a06a17509f4341660aa7e0adf9e23 100644
--- a/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp
@@ -45,9 +45,6 @@ using namespace HTMLNames;
HTMLFrameElementBase::HTMLFrameElementBase(const QualifiedName& tagName, Document& document)
: HTMLFrameOwnerElement(tagName, document)
- , m_scrolling(ScrollbarAuto)
- , m_marginWidth(-1)
- , m_marginHeight(-1)
{
}
@@ -120,17 +117,17 @@ void HTMLFrameElementBase::parseAttribute(const QualifiedName& name, const Atomi
// FIXME: If we are already attached, this doesn't check for frame name
// conflicts and generate a unique frame name.
} else if (name == marginwidthAttr) {
- m_marginWidth = value.toInt();
+ setMarginWidth(value.toInt());
// FIXME: If we are already attached, this has no effect.
} else if (name == marginheightAttr) {
- m_marginHeight = value.toInt();
+ setMarginHeight(value.toInt());
// FIXME: If we are already attached, this has no effect.
} else if (name == scrollingAttr) {
// Auto and yes both simply mean "allow scrolling." No means "don't allow scrolling."
if (equalIgnoringCase(value, "auto") || equalIgnoringCase(value, "yes"))
- m_scrolling = ScrollbarAuto;
+ setScrollingMode(ScrollbarAuto);
else if (equalIgnoringCase(value, "no"))
- m_scrolling = ScrollbarAlwaysOff;
+ setScrollingMode(ScrollbarAlwaysOff);
// FIXME: If we are already attached, this has no effect.
} else if (name == onbeforeunloadAttr) {
// FIXME: should <frame> elements have beforeunload handlers?

Powered by Google App Engine
This is Rietveld 408576698