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

Side by Side Diff: Source/core/html/HTMLFrameElementBase.cpp

Issue 196523007: Revert of id of iframe incorrectly sets window name (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Simon Hausmann (hausmann@kde.org) 4 * (C) 2000 Simon Hausmann (hausmann@kde.org)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 else if (name == onbeforeunloadAttr) { 130 else if (name == onbeforeunloadAttr) {
131 // FIXME: should <frame> elements have beforeunload handlers? 131 // FIXME: should <frame> elements have beforeunload handlers?
132 setAttributeEventListener(EventTypeNames::beforeunload, createAttributeE ventListener(this, name, value)); 132 setAttributeEventListener(EventTypeNames::beforeunload, createAttributeE ventListener(this, name, value));
133 } else 133 } else
134 HTMLFrameOwnerElement::parseAttribute(name, value); 134 HTMLFrameOwnerElement::parseAttribute(name, value);
135 } 135 }
136 136
137 void HTMLFrameElementBase::setNameAndOpenURL() 137 void HTMLFrameElementBase::setNameAndOpenURL()
138 { 138 {
139 m_frameName = getNameAttribute(); 139 m_frameName = getNameAttribute();
140 if (m_frameName.isNull())
141 m_frameName = getIdAttribute();
140 openURL(); 142 openURL();
141 } 143 }
142 144
143 Node::InsertionNotificationRequest HTMLFrameElementBase::insertedInto(ContainerN ode* insertionPoint) 145 Node::InsertionNotificationRequest HTMLFrameElementBase::insertedInto(ContainerN ode* insertionPoint)
144 { 146 {
145 HTMLFrameOwnerElement::insertedInto(insertionPoint); 147 HTMLFrameOwnerElement::insertedInto(insertionPoint);
146 return InsertionShouldCallDidNotifySubtreeInsertions; 148 return InsertionShouldCallDidNotifySubtreeInsertions;
147 } 149 }
148 150
149 void HTMLFrameElementBase::didNotifySubtreeInsertionsToDocument() 151 void HTMLFrameElementBase::didNotifySubtreeInsertionsToDocument()
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 226
225 int HTMLFrameElementBase::height() 227 int HTMLFrameElementBase::height()
226 { 228 {
227 document().updateLayoutIgnorePendingStylesheets(); 229 document().updateLayoutIgnorePendingStylesheets();
228 if (!renderBox()) 230 if (!renderBox())
229 return 0; 231 return 0;
230 return renderBox()->height(); 232 return renderBox()->height();
231 } 233 }
232 234
233 } // namespace WebCore 235 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/plugins/plugin-remove-subframe.html ('k') | Source/web/tests/data/iframe_redirect.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698