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

[zecke at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 840436fd6f12fa2c3b323615f2747f1e90f9c5f1
Author: zecke at webkit.org <zecke at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 2 09:59:28 2010 +0000

    [Gtk] Support private browsing mode in plugins.
    
    https://bugs.webkit.org/show_bug.cgi?id=35500
    
    Integrate the PluginViewQt.cpp changes from
    r55358 into Gtk+ and unskip the test.
    
    * plugins/gtk/PluginViewGtk.cpp:
    (WebCore::PluginView::getValue):
    * platform/gtk/Skipped:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55405 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 387eb0b..8327b6b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-28  Holger Hans Peter Freyther  <zecke at selfish.org>
+
+        Reviewed by Gustavo Noronha.
+
+        [Gtk] Support private browsing mode in plugins.
+        https://bugs.webkit.org/show_bug.cgi?id=35500
+
+        Unskip test after taking code from PluginViewQt.cpp
+
+        * platform/gtk/Skipped:
+
 2010-02-27  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 1ff7c71..266efdb 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -3590,8 +3590,6 @@ plugins/private-browsing-mode.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=30561
 plugins/private-browsing-mode.html
-# https://bugs.webkit.org/show_bug.cgi?id=33180
-plugins/private-browsing-mode-2.html
 
 #   Tests generating new results
 plugins/embed-attributes-style.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3103053..5b02bf2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-28  Holger Hans Peter Freyther  <zecke at selfish.org>
+
+        Reviewed by Gustavo Noronha.
+
+        [Gtk] Support private browsing mode in plugins.
+        https://bugs.webkit.org/show_bug.cgi?id=35500
+
+        Integrate the PluginViewQt.cpp changes from r55358 into Gtk+.
+
+        * plugins/gtk/PluginViewGtk.cpp:
+        (WebCore::PluginView::getValue):
+
 2010-03-02  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by NOBODY (Build fix).
diff --git a/WebCore/plugins/gtk/PluginViewGtk.cpp b/WebCore/plugins/gtk/PluginViewGtk.cpp
index 8f60a26..d8cbffe 100644
--- a/WebCore/plugins/gtk/PluginViewGtk.cpp
+++ b/WebCore/plugins/gtk/PluginViewGtk.cpp
@@ -700,6 +700,14 @@ NPError PluginView::getValue(NPNVariable variable, void* value)
             return NPERR_NO_ERROR;
         }
 
+        case NPNVprivateModeBool: {
+            Page* page = m_parentFrame->page();
+            if (!page)
+                return NPERR_GENERIC_ERROR;
+            *((NPBool*)value) = !page->settings() || page->settings()->privateBrowsingEnabled();
+            return NPERR_NO_ERROR;
+        }
+
         default:
             return getValueStatic(variable, value);
     }

-- 
WebKit Debian packaging