Changeset 84071 in webkit


Ignore:
Timestamp:
Apr 15, 2011 7:06:44 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-04-15 Fridrich Strba <fridrich.strba@bluewin.ch>

Reviewed by Martin Robinson.

Make plugins compile during WebKit GTK Windows build.
Ifdef properly relevant parts so that the PluginViewGtk compiles on Windows.
https://bugs.webkit.org/show_bug.cgi?id=58580

  • plugins/PluginView.cpp: (WebCore::PluginView::stop):
  • plugins/PluginView.h:
  • plugins/gtk/PluginViewGtk.cpp: (WebCore::PluginView::platformGetValue): (WebCore::PluginView::platformStart):
Location:
trunk/Source/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r84066 r84071  
     12011-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
    1162011-04-15  MORITA Hajime  <morrita@google.com>
    217
  • trunk/Source/WebCore/plugins/PluginView.cpp

    r79988 r84071  
    341341
    342342#if ENABLE(NETSCAPE_PLUGIN_API)
    343 #ifdef XP_WIN
     343#if defined(XP_WIN) && !PLATFORM(GTK)
    344344    // Unsubclass the window
    345345    if (m_isWindowed) {
     
    356356#endif
    357357    }
    358 #endif // XP_WIN
     358#endif // !defined(XP_WIN) || PLATFORM(GTK)
    359359#endif // ENABLE(NETSCAPE_PLUGIN_API)
    360360
  • trunk/Source/WebCore/plugins/PluginView.h

    r79526 r84071  
    391391private:
    392392
    393 #if defined(XP_UNIX) || OS(SYMBIAN)
     393#if defined(XP_UNIX) || OS(SYMBIAN) || PLATFORM(GTK)
    394394        void setNPWindowIfNeeded();
    395395#elif defined(XP_MACOSX)
  • trunk/Source/WebCore/plugins/gtk/PluginViewGtk.cpp

    r82962 r84071  
    4848#include "KeyboardEvent.h"
    4949#include "MouseEvent.h"
     50#include "NotImplemented.h"
    5051#include "Page.h"
    5152#include "PlatformContextCairo.h"
     
    663664            *static_cast<Window*>(value) = GDK_WINDOW_XWINDOW(gdk_window_get_toplevel(gdkWindow));
    664665#elif defined(GDK_WINDOWING_WIN32)
    665             *static_cast<HGIOBJ*>(value) = GDK_WINDOW_HWND(gdkWindow);
     666            *static_cast<HGDIOBJ*>(value) = GDK_WINDOW_HWND(gdkWindow);
    666667#endif
    667668            *result = NPERR_NO_ERROR;
     
    709710}
    710711
     712#ifndef GDK_WINDOWING_WIN32
    711713static Display* getPluginDisplay()
    712714{
     
    722724#endif
    723725}
     726#endif
    724727
    725728#if defined(XP_UNIX)
     
    786789    ASSERT(m_status == PluginStatusLoadedSuccessfully);
    787790
     791#if defined(XP_UNIX)
    788792    if (m_plugin->pluginFuncs()->getvalue) {
    789793        PluginView::setCurrentPluginView(this);
     
    794798        PluginView::setCurrentPluginView(0);
    795799    }
     800#endif
    796801
    797802    if (m_isWindowed) {
    798 #if defined(XP_UNIX)
    799803        GtkWidget* pageClient = m_parentFrame->view()->hostWindow()->platformPageClient();
    800 
     804#if defined(XP_UNIX)
    801805        if (m_needsXEmbed) {
    802806            // If our parent is not anchored the startup process will
     
    820824    } else {
    821825        setPlatformWidget(0);
     826#if defined(XP_UNIX)
    822827        m_pluginDisplay = getPluginDisplay();
     828#endif
    823829    }
    824830
Note: See TracChangeset for help on using the changeset viewer.