OLD | NEW |
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 20 matching lines...) Expand all Loading... |
31 #include "core/dom/Node.h" | 31 #include "core/dom/Node.h" |
32 #include "core/dom/shadow/ShadowRoot.h" | 32 #include "core/dom/shadow/ShadowRoot.h" |
33 #include "core/events/Event.h" | 33 #include "core/events/Event.h" |
34 #include "core/frame/FrameView.h" | 34 #include "core/frame/FrameView.h" |
35 #include "core/frame/LocalFrame.h" | 35 #include "core/frame/LocalFrame.h" |
36 #include "core/frame/Settings.h" | 36 #include "core/frame/Settings.h" |
37 #include "core/frame/csp/ContentSecurityPolicy.h" | 37 #include "core/frame/csp/ContentSecurityPolicy.h" |
38 #include "core/html/HTMLContentElement.h" | 38 #include "core/html/HTMLContentElement.h" |
39 #include "core/html/HTMLImageLoader.h" | 39 #include "core/html/HTMLImageLoader.h" |
40 #include "core/html/PluginDocument.h" | 40 #include "core/html/PluginDocument.h" |
| 41 #include "core/layout/LayoutImage.h" |
41 #include "core/loader/FrameLoaderClient.h" | 42 #include "core/loader/FrameLoaderClient.h" |
42 #include "core/loader/MixedContentChecker.h" | 43 #include "core/loader/MixedContentChecker.h" |
43 #include "core/page/EventHandler.h" | 44 #include "core/page/EventHandler.h" |
44 #include "core/page/Page.h" | 45 #include "core/page/Page.h" |
45 #include "core/page/scrolling/ScrollingCoordinator.h" | 46 #include "core/page/scrolling/ScrollingCoordinator.h" |
46 #include "core/plugins/PluginPlaceholder.h" | 47 #include "core/plugins/PluginPlaceholder.h" |
47 #include "core/plugins/PluginView.h" | 48 #include "core/plugins/PluginView.h" |
48 #include "core/rendering/RenderBlockFlow.h" | 49 #include "core/rendering/RenderBlockFlow.h" |
49 #include "core/rendering/RenderEmbeddedObject.h" | 50 #include "core/rendering/RenderEmbeddedObject.h" |
50 #include "core/rendering/RenderImage.h" | |
51 #include "core/rendering/RenderPart.h" | 51 #include "core/rendering/RenderPart.h" |
52 #include "platform/Logging.h" | 52 #include "platform/Logging.h" |
53 #include "platform/MIMETypeFromURL.h" | 53 #include "platform/MIMETypeFromURL.h" |
54 #include "platform/MIMETypeRegistry.h" | 54 #include "platform/MIMETypeRegistry.h" |
55 #include "platform/Widget.h" | 55 #include "platform/Widget.h" |
56 #include "platform/plugins/PluginData.h" | 56 #include "platform/plugins/PluginData.h" |
57 #include "public/platform/WebURLRequest.h" | 57 #include "public/platform/WebURLRequest.h" |
58 | 58 |
59 namespace blink { | 59 namespace blink { |
60 | 60 |
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
265 | 265 |
266 LayoutObject* HTMLPlugInElement::createRenderer(const LayoutStyle& style) | 266 LayoutObject* HTMLPlugInElement::createRenderer(const LayoutStyle& 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 RenderEmbeddedObject or RenderPart. | 270 // a RenderEmbeddedObject or RenderPart. |
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 RenderImage* image = new RenderImage(this); | 275 LayoutImage* image = new LayoutImage(this); |
276 image->setImageResource(RenderImageResource::create()); | 276 image->setImageResource(LayoutImageResource::create()); |
277 return image; | 277 return image; |
278 } | 278 } |
279 | 279 |
280 if (usePlaceholderContent()) | 280 if (usePlaceholderContent()) |
281 return new RenderBlockFlow(this); | 281 return new RenderBlockFlow(this); |
282 | 282 |
283 return new RenderEmbeddedObject(this); | 283 return new RenderEmbeddedObject(this); |
284 } | 284 } |
285 | 285 |
286 void HTMLPlugInElement::finishParsingChildren() | 286 void HTMLPlugInElement::finishParsingChildren() |
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
672 return hasAuthorShadowRoot(); | 672 return hasAuthorShadowRoot(); |
673 } | 673 } |
674 | 674 |
675 void HTMLPlugInElement::lazyReattachIfNeeded() | 675 void HTMLPlugInElement::lazyReattachIfNeeded() |
676 { | 676 { |
677 if (!useFallbackContent() && !usePlaceholderContent() && needsWidgetUpdate()
&& renderer() && !isImageType()) | 677 if (!useFallbackContent() && !usePlaceholderContent() && needsWidgetUpdate()
&& renderer() && !isImageType()) |
678 lazyReattachIfAttached(); | 678 lazyReattachIfAttached(); |
679 } | 679 } |
680 | 680 |
681 } | 681 } |
OLD | NEW |