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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLObjectElement.cpp

Issue 2167063002: Renamed attach() to attachLayoutTree() in comments. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
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 Stefan Schimanski (1Stein@gmx.de) 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
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 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 } 339 }
340 340
341 const AtomicString HTMLObjectElement::imageSourceURL() const 341 const AtomicString HTMLObjectElement::imageSourceURL() const
342 { 342 {
343 return getAttribute(dataAttr); 343 return getAttribute(dataAttr);
344 } 344 }
345 345
346 // TODO(schenney): crbug.com/572908 Remove this hack. 346 // TODO(schenney): crbug.com/572908 Remove this hack.
347 void HTMLObjectElement::reattachFallbackContent() 347 void HTMLObjectElement::reattachFallbackContent()
348 { 348 {
349 // This can happen inside of attach() in the middle of a recalcStyle so we n eed to 349 // This can happen inside of attachLayoutTree() in the middle of a recalcSty le so we need to
350 // reattach synchronously here. 350 // reattach synchronously here.
351 if (document().inStyleRecalc()) 351 if (document().inStyleRecalc())
352 reattach(); 352 reattach();
353 else 353 else
354 lazyReattachIfAttached(); 354 lazyReattachIfAttached();
355 } 355 }
356 356
357 void HTMLObjectElement::renderFallbackContent() 357 void HTMLObjectElement::renderFallbackContent()
358 { 358 {
359 if (useFallbackContent()) 359 if (useFallbackContent())
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 { 425 {
426 return fastHasAttribute(usemapAttr); 426 return fastHasAttribute(usemapAttr);
427 } 427 }
428 428
429 bool HTMLObjectElement::useFallbackContent() const 429 bool HTMLObjectElement::useFallbackContent() const
430 { 430 {
431 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent; 431 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent;
432 } 432 }
433 433
434 } // namespace blink 434 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLImageElement.cpp ('k') | third_party/WebKit/Source/core/html/forms/ImageInputType.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698