Changeset 56585 in webkit
- Timestamp:
- Mar 25, 2010 6:04:04 PM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r56580 r56585 1 2010-03-25 Laszlo Gombos <laszlo.1.gombos@nokia.com> 2 3 Reviewed by Darin Adler. 4 5 Fix build if NPAPI support is disabled 6 https://bugs.webkit.org/show_bug.cgi?id=36621 7 8 No new tests, this is a build fix. 9 10 * plugins/PluginView.cpp: Guard getValueStatic() with 11 NETSCAPE_PLUGIN_API 12 (WebCore::PluginView::getValue): 13 * plugins/PluginView.h: Guard getValue() with NETSCAPE_PLUGIN_API 14 * plugins/PluginViewNone.cpp: Guard platformGetValue() and 15 platformGetValueStatic with NETSCAPE_PLUGIN_API; 16 Guard privateBrowsingStateChanged() and setJavaScriptPaused() with 17 PLATFORM(MAC) 18 1 19 2010-03-25 Drew Wilson <atwilson@chromium.org> 2 20 -
trunk/WebCore/plugins/PluginView.cpp
r56064 r56585 1297 1297 view->keepAlive(); 1298 1298 } 1299 #endif1300 1299 1301 1300 NPError PluginView::getValueStatic(NPNVariable variable, void* value) … … 1322 1321 1323 1322 switch (variable) { 1324 #if ENABLE(NETSCAPE_PLUGIN_API)1325 1323 case NPNVWindowNPObject: { 1326 1324 if (m_isJavaScriptPaused) … … 1357 1355 return NPERR_NO_ERROR; 1358 1356 } 1359 #endif1360 1357 1361 1358 case NPNVprivateModeBool: { … … 1371 1368 } 1372 1369 } 1370 #endif 1373 1371 1374 1372 void PluginView::privateBrowsingStateChanged(bool privateBrowsingEnabled) -
trunk/WebCore/plugins/PluginView.h
r55433 r56585 140 140 #endif 141 141 void status(const char* message); 142 143 #if ENABLE(NETSCAPE_PLUGIN_API) 142 144 NPError getValue(NPNVariable variable, void* value); 143 #if ENABLE(NETSCAPE_PLUGIN_API)144 145 static NPError getValueStatic(NPNVariable variable, void* value); 145 146 #endif -
trunk/WebCore/plugins/PluginViewNone.cpp
r55441 r56585 68 68 } 69 69 70 #if ENABLE(NETSCAPE_PLUGIN_API) 70 71 bool PluginView::platformGetValue(NPNVariable, void*, NPError*) 71 72 { … … 73 74 } 74 75 75 #if ENABLE(NETSCAPE_PLUGIN_API)76 76 bool PluginView::platformGetValueStatic(NPNVariable, void*, NPError*) 77 77 { … … 127 127 #endif 128 128 129 #if PLATFORM(MAC) 129 130 void PluginView::privateBrowsingStateChanged(bool) 130 131 { … … 134 135 { 135 136 } 137 #endif 136 138 137 139 } // namespace WebCore
Note: See TracChangeset
for help on using the changeset viewer.