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

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

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 years, 10 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/HTMLElement.cpp ('k') | Source/core/html/HTMLLinkElement.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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 return true; 189 return true;
190 } 190 }
191 191
192 void HTMLFrameElementBase::setFocus(bool received) 192 void HTMLFrameElementBase::setFocus(bool received)
193 { 193 {
194 HTMLFrameOwnerElement::setFocus(received); 194 HTMLFrameOwnerElement::setFocus(received);
195 if (Page* page = document().page()) { 195 if (Page* page = document().page()) {
196 if (received) 196 if (received)
197 page->focusController().setFocusedFrame(contentFrame()); 197 page->focusController().setFocusedFrame(contentFrame());
198 else if (page->focusController().focusedFrame() == contentFrame()) // Fo cus may have already been given to another frame, don't take it away. 198 else if (page->focusController().focusedFrame() == contentFrame()) // Fo cus may have already been given to another frame, don't take it away.
199 page->focusController().setFocusedFrame(0); 199 page->focusController().setFocusedFrame(nullptr);
200 } 200 }
201 } 201 }
202 202
203 bool HTMLFrameElementBase::isURLAttribute(const Attribute& attribute) const 203 bool HTMLFrameElementBase::isURLAttribute(const Attribute& attribute) const
204 { 204 {
205 return attribute.name() == longdescAttr || attribute.name() == srcAttr 205 return attribute.name() == longdescAttr || attribute.name() == srcAttr
206 || HTMLFrameOwnerElement::isURLAttribute(attribute); 206 || HTMLFrameOwnerElement::isURLAttribute(attribute);
207 } 207 }
208 208
209 bool HTMLFrameElementBase::isHTMLContentAttribute(const Attribute& attribute) co nst 209 bool HTMLFrameElementBase::isHTMLContentAttribute(const Attribute& attribute) co nst
(...skipping 11 matching lines...) Expand all
221 221
222 int HTMLFrameElementBase::height() 222 int HTMLFrameElementBase::height()
223 { 223 {
224 document().updateLayoutIgnorePendingStylesheets(); 224 document().updateLayoutIgnorePendingStylesheets();
225 if (!renderBox()) 225 if (!renderBox())
226 return 0; 226 return 0;
227 return renderBox()->height(); 227 return renderBox()->height();
228 } 228 }
229 229
230 } // namespace WebCore 230 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/HTMLElement.cpp ('k') | Source/core/html/HTMLLinkElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698