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

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

Issue 14323004: Make Frame's ScriptController an OwnPtr and remove the #include (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix Created 7 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/HTMLFormElement.cpp ('k') | Source/core/html/HTMLPlugInImageElement.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 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 19 matching lines...) Expand all
30 #include "Document.h" 30 #include "Document.h"
31 #include "Event.h" 31 #include "Event.h"
32 #include "Frame.h" 32 #include "Frame.h"
33 #include "FrameLoader.h" 33 #include "FrameLoader.h"
34 #include "FrameTree.h" 34 #include "FrameTree.h"
35 #include "HTMLNames.h" 35 #include "HTMLNames.h"
36 #include "Page.h" 36 #include "Page.h"
37 #include "PluginViewBase.h" 37 #include "PluginViewBase.h"
38 #include "RenderEmbeddedObject.h" 38 #include "RenderEmbeddedObject.h"
39 #include "RenderWidget.h" 39 #include "RenderWidget.h"
40 #include "ScriptController.h"
40 #include "Settings.h" 41 #include "Settings.h"
41 #include "Widget.h" 42 #include "Widget.h"
42 #include "npruntime_impl.h" 43 #include "npruntime_impl.h"
43 #include <wtf/UnusedParam.h> 44 #include <wtf/UnusedParam.h>
44 45
45 46
46 namespace WebCore { 47 namespace WebCore {
47 48
48 using namespace HTMLNames; 49 using namespace HTMLNames;
49 50
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 238
238 NPObject* HTMLPlugInElement::getNPObject() 239 NPObject* HTMLPlugInElement::getNPObject()
239 { 240 {
240 ASSERT(document()->frame()); 241 ASSERT(document()->frame());
241 if (!m_NPObject) 242 if (!m_NPObject)
242 m_NPObject = document()->frame()->script()->createScriptObjectForPluginE lement(this); 243 m_NPObject = document()->frame()->script()->createScriptObjectForPluginE lement(this);
243 return m_NPObject; 244 return m_NPObject;
244 } 245 }
245 246
246 } 247 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLFormElement.cpp ('k') | Source/core/html/HTMLPlugInImageElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698