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

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

Issue 1186823007: Code cleanup in core/html/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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/HTMLAnchorElement.cpp ('k') | Source/core/html/HTMLAreaElement.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, 2008, 2009, 2012 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2012 Apple Inc. All rights reserv ed.
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 10 matching lines...) Expand all
21 * Boston, MA 02110-1301, USA. 21 * Boston, MA 02110-1301, USA.
22 */ 22 */
23 23
24 #include "config.h" 24 #include "config.h"
25 #include "core/html/HTMLAppletElement.h" 25 #include "core/html/HTMLAppletElement.h"
26 26
27 #include "core/HTMLNames.h" 27 #include "core/HTMLNames.h"
28 #include "core/dom/ElementTraversal.h" 28 #include "core/dom/ElementTraversal.h"
29 #include "core/dom/shadow/ShadowRoot.h" 29 #include "core/dom/shadow/ShadowRoot.h"
30 #include "core/html/HTMLParamElement.h" 30 #include "core/html/HTMLParamElement.h"
31 #include "core/loader/FrameLoader.h"
32 #include "core/loader/FrameLoaderClient.h"
33 #include "core/frame/LocalFrame.h" 31 #include "core/frame/LocalFrame.h"
34 #include "core/frame/Settings.h" 32 #include "core/frame/Settings.h"
35 #include "core/frame/csp/ContentSecurityPolicy.h" 33 #include "core/frame/csp/ContentSecurityPolicy.h"
36 #include "core/layout/LayoutApplet.h" 34 #include "core/layout/LayoutApplet.h"
37 #include "core/layout/LayoutBlockFlow.h" 35 #include "core/layout/LayoutBlockFlow.h"
36 #include "core/loader/FrameLoader.h"
37 #include "core/loader/FrameLoaderClient.h"
38 #include "core/plugins/PluginPlaceholder.h" 38 #include "core/plugins/PluginPlaceholder.h"
39 #include "platform/Widget.h" 39 #include "platform/Widget.h"
40 #include "platform/weborigin/KURL.h" 40 #include "platform/weborigin/KURL.h"
41 #include "platform/weborigin/SecurityOrigin.h" 41 #include "platform/weborigin/SecurityOrigin.h"
42 42
43 namespace blink { 43 namespace blink {
44 44
45 using namespace HTMLNames; 45 using namespace HTMLNames;
46 46
47 HTMLAppletElement::HTMLAppletElement(Document& document, bool createdByParser) 47 HTMLAppletElement::HTMLAppletElement(Document& document, bool createdByParser)
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 233
234 if (!document().contentSecurityPolicy()->allowObjectFromSource(url) 234 if (!document().contentSecurityPolicy()->allowObjectFromSource(url)
235 || !document().contentSecurityPolicy()->allowPluginTypeForDocument(docum ent(), m_serviceType, m_serviceType, url)) { 235 || !document().contentSecurityPolicy()->allowPluginTypeForDocument(docum ent(), m_serviceType, m_serviceType, url)) {
236 layoutEmbeddedObject()->setPluginUnavailabilityReason(LayoutEmbeddedObje ct::PluginBlockedByContentSecurityPolicy); 236 layoutEmbeddedObject()->setPluginUnavailabilityReason(LayoutEmbeddedObje ct::PluginBlockedByContentSecurityPolicy);
237 return false; 237 return false;
238 } 238 }
239 return true; 239 return true;
240 } 240 }
241 241
242 } 242 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLAnchorElement.cpp ('k') | Source/core/html/HTMLAreaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698