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

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

Issue 275433011: Regression(r169412): Fix serialization of frame / iframe (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 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 | « no previous file | Source/web/tests/WebPageNewSerializerTest.cpp » ('j') | 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 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 } 192 }
193 193
194 bool HTMLFrameElementBase::isURLAttribute(const Attribute& attribute) const 194 bool HTMLFrameElementBase::isURLAttribute(const Attribute& attribute) const
195 { 195 {
196 return attribute.name() == longdescAttr || attribute.name() == srcAttr 196 return attribute.name() == longdescAttr || attribute.name() == srcAttr
197 || HTMLFrameOwnerElement::isURLAttribute(attribute); 197 || HTMLFrameOwnerElement::isURLAttribute(attribute);
198 } 198 }
199 199
200 bool HTMLFrameElementBase::hasLegalLinkAttribute(const QualifiedName& name) cons t 200 bool HTMLFrameElementBase::hasLegalLinkAttribute(const QualifiedName& name) cons t
201 { 201 {
202 return name == hrefAttr || 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() 210 int HTMLFrameElementBase::width()
211 { 211 {
212 document().updateLayoutIgnorePendingStylesheets(); 212 document().updateLayoutIgnorePendingStylesheets();
(...skipping 15 matching lines...) Expand all
228 void HTMLFrameElementBase::defaultEventHandler(Event* event) 228 void HTMLFrameElementBase::defaultEventHandler(Event* event)
229 { 229 {
230 if (contentFrame() && contentFrame()->isRemoteFrameTemporary()) { 230 if (contentFrame() && contentFrame()->isRemoteFrameTemporary()) {
231 contentFrame()->chromeClient().forwardInputEvent(contentFrame(), event); 231 contentFrame()->chromeClient().forwardInputEvent(contentFrame(), event);
232 return; 232 return;
233 } 233 }
234 HTMLFrameOwnerElement::defaultEventHandler(event); 234 HTMLFrameOwnerElement::defaultEventHandler(event);
235 } 235 }
236 236
237 } // namespace WebCore 237 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/web/tests/WebPageNewSerializerTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698