Changeset 35124 in webkit


Ignore:
Timestamp:
Jul 11, 2008 4:28:16 AM (16 years ago)
Author:
Simon Hausmann
Message:

2008-07-11 Ariya Hidayat <ariya.hidayat@trolltech.com>

Reviewed by Adam Roben.

Fix compile with MinGW since it does not like friend static function.

  • plugins/PluginView.h:
  • plugins/win/PluginViewWin.cpp:
Location:
trunk/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r35123 r35124  
     12008-07-11  Ariya Hidayat  <ariya.hidayat@trolltech.com>
     2
     3        Reviewed by Adam Roben.
     4
     5        Fix compile with MinGW since it does not like friend static function.
     6
     7        * plugins/PluginView.h:
     8        * plugins/win/PluginViewWin.cpp:
     9
    1102008-07-11  Ariya Hidayat  <ariya.hidayat@trolltech.com>
    211
  • trunk/WebCore/plugins/PluginView.h

    r33963 r35124  
    5757    class MouseEvent;
    5858    class KURL;
    59 #if PLATFORM(WIN)
     59#if PLATFORM(WIN_OS)
    6060    class PluginMessageThrottlerWin;
    6161#endif
     
    9292
    9393    class PluginView : public Widget, private PluginStreamClient {
    94 #if PLATFORM(WIN)
    95     friend static LRESULT CALLBACK PluginViewWndProc(HWND, UINT, WPARAM, LPARAM);
    96 #endif
    97 
    9894    public:
    9995        static PluginView* create(Frame* parentFrame, const IntSize&, Element*, const KURL&, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually);
     
    157153        virtual bool isPluginView() const { return true; }
    158154
    159 #if PLATFORM(WIN)
     155#if PLATFORM(WIN_OS)
     156        static LRESULT CALLBACK PluginViewWndProc(HWND, UINT, WPARAM, LPARAM);
    160157        LRESULT wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
    161158        WNDPROC pluginWndProc() const { return m_pluginWndProc; }
     
    239236#endif
    240237
    241 #if PLATFORM(WIN)
     238#if PLATFORM(WIN_OS)
    242239        OwnPtr<PluginMessageThrottlerWin> m_messageThrottler;
    243240        WNDPROC m_pluginWndProc;
  • trunk/WebCore/plugins/win/PluginViewWin.cpp

    r35104 r35124  
    8686static const char* MozillaUserAgent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1) Gecko/20061010 Firefox/2.0";
    8787
    88 static LRESULT CALLBACK PluginViewWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
    89 
    9088static bool registerPluginView()
    9189{
     
    117115}
    118116
    119 static LRESULT CALLBACK PluginViewWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
     117LRESULT CALLBACK PluginView::PluginViewWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
    120118{
    121119    PluginView* pluginView = reinterpret_cast<PluginView*>(GetProp(hWnd, kWebPluginViewProperty));
Note: See TracChangeset for help on using the changeset viewer.