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

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

Issue 152623002: Make StyleChange parameter explicit in setNeedsStyleRecalc. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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/HTMLInputElement.cpp ('k') | Source/core/html/HTMLPlugInElement.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 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 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 } else if (name == dataAttr) { 274 } else if (name == dataAttr) {
275 needsInvalidation = !fastHasAttribute(classidAttr); 275 needsInvalidation = !fastHasAttribute(classidAttr);
276 } else if (name == classidAttr) { 276 } else if (name == classidAttr) {
277 needsInvalidation = true; 277 needsInvalidation = true;
278 } else { 278 } else {
279 ASSERT_NOT_REACHED(); 279 ASSERT_NOT_REACHED();
280 needsInvalidation = false; 280 needsInvalidation = false;
281 } 281 }
282 setNeedsWidgetUpdate(true); 282 setNeedsWidgetUpdate(true);
283 if (needsInvalidation) 283 if (needsInvalidation)
284 setNeedsStyleRecalc(); 284 setNeedsStyleRecalc(SubtreeStyleChange);
285 } 285 }
286 286
287 // FIXME: This should be unified with HTMLEmbedElement::updateWidget and 287 // FIXME: This should be unified with HTMLEmbedElement::updateWidget and
288 // moved down into HTMLPluginElement.cpp 288 // moved down into HTMLPluginElement.cpp
289 void HTMLObjectElement::updateWidgetInternal() 289 void HTMLObjectElement::updateWidgetInternal()
290 { 290 {
291 ASSERT(!renderEmbeddedObject()->showsUnavailablePluginIndicator()); 291 ASSERT(!renderEmbeddedObject()->showsUnavailablePluginIndicator());
292 ASSERT(needsWidgetUpdate()); 292 ASSERT(needsWidgetUpdate());
293 setNeedsWidgetUpdate(false); 293 setNeedsWidgetUpdate(false);
294 // FIXME: This should ASSERT isFinishedParsingChildren() instead. 294 // FIXME: This should ASSERT isFinishedParsingChildren() instead.
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 void HTMLObjectElement::removedFrom(ContainerNode* insertionPoint) 353 void HTMLObjectElement::removedFrom(ContainerNode* insertionPoint)
354 { 354 {
355 HTMLPlugInElement::removedFrom(insertionPoint); 355 HTMLPlugInElement::removedFrom(insertionPoint);
356 FormAssociatedElement::removedFrom(insertionPoint); 356 FormAssociatedElement::removedFrom(insertionPoint);
357 } 357 }
358 358
359 void HTMLObjectElement::childrenChanged(bool changedByParser, Node* beforeChange , Node* afterChange, int childCountDelta) 359 void HTMLObjectElement::childrenChanged(bool changedByParser, Node* beforeChange , Node* afterChange, int childCountDelta)
360 { 360 {
361 if (inDocument() && !useFallbackContent()) { 361 if (inDocument() && !useFallbackContent()) {
362 setNeedsWidgetUpdate(true); 362 setNeedsWidgetUpdate(true);
363 setNeedsStyleRecalc(); 363 setNeedsStyleRecalc(SubtreeStyleChange);
364 } 364 }
365 HTMLPlugInElement::childrenChanged(changedByParser, beforeChange, afterChang e, childCountDelta); 365 HTMLPlugInElement::childrenChanged(changedByParser, beforeChange, afterChang e, childCountDelta);
366 } 366 }
367 367
368 bool HTMLObjectElement::isURLAttribute(const Attribute& attribute) const 368 bool HTMLObjectElement::isURLAttribute(const Attribute& attribute) const
369 { 369 {
370 return attribute.name() == codebaseAttr || attribute.name() == dataAttr 370 return attribute.name() == codebaseAttr || attribute.name() == dataAttr
371 || (attribute.name() == usemapAttr && attribute.value().string()[0] != ' #') 371 || (attribute.name() == usemapAttr && attribute.value().string()[0] != ' #')
372 || HTMLPlugInElement::isURLAttribute(attribute); 372 || HTMLPlugInElement::isURLAttribute(attribute);
373 } 373 }
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 { 476 {
477 return fastHasAttribute(usemapAttr); 477 return fastHasAttribute(usemapAttr);
478 } 478 }
479 479
480 bool HTMLObjectElement::useFallbackContent() const 480 bool HTMLObjectElement::useFallbackContent() const
481 { 481 {
482 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent; 482 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent;
483 } 483 }
484 484
485 } 485 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLInputElement.cpp ('k') | Source/core/html/HTMLPlugInElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698