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

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

Issue 427563002: Remove HTMLFrameElement.width/height (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix tests Created 6 years, 4 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
« no previous file with comments | « Source/core/html/HTMLFrameElementBase.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 bool HTMLFrameElementBase::hasLegalLinkAttribute(const QualifiedName& name) cons t 200 bool HTMLFrameElementBase::hasLegalLinkAttribute(const QualifiedName& name) cons t
201 { 201 {
202 return name == srcAttr || HTMLFrameOwnerElement::hasLegalLinkAttribute(name) ; 202 return name == srcAttr || HTMLFrameOwnerElement::hasLegalLinkAttribute(name) ;
203 } 203 }
204 204
205 bool HTMLFrameElementBase::isHTMLContentAttribute(const Attribute& attribute) co nst 205 bool HTMLFrameElementBase::isHTMLContentAttribute(const Attribute& attribute) co nst
206 { 206 {
207 return attribute.name() == srcdocAttr || HTMLFrameOwnerElement::isHTMLConten tAttribute(attribute); 207 return attribute.name() == srcdocAttr || HTMLFrameOwnerElement::isHTMLConten tAttribute(attribute);
208 } 208 }
209 209
210 int HTMLFrameElementBase::width()
211 {
212 document().updateLayoutIgnorePendingStylesheets();
213 if (!renderBox())
214 return 0;
215 return renderBox()->width();
216 }
217
218 int HTMLFrameElementBase::height()
219 {
220 document().updateLayoutIgnorePendingStylesheets();
221 if (!renderBox())
222 return 0;
223 return renderBox()->height();
224 }
225
226 // FIXME: Remove this code once we have input routing in the browser 210 // FIXME: Remove this code once we have input routing in the browser
227 // process. See http://crbug.com/339659. 211 // process. See http://crbug.com/339659.
228 void HTMLFrameElementBase::defaultEventHandler(Event* event) 212 void HTMLFrameElementBase::defaultEventHandler(Event* event)
229 { 213 {
230 if (contentFrame() && contentFrame()->isRemoteFrameTemporary()) { 214 if (contentFrame() && contentFrame()->isRemoteFrameTemporary()) {
231 contentFrame()->chromeClient().forwardInputEvent(contentFrame(), event); 215 contentFrame()->chromeClient().forwardInputEvent(contentFrame(), event);
232 return; 216 return;
233 } 217 }
234 HTMLFrameOwnerElement::defaultEventHandler(event); 218 HTMLFrameOwnerElement::defaultEventHandler(event);
235 } 219 }
236 220
237 } // namespace blink 221 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/HTMLFrameElementBase.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698