Changeset 84071 in webkit
- Timestamp:
- Apr 15, 2011 7:06:44 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r84066 r84071 1 2011-04-15 Fridrich Strba <fridrich.strba@bluewin.ch> 2 3 Reviewed by Martin Robinson. 4 5 Make plugins compile during WebKit GTK Windows build. 6 Ifdef properly relevant parts so that the PluginViewGtk compiles on Windows. 7 https://bugs.webkit.org/show_bug.cgi?id=58580 8 9 * plugins/PluginView.cpp: 10 (WebCore::PluginView::stop): 11 * plugins/PluginView.h: 12 * plugins/gtk/PluginViewGtk.cpp: 13 (WebCore::PluginView::platformGetValue): 14 (WebCore::PluginView::platformStart): 15 1 16 2011-04-15 MORITA Hajime <morrita@google.com> 2 17 -
trunk/Source/WebCore/plugins/PluginView.cpp
r79988 r84071 341 341 342 342 #if ENABLE(NETSCAPE_PLUGIN_API) 343 #if def XP_WIN343 #if defined(XP_WIN) && !PLATFORM(GTK) 344 344 // Unsubclass the window 345 345 if (m_isWindowed) { … … 356 356 #endif 357 357 } 358 #endif // XP_WIN358 #endif // !defined(XP_WIN) || PLATFORM(GTK) 359 359 #endif // ENABLE(NETSCAPE_PLUGIN_API) 360 360 -
trunk/Source/WebCore/plugins/PluginView.h
r79526 r84071 391 391 private: 392 392 393 #if defined(XP_UNIX) || OS(SYMBIAN) 393 #if defined(XP_UNIX) || OS(SYMBIAN) || PLATFORM(GTK) 394 394 void setNPWindowIfNeeded(); 395 395 #elif defined(XP_MACOSX) -
trunk/Source/WebCore/plugins/gtk/PluginViewGtk.cpp
r82962 r84071 48 48 #include "KeyboardEvent.h" 49 49 #include "MouseEvent.h" 50 #include "NotImplemented.h" 50 51 #include "Page.h" 51 52 #include "PlatformContextCairo.h" … … 663 664 *static_cast<Window*>(value) = GDK_WINDOW_XWINDOW(gdk_window_get_toplevel(gdkWindow)); 664 665 #elif defined(GDK_WINDOWING_WIN32) 665 *static_cast<HG IOBJ*>(value) = GDK_WINDOW_HWND(gdkWindow);666 *static_cast<HGDIOBJ*>(value) = GDK_WINDOW_HWND(gdkWindow); 666 667 #endif 667 668 *result = NPERR_NO_ERROR; … … 709 710 } 710 711 712 #ifndef GDK_WINDOWING_WIN32 711 713 static Display* getPluginDisplay() 712 714 { … … 722 724 #endif 723 725 } 726 #endif 724 727 725 728 #if defined(XP_UNIX) … … 786 789 ASSERT(m_status == PluginStatusLoadedSuccessfully); 787 790 791 #if defined(XP_UNIX) 788 792 if (m_plugin->pluginFuncs()->getvalue) { 789 793 PluginView::setCurrentPluginView(this); … … 794 798 PluginView::setCurrentPluginView(0); 795 799 } 800 #endif 796 801 797 802 if (m_isWindowed) { 798 #if defined(XP_UNIX)799 803 GtkWidget* pageClient = m_parentFrame->view()->hostWindow()->platformPageClient(); 800 804 #if defined(XP_UNIX) 801 805 if (m_needsXEmbed) { 802 806 // If our parent is not anchored the startup process will … … 820 824 } else { 821 825 setPlatformWidget(0); 826 #if defined(XP_UNIX) 822 827 m_pluginDisplay = getPluginDisplay(); 828 #endif 823 829 } 824 830
Note: See TracChangeset
for help on using the changeset viewer.