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

Side by Side Diff: content/renderer/browser_plugin/browser_plugin.h

Issue 10968015: Revert 157773 - This is followup from Charlie's comments on Fady's cl: http://chromiumcodereview.ap… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | « content/content_tests.gypi ('k') | content/renderer/browser_plugin/browser_plugin.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_ 5 #ifndef CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_
6 #define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_ 6 #define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_
7 7
8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h" 8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h"
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/sequenced_task_runner_helpers.h" 11 #include "base/sequenced_task_runner_helpers.h"
12 #if defined(OS_WIN)
13 #include "base/shared_memory.h"
14 #endif
15 #include "content/renderer/browser_plugin/browser_plugin_backing_store.h" 12 #include "content/renderer/browser_plugin/browser_plugin_backing_store.h"
16 #include "content/renderer/browser_plugin/browser_plugin_bindings.h" 13 #include "content/renderer/browser_plugin/browser_plugin_bindings.h"
17 #include "content/renderer/render_view_impl.h" 14 #include "content/renderer/render_view_impl.h"
18 15
19 struct BrowserPluginMsg_UpdateRect_Params; 16 struct BrowserPluginMsg_UpdateRect_Params;
20 17
21 namespace content { 18 namespace content {
22 19
23 class BrowserPluginManager; 20 class BrowserPluginManager;
24 class MockBrowserPlugin; 21 class MockBrowserPlugin;
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 RenderViewImpl* render_view_; 129 RenderViewImpl* render_view_;
133 WebKit::WebPluginContainer* container_; 130 WebKit::WebPluginContainer* container_;
134 scoped_ptr<BrowserPluginBindings> bindings_; 131 scoped_ptr<BrowserPluginBindings> bindings_;
135 scoped_ptr<BrowserPluginBackingStore> backing_store_; 132 scoped_ptr<BrowserPluginBackingStore> backing_store_;
136 TransportDIB* damage_buffer_; 133 TransportDIB* damage_buffer_;
137 gfx::Rect plugin_rect_; 134 gfx::Rect plugin_rect_;
138 // Bitmap for crashed plugin. Lazily initialized, non-owning pointer. 135 // Bitmap for crashed plugin. Lazily initialized, non-owning pointer.
139 SkBitmap* sad_guest_; 136 SkBitmap* sad_guest_;
140 bool guest_crashed_; 137 bool guest_crashed_;
141 bool resize_pending_; 138 bool resize_pending_;
142 // True if we have ever sent a NavigateGuest message to the embedder. 139 long long parent_frame_;
143 bool navigate_src_sent_;
144 int64 parent_frame_;
145 std::string src_; 140 std::string src_;
146 typedef std::vector<v8::Persistent<v8::Function> > EventListeners; 141 typedef std::vector<v8::Persistent<v8::Function> > EventListeners;
147 typedef std::map<std::string, EventListeners> EventListenerMap; 142 typedef std::map<std::string, EventListeners> EventListenerMap;
148 EventListenerMap event_listener_map_; 143 EventListenerMap event_listener_map_;
149 #if defined(OS_WIN)
150 base::SharedMemory shared_memory_;
151 #endif
152 DISALLOW_COPY_AND_ASSIGN(BrowserPlugin); 144 DISALLOW_COPY_AND_ASSIGN(BrowserPlugin);
153 }; 145 };
154 146
155 } // namespace content 147 } // namespace content
156 148
157 #endif // CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_ 149 #endif // CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | content/renderer/browser_plugin/browser_plugin.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698