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

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

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 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/HTMLPlugInElement.h ('k') | Source/core/html/HTMLProgressElement.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 Apple Computer, Inc. 5 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 } 256 }
257 257
258 if (m_NPObject) { 258 if (m_NPObject) {
259 _NPN_ReleaseObject(m_NPObject); 259 _NPN_ReleaseObject(m_NPObject);
260 m_NPObject = 0; 260 m_NPObject = 0;
261 } 261 }
262 262
263 HTMLFrameOwnerElement::detach(context); 263 HTMLFrameOwnerElement::detach(context);
264 } 264 }
265 265
266 LayoutObject* HTMLPlugInElement::createLayoutObject(const LayoutStyle& style) 266 LayoutObject* HTMLPlugInElement::createLayoutObject(const ComputedStyle& style)
267 { 267 {
268 // Fallback content breaks the DOM->Renderer class relationship of this 268 // Fallback content breaks the DOM->Renderer class relationship of this
269 // class and all superclasses because createObject won't necessarily return 269 // class and all superclasses because createObject won't necessarily return
270 // a LayoutEmbeddedObject or LayoutPart. 270 // a LayoutEmbeddedObject or LayoutPart.
271 if (useFallbackContent()) 271 if (useFallbackContent())
272 return LayoutObject::createObject(this, style); 272 return LayoutObject::createObject(this, style);
273 273
274 if (isImageType()) { 274 if (isImageType()) {
275 LayoutImage* image = new LayoutImage(this); 275 LayoutImage* image = new LayoutImage(this);
276 image->setImageResource(LayoutImageResource::create()); 276 image->setImageResource(LayoutImageResource::create());
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 return hasOpenShadowRoot(); 665 return hasOpenShadowRoot();
666 } 666 }
667 667
668 void HTMLPlugInElement::lazyReattachIfNeeded() 668 void HTMLPlugInElement::lazyReattachIfNeeded()
669 { 669 {
670 if (!useFallbackContent() && !usePlaceholderContent() && needsWidgetUpdate() && layoutObject() && !isImageType()) 670 if (!useFallbackContent() && !usePlaceholderContent() && needsWidgetUpdate() && layoutObject() && !isImageType())
671 lazyReattachIfAttached(); 671 lazyReattachIfAttached();
672 } 672 }
673 673
674 } 674 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLPlugInElement.h ('k') | Source/core/html/HTMLProgressElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698