[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 0cf09a5edabaed6c8d96821818ae7779e1dc6843
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 23 08:58:52 2010 +0000

    2010-02-23  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Eric Seidel.
    
            Build fix for PluginView
            https://bugs.webkit.org/show_bug.cgi?id=35230
    
            No new tests, build fix only.
    
            * plugins/PluginView.cpp:
            * plugins/PluginView.h:
            * plugins/PluginViewNone.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55128 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 42b1d70..f939328 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-23  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        Build fix for PluginView
+        https://bugs.webkit.org/show_bug.cgi?id=35230
+
+        No new tests, build fix only.
+
+        * plugins/PluginView.cpp:
+        * plugins/PluginView.h:
+        * plugins/PluginViewNone.cpp:
+
 2010-02-23  Kwang Yul Seo  <skyul at company100.net>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index 860b488..c07fbe8 100644
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -1289,6 +1289,7 @@ void PluginView::keepAlive()
     m_lifeSupportTimer.startOneShot(0);
 }
 
+#if ENABLE(NETSCAPE_PLUGIN_API)
 void PluginView::keepAlive(NPP instance)
 {
     PluginView* view = instanceMap().get(instance);
@@ -1297,5 +1298,6 @@ void PluginView::keepAlive(NPP instance)
 
     view->keepAlive();
 }
+#endif
 
 } // namespace WebCore
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h
index 4900101..c5cc012 100644
--- a/WebCore/plugins/PluginView.h
+++ b/WebCore/plugins/PluginView.h
@@ -212,7 +212,9 @@ namespace WebCore {
 
         bool start();
 
+#if ENABLE(NETSCAPE_PLUGIN_API)
         static void keepAlive(NPP);
+#endif
         void keepAlive();
 
     private:
diff --git a/WebCore/plugins/PluginViewNone.cpp b/WebCore/plugins/PluginViewNone.cpp
index 2821afc..f0d8a23 100644
--- a/WebCore/plugins/PluginViewNone.cpp
+++ b/WebCore/plugins/PluginViewNone.cpp
@@ -120,8 +120,10 @@ void PluginView::restart()
 {
 }
 
+#if ENABLE(NETSCAPE_PLUGIN_API)
 void PluginView::keepAlive(NPP)
 {
 }
+#endif
 
 } // namespace WebCore

-- 
WebKit Debian packaging