diff options
| author | Steve Block <steveblock@google.com> | 2009-11-05 18:34:51 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-11-10 22:41:13 +0000 |
| commit | 3f60c26c3fa9dc89d57ef4db083a4f13ef86c103 (patch) | |
| tree | 81c16accd4c9b2b2e4e29ec18b9e5fa7eb37ed93 /WebCore/plugins/PluginView.h | |
| parent | cac0f67c402d107cdb10971b95719e2ff9c7c76b (diff) | |
| download | external_webkit-3f60c26c3fa9dc89d57ef4db083a4f13ef86c103.zip external_webkit-3f60c26c3fa9dc89d57ef4db083a4f13ef86c103.tar.gz external_webkit-3f60c26c3fa9dc89d57ef4db083a4f13ef86c103.tar.bz2 | |
Merge webkit.org at r50258 : Fix conflicts.
Note that FrameLoader::gotoAnchor has been moved to FramveView::gotoAnchor.
See http://trac.webkit.org/changeset/49608
Change-Id: Ic2a87bb0c0f91d371508578ddccf200967524a77
Diffstat (limited to 'WebCore/plugins/PluginView.h')
| -rw-r--r-- | WebCore/plugins/PluginView.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h index c805352..8a5706f 100644 --- a/WebCore/plugins/PluginView.h +++ b/WebCore/plugins/PluginView.h @@ -292,27 +292,22 @@ namespace WebCore { void handleFocusOutEvent(); #endif -<<<<<<< HEAD:WebCore/plugins/PluginView.h +#if PLATFORM(WIN_OS) + void paintIntoTransformedContext(HDC); + PassRefPtr<Image> snapshot(); +#endif + #ifdef ANDROID_PLUGINS void handleFocusEvent(bool hasFocus); void handleTouchEvent(TouchEvent*); // called at the end of the base constructor void platformInit(); -======= -#if PLATFORM(WIN_OS) - void paintIntoTransformedContext(HDC); - PassRefPtr<Image> snapshot(); ->>>>>>> webkit.org at r50258.:WebCore/plugins/PluginView.h #endif -<<<<<<< HEAD:WebCore/plugins/PluginView.h #ifdef PLUGIN_PLATFORM_SETVALUE // called if the default setValue does not recognize the variable NPError platformSetValue(NPPVariable variable, void* value); #endif -======= - ->>>>>>> webkit.org at r50258.:WebCore/plugins/PluginView.h int m_mode; int m_paramCount; char** m_paramNames; |