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

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

Issue 7950001: Merge 95204 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 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
« no previous file with comments | « Source/WebCore/html/HTMLEmbedElement.cpp ('k') | no next file » | 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 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 bool beforeLoadAllowedLoad = dispatchBeforeLoadEvent(url); 320 bool beforeLoadAllowedLoad = dispatchBeforeLoadEvent(url);
321 m_inBeforeLoadEventHandler = false; 321 m_inBeforeLoadEventHandler = false;
322 322
323 // beforeload events can modify the DOM, potentially causing 323 // beforeload events can modify the DOM, potentially causing
324 // RenderWidget::destroy() to be called. Ensure we haven't been 324 // RenderWidget::destroy() to be called. Ensure we haven't been
325 // destroyed before continuing. 325 // destroyed before continuing.
326 // FIXME: Should this render fallback content? 326 // FIXME: Should this render fallback content?
327 if (!renderer()) 327 if (!renderer())
328 return; 328 return;
329 329
330 RefPtr<HTMLObjectElement> protect(this); // Loading the plugin might remove us from the document.
330 SubframeLoader* loader = document()->frame()->loader()->subframeLoader(); 331 SubframeLoader* loader = document()->frame()->loader()->subframeLoader();
331 bool success = beforeLoadAllowedLoad && hasValidClassId() && loader->request Object(this, url, getAttribute(nameAttr), serviceType, paramNames, paramValues); 332 bool success = beforeLoadAllowedLoad && hasValidClassId() && loader->request Object(this, url, getAttribute(nameAttr), serviceType, paramNames, paramValues);
332 333
333 if (!success && fallbackContent) 334 if (!success && fallbackContent)
334 renderFallbackContent(); 335 renderFallbackContent();
335 } 336 }
336 337
337 bool HTMLObjectElement::rendererIsNeeded(const NodeRenderingContext& context) 338 bool HTMLObjectElement::rendererIsNeeded(const NodeRenderingContext& context)
338 { 339 {
339 // FIXME: This check should not be needed, detached documents never render! 340 // FIXME: This check should not be needed, detached documents never render!
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 { 548 {
548 return m_name.isNull() ? emptyAtom : m_name; 549 return m_name.isNull() ? emptyAtom : m_name;
549 } 550 }
550 551
551 HTMLFormElement* HTMLObjectElement::virtualForm() const 552 HTMLFormElement* HTMLObjectElement::virtualForm() const
552 { 553 {
553 return FormAssociatedElement::form(); 554 return FormAssociatedElement::form();
554 } 555 }
555 556
556 } 557 }
OLDNEW
« no previous file with comments | « Source/WebCore/html/HTMLEmbedElement.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698