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

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

Issue 540283003: bindings: Retires ScriptWrappable::init, etc. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Addressed a review comment. Created 6 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/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 28 matching lines...) Expand all
39 #include "platform/weborigin/KURL.h" 39 #include "platform/weborigin/KURL.h"
40 #include "platform/weborigin/SecurityOrigin.h" 40 #include "platform/weborigin/SecurityOrigin.h"
41 41
42 namespace blink { 42 namespace blink {
43 43
44 using namespace HTMLNames; 44 using namespace HTMLNames;
45 45
46 HTMLAppletElement::HTMLAppletElement(Document& document, bool createdByParser) 46 HTMLAppletElement::HTMLAppletElement(Document& document, bool createdByParser)
47 : HTMLPlugInElement(appletTag, document, createdByParser, ShouldNotPreferPlu gInsForImages) 47 : HTMLPlugInElement(appletTag, document, createdByParser, ShouldNotPreferPlu gInsForImages)
48 { 48 {
49 ScriptWrappable::init(this);
50
51 m_serviceType = "application/x-java-applet"; 49 m_serviceType = "application/x-java-applet";
52 } 50 }
53 51
54 PassRefPtrWillBeRawPtr<HTMLAppletElement> HTMLAppletElement::create(Document& do cument, bool createdByParser) 52 PassRefPtrWillBeRawPtr<HTMLAppletElement> HTMLAppletElement::create(Document& do cument, bool createdByParser)
55 { 53 {
56 RefPtrWillBeRawPtr<HTMLAppletElement> element = adoptRefWillBeNoop(new HTMLA ppletElement(document, createdByParser)); 54 RefPtrWillBeRawPtr<HTMLAppletElement> element = adoptRefWillBeNoop(new HTMLA ppletElement(document, createdByParser));
57 element->ensureUserAgentShadowRoot(); 55 element->ensureUserAgentShadowRoot();
58 return element.release(); 56 return element.release();
59 } 57 }
60 58
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 221
224 if (!document().contentSecurityPolicy()->allowObjectFromSource(url) 222 if (!document().contentSecurityPolicy()->allowObjectFromSource(url)
225 || !document().contentSecurityPolicy()->allowPluginType(appletMimeType, appletMimeType, url)) { 223 || !document().contentSecurityPolicy()->allowPluginType(appletMimeType, appletMimeType, url)) {
226 renderEmbeddedObject()->setPluginUnavailabilityReason(RenderEmbeddedObje ct::PluginBlockedByContentSecurityPolicy); 224 renderEmbeddedObject()->setPluginUnavailabilityReason(RenderEmbeddedObje ct::PluginBlockedByContentSecurityPolicy);
227 return false; 225 return false;
228 } 226 }
229 return true; 227 return true;
230 } 228 }
231 229
232 } 230 }
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