diff options
Diffstat (limited to 'WebCore/plugins/PluginView.h')
-rw-r--r-- | WebCore/plugins/PluginView.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h index 0849c59..f4474cc 100644 --- a/WebCore/plugins/PluginView.h +++ b/WebCore/plugins/PluginView.h @@ -70,8 +70,11 @@ namespace JSC { } } #endif +<<<<<<< HEAD class NPObject; +======= +>>>>>>> webkit.org at r60074 namespace WebCore { class Element; @@ -434,6 +437,8 @@ private: bool m_isHalted; bool m_hasBeenHalted; + bool m_haveCalledSetWindow; + static PluginView* s_currentPluginView; }; |