Revert "2010-03-25 Laszlo Gombos <laszlo.1.gombos@nokia.com>"

This reverts commit 2a3b308efc33f4829fe9717d93a4b245d3b25f6d.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9013b269ba74982c31f7f3bf2d5cc03616d45b97..a318d517349c1c6c494b169ba0f229858fa5b7f3 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -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.

diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index 4dbc4044f9e737ad5492201f4dfa939fc04eaba2..51a43ac51d9d60be8153e477db91e67a86a8ebcd 100644 (file)
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -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)
 {

diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h
index 51b21272ab0ce94c8eef6be9e71b2ee500428067..21a25f6d2f3c416be360451fca8485fd73d635ed 100644 (file)
--- a/WebCore/plugins/PluginView.h
+++ b/WebCore/plugins/PluginView.h
@@ -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);

diff --git a/WebCore/plugins/PluginViewNone.cpp b/WebCore/plugins/PluginViewNone.cpp
index 06fb938fce25cb9b2b4e133da8a86ce9562a7c85..16383cca757f9d8d2e36e0c3a21150b7f8a6d194 100644 (file)
--- a/WebCore/plugins/PluginViewNone.cpp
+++ b/WebCore/plugins/PluginViewNone.cpp
@@ -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