Revert "2010-03-25 Laszlo Gombos <laszlo.1.gombos@nokia.com>"
authordimich@chromium.org <dimich@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 26 Mar 2010 01:48:26 +0000 (01:48 +0000)
committerdimich@chromium.org <dimich@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 26 Mar 2010 01:48:26 +0000 (01:48 +0000)
This reverts commit 2a3b308efc33f4829fe9717d93a4b245d3b25f6d.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@56587 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/plugins/PluginView.cpp
WebCore/plugins/PluginView.h
WebCore/plugins/PluginViewNone.cpp

index 9013b26..a318d51 100644 (file)
@@ -1,3 +1,17 @@
+2010-03-25  Dmitry Titov  <dimich@chromium.org>
+
+        No review, rolling out r56585.
+        http://trac.webkit.org/changeset/56585
+        https://bugs.webkit.org/show_bug.cgi?id=36621
+
+        Broke Chromium builds on waterfall
+
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::getValue):
+        * plugins/PluginView.h:
+        * plugins/PluginViewNone.cpp:
+        (WebCore::PluginView::setJavaScriptPaused):
+
 2010-03-25  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
 
         Reviewed by Darin Adler.
index 4dbc404..51a43ac 100644 (file)
@@ -1296,6 +1296,7 @@ void PluginView::keepAlive(NPP instance)
 
     view->keepAlive();
 }
+#endif
 
 NPError PluginView::getValueStatic(NPNVariable variable, void* value)
 {
@@ -1320,6 +1321,7 @@ NPError PluginView::getValue(NPNVariable variable, void* value)
         return result;
 
     switch (variable) {
+#if ENABLE(NETSCAPE_PLUGIN_API)
     case NPNVWindowNPObject: {
         if (m_isJavaScriptPaused)
             return NPERR_GENERIC_ERROR;
@@ -1354,6 +1356,7 @@ NPError PluginView::getValue(NPNVariable variable, void* value)
 
         return NPERR_NO_ERROR;
     }
+#endif
 
     case NPNVprivateModeBool: {
         Page* page = m_parentFrame->page();
@@ -1367,7 +1370,6 @@ NPError PluginView::getValue(NPNVariable variable, void* value)
         return NPERR_GENERIC_ERROR;
     }
 }
-#endif
 
 void PluginView::privateBrowsingStateChanged(bool privateBrowsingEnabled)
 {
index 51b2127..21a25f6 100644 (file)
@@ -139,9 +139,8 @@ namespace WebCore {
         static const char* userAgentStatic();
 #endif
         void status(const char* message);
-        
-#if ENABLE(NETSCAPE_PLUGIN_API)
         NPError getValue(NPNVariable variable, void* value);
+#if ENABLE(NETSCAPE_PLUGIN_API)
         static NPError getValueStatic(NPNVariable variable, void* value);
 #endif
         NPError setValue(NPPVariable variable, void* value);
index 06fb938..16383cc 100644 (file)
@@ -67,12 +67,12 @@ NPError PluginView::handlePostReadFile(Vector<char>&, uint32, const char*)
     return 0;
 }
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
 bool PluginView::platformGetValue(NPNVariable, void*, NPError*)
 {
     return false;
 }
 
+#if ENABLE(NETSCAPE_PLUGIN_API)
 bool PluginView::platformGetValueStatic(NPNVariable, void*, NPError*)
 {
     return false;
@@ -126,7 +126,6 @@ void PluginView::keepAlive(NPP)
 }
 #endif
 
-#if PLATFORM(MAC)
 void PluginView::privateBrowsingStateChanged(bool)
 {
 }
@@ -134,6 +133,5 @@ void PluginView::privateBrowsingStateChanged(bool)
 void PluginView::setJavaScriptPaused(bool)
 {
 }
-#endif
 
 } // namespace WebCore