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

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

Issue 23956012: Stop passing NodeRenderingContext except in textRendererIsNeeded (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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/HTMLObjectElement.h ('k') | Source/core/html/HTMLOptGroupElement.h » ('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 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 RefPtr<HTMLObjectElement> protect(this); // beforeload and plugin loading ca n make arbitrary DOM mutations. 306 RefPtr<HTMLObjectElement> protect(this); // beforeload and plugin loading ca n make arbitrary DOM mutations.
307 bool beforeLoadAllowedLoad = dispatchBeforeLoadEvent(url); 307 bool beforeLoadAllowedLoad = dispatchBeforeLoadEvent(url);
308 if (!renderer()) // Do not load the plugin if beforeload removed this elemen t or its renderer. 308 if (!renderer()) // Do not load the plugin if beforeload removed this elemen t or its renderer.
309 return; 309 return;
310 310
311 bool success = beforeLoadAllowedLoad && hasValidClassId() && requestObject(u rl, serviceType, paramNames, paramValues); 311 bool success = beforeLoadAllowedLoad && hasValidClassId() && requestObject(u rl, serviceType, paramNames, paramValues);
312 if (!success && fallbackContent) 312 if (!success && fallbackContent)
313 renderFallbackContent(); 313 renderFallbackContent();
314 } 314 }
315 315
316 bool HTMLObjectElement::rendererIsNeeded(const NodeRenderingContext& context) 316 bool HTMLObjectElement::rendererIsNeeded(const RenderStyle& style)
317 { 317 {
318 // FIXME: This check should not be needed, detached documents never render! 318 // FIXME: This check should not be needed, detached documents never render!
319 Frame* frame = document().frame(); 319 Frame* frame = document().frame();
320 if (!frame) 320 if (!frame)
321 return false; 321 return false;
322 322
323 return HTMLPlugInImageElement::rendererIsNeeded(context); 323 return HTMLPlugInImageElement::rendererIsNeeded(style);
324 } 324 }
325 325
326 Node::InsertionNotificationRequest HTMLObjectElement::insertedInto(ContainerNode * insertionPoint) 326 Node::InsertionNotificationRequest HTMLObjectElement::insertedInto(ContainerNode * insertionPoint)
327 { 327 {
328 HTMLPlugInImageElement::insertedInto(insertionPoint); 328 HTMLPlugInImageElement::insertedInto(insertionPoint);
329 FormAssociatedElement::insertedInto(insertionPoint); 329 FormAssociatedElement::insertedInto(insertionPoint);
330 return InsertionDone; 330 return InsertionDone;
331 } 331 }
332 332
333 void HTMLObjectElement::removedFrom(ContainerNode* insertionPoint) 333 void HTMLObjectElement::removedFrom(ContainerNode* insertionPoint)
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 encoding.appendData(name(), value); 503 encoding.appendData(name(), value);
504 return true; 504 return true;
505 } 505 }
506 506
507 HTMLFormElement* HTMLObjectElement::virtualForm() const 507 HTMLFormElement* HTMLObjectElement::virtualForm() const
508 { 508 {
509 return FormAssociatedElement::form(); 509 return FormAssociatedElement::form();
510 } 510 }
511 511
512 } 512 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLObjectElement.h ('k') | Source/core/html/HTMLOptGroupElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698