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

Side by Side Diff: Source/web/WebPluginContainerImpl.h

Issue 230813002: Make it possible to have <object>'s scriptableObject as a v8 object instead of NPObject. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased to current ToT (by raymes - fetched from https://codereview.chromium.org/426853002/) Created 6 years, 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2014 Opera Software ASA. All rights reserved.
3 * 4 *
4 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
6 * met: 7 * met:
7 * 8 *
8 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 11 * * Redistributions in binary form must reproduce the above
11 * copyright notice, this list of conditions and the following disclaimer 12 * copyright notice, this list of conditions and the following disclaimer
12 * in the documentation and/or other materials provided with the 13 * in the documentation and/or other materials provided with the
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 69
69 class WebPluginContainerImpl FINAL : public blink::PluginView, public WebPluginC ontainer, public blink::FrameDestructionObserver { 70 class WebPluginContainerImpl FINAL : public blink::PluginView, public WebPluginC ontainer, public blink::FrameDestructionObserver {
70 public: 71 public:
71 static PassRefPtr<WebPluginContainerImpl> create(blink::HTMLPlugInElement* e lement, WebPlugin* webPlugin) 72 static PassRefPtr<WebPluginContainerImpl> create(blink::HTMLPlugInElement* e lement, WebPlugin* webPlugin)
72 { 73 {
73 return adoptRef(new WebPluginContainerImpl(element, webPlugin)); 74 return adoptRef(new WebPluginContainerImpl(element, webPlugin));
74 } 75 }
75 76
76 // PluginView methods 77 // PluginView methods
77 virtual WebLayer* platformLayer() const OVERRIDE; 78 virtual WebLayer* platformLayer() const OVERRIDE;
78 virtual NPObject* scriptableObject() OVERRIDE; 79 virtual void getScriptableObject(v8::Isolate*, v8::Local<v8::Object>*) OVERR IDE;
79 virtual bool getFormValue(String&) OVERRIDE; 80 virtual bool getFormValue(String&) OVERRIDE;
80 virtual bool supportsKeyboardFocus() const OVERRIDE; 81 virtual bool supportsKeyboardFocus() const OVERRIDE;
81 virtual bool supportsInputMethod() const OVERRIDE; 82 virtual bool supportsInputMethod() const OVERRIDE;
82 virtual bool canProcessDrag() const OVERRIDE; 83 virtual bool canProcessDrag() const OVERRIDE;
83 virtual bool wantsWheelEvents() OVERRIDE; 84 virtual bool wantsWheelEvents() OVERRIDE;
84 85
85 // Widget methods 86 // Widget methods
86 virtual void setFrameRect(const blink::IntRect&) OVERRIDE; 87 virtual void setFrameRect(const blink::IntRect&) OVERRIDE;
87 virtual void paint(blink::GraphicsContext*, const blink::IntRect&) OVERRIDE; 88 virtual void paint(blink::GraphicsContext*, const blink::IntRect&) OVERRIDE;
88 virtual void invalidateRect(const blink::IntRect&) OVERRIDE; 89 virtual void invalidateRect(const blink::IntRect&) OVERRIDE;
(...skipping 11 matching lines...) Expand all
100 101
101 // WebPluginContainer methods 102 // WebPluginContainer methods
102 virtual WebElement element() OVERRIDE; 103 virtual WebElement element() OVERRIDE;
103 virtual void invalidate() OVERRIDE; 104 virtual void invalidate() OVERRIDE;
104 virtual void invalidateRect(const WebRect&) OVERRIDE; 105 virtual void invalidateRect(const WebRect&) OVERRIDE;
105 virtual void scrollRect(const WebRect&) OVERRIDE; 106 virtual void scrollRect(const WebRect&) OVERRIDE;
106 virtual void reportGeometry() OVERRIDE; 107 virtual void reportGeometry() OVERRIDE;
107 virtual void allowScriptObjects() OVERRIDE; 108 virtual void allowScriptObjects() OVERRIDE;
108 virtual void clearScriptObjects() OVERRIDE; 109 virtual void clearScriptObjects() OVERRIDE;
109 virtual NPObject* scriptableObjectForElement() OVERRIDE; 110 virtual NPObject* scriptableObjectForElement() OVERRIDE;
111 virtual v8::Local<v8::Object> getV8ObjectForElement() OVERRIDE;
abarth-chromium 2014/07/29 17:34:22 getV8ObjectForElement -> v8ObjectForElement
Krzysztof Olczyk 2014/07/30 08:40:31 Done.
110 virtual WebString executeScriptURL(const WebURL&, bool popupsAllowed) OVERRI DE; 112 virtual WebString executeScriptURL(const WebURL&, bool popupsAllowed) OVERRI DE;
111 virtual void loadFrameRequest(const WebURLRequest&, const WebString& target, bool notifyNeeded, void* notifyData) OVERRIDE; 113 virtual void loadFrameRequest(const WebURLRequest&, const WebString& target, bool notifyNeeded, void* notifyData) OVERRIDE;
112 virtual void zoomLevelChanged(double zoomLevel) OVERRIDE; 114 virtual void zoomLevelChanged(double zoomLevel) OVERRIDE;
113 virtual bool isRectTopmost(const WebRect&) OVERRIDE; 115 virtual bool isRectTopmost(const WebRect&) OVERRIDE;
114 virtual void requestTouchEventType(TouchEventRequestType) OVERRIDE; 116 virtual void requestTouchEventType(TouchEventRequestType) OVERRIDE;
115 virtual void setWantsWheelEvents(bool) OVERRIDE; 117 virtual void setWantsWheelEvents(bool) OVERRIDE;
116 virtual WebPoint windowToLocalPoint(const WebPoint&) OVERRIDE; 118 virtual WebPoint windowToLocalPoint(const WebPoint&) OVERRIDE;
117 virtual WebPoint localToWindowPoint(const WebPoint&) OVERRIDE; 119 virtual WebPoint localToWindowPoint(const WebPoint&) OVERRIDE;
118 120
119 // This cannot be null. 121 // This cannot be null.
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 }; 210 };
209 211
210 DEFINE_TYPE_CASTS(WebPluginContainerImpl, blink::Widget, widget, widget->isPlugi nContainer(), widget.isPluginContainer()); 212 DEFINE_TYPE_CASTS(WebPluginContainerImpl, blink::Widget, widget, widget->isPlugi nContainer(), widget.isPluginContainer());
211 // Unlike Widget, we need not worry about object type for container. 213 // Unlike Widget, we need not worry about object type for container.
212 // WebPluginContainerImpl is the only subclass of WebPluginContainer. 214 // WebPluginContainerImpl is the only subclass of WebPluginContainer.
213 DEFINE_TYPE_CASTS(WebPluginContainerImpl, WebPluginContainer, container, true, t rue); 215 DEFINE_TYPE_CASTS(WebPluginContainerImpl, WebPluginContainer, container, true, t rue);
214 216
215 } // namespace blink 217 } // namespace blink
216 218
217 #endif 219 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698