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

Side by Side Diff: content/renderer/pepper/pepper_webplugin_impl.h

Issue 1141793002: Reland: Fix WebViewPlugin::scheduleAnimation crash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 // 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_PEPPER_PEPPER_WEBPLUGIN_IMPL_H_ 5 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_WEBPLUGIN_IMPL_H_
6 #define CONTENT_RENDERER_PEPPER_PEPPER_WEBPLUGIN_IMPL_H_ 6 #define CONTENT_RENDERER_PEPPER_PEPPER_WEBPLUGIN_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 private: 94 private:
95 friend class base::DeleteHelper<PepperWebPluginImpl>; 95 friend class base::DeleteHelper<PepperWebPluginImpl>;
96 96
97 virtual ~PepperWebPluginImpl(); 97 virtual ~PepperWebPluginImpl();
98 struct InitData; 98 struct InitData;
99 99
100 scoped_ptr<InitData> init_data_; // Cleared upon successful initialization. 100 scoped_ptr<InitData> init_data_; // Cleared upon successful initialization.
101 // True if the instance represents the entire document in a frame instead of 101 // True if the instance represents the entire document in a frame instead of
102 // being an embedded resource. 102 // being an embedded resource.
103 bool full_frame_; 103 bool full_frame_;
104 scoped_ptr<PluginInstanceThrottlerImpl> throttler_;
105 scoped_refptr<PepperPluginInstanceImpl> instance_; 104 scoped_refptr<PepperPluginInstanceImpl> instance_;
106 gfx::Rect plugin_rect_; 105 gfx::Rect plugin_rect_;
107 PP_Var instance_object_; 106 PP_Var instance_object_;
107 scoped_ptr<PluginInstanceThrottlerImpl> throttler_;
tommycli 2015/05/13 22:07:02 I think this isn't quite necessary. This throttle
trchen 2015/05/13 22:17:04 Yep. Actually all changes in PepperWebPluginImpl a
108 blink::WebPluginContainer* container_; 108 blink::WebPluginContainer* container_;
109 109
110 DISALLOW_COPY_AND_ASSIGN(PepperWebPluginImpl); 110 DISALLOW_COPY_AND_ASSIGN(PepperWebPluginImpl);
111 }; 111 };
112 112
113 } // namespace content 113 } // namespace content
114 114
115 #endif // CONTENT_RENDERER_PEPPER_PEPPER_WEBPLUGIN_IMPL_H_ 115 #endif // CONTENT_RENDERER_PEPPER_PEPPER_WEBPLUGIN_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_plugin_instance_impl.cc ('k') | content/renderer/pepper/pepper_webplugin_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698