Changeset 35124 in webkit
- Timestamp:
- Jul 11, 2008 4:28:16 AM (16 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r35123 r35124 1 2008-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 1 10 2008-07-11 Ariya Hidayat <ariya.hidayat@trolltech.com> 2 11 -
trunk/WebCore/plugins/PluginView.h
r33963 r35124 57 57 class MouseEvent; 58 58 class KURL; 59 #if PLATFORM(WIN )59 #if PLATFORM(WIN_OS) 60 60 class PluginMessageThrottlerWin; 61 61 #endif … … 92 92 93 93 class PluginView : public Widget, private PluginStreamClient { 94 #if PLATFORM(WIN)95 friend static LRESULT CALLBACK PluginViewWndProc(HWND, UINT, WPARAM, LPARAM);96 #endif97 98 94 public: 99 95 static PluginView* create(Frame* parentFrame, const IntSize&, Element*, const KURL&, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually); … … 157 153 virtual bool isPluginView() const { return true; } 158 154 159 #if PLATFORM(WIN) 155 #if PLATFORM(WIN_OS) 156 static LRESULT CALLBACK PluginViewWndProc(HWND, UINT, WPARAM, LPARAM); 160 157 LRESULT wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); 161 158 WNDPROC pluginWndProc() const { return m_pluginWndProc; } … … 239 236 #endif 240 237 241 #if PLATFORM(WIN )238 #if PLATFORM(WIN_OS) 242 239 OwnPtr<PluginMessageThrottlerWin> m_messageThrottler; 243 240 WNDPROC m_pluginWndProc; -
trunk/WebCore/plugins/win/PluginViewWin.cpp
r35104 r35124 86 86 static const char* MozillaUserAgent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1) Gecko/20061010 Firefox/2.0"; 87 87 88 static LRESULT CALLBACK PluginViewWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);89 90 88 static bool registerPluginView() 91 89 { … … 117 115 } 118 116 119 static LRESULT CALLBACKPluginViewWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)117 LRESULT CALLBACK PluginView::PluginViewWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) 120 118 { 121 119 PluginView* pluginView = reinterpret_cast<PluginView*>(GetProp(hWnd, kWebPluginViewProperty));
Note: See TracChangeset
for help on using the changeset viewer.