[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[mitz at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit c8191160da627c546d42e192598e1ca5f79af2ba
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 12 04:17:43 2009 +0000

    WebKit/mac: <rdar://problem/7294267> REGRESSION (r48492): Gmail voice and video chat
    doesn't work
    https://bugs.webkit.org/show_bug.cgi?id=30295
    
    Reviewed by Darin Adler.
    
    Test: plugins/setProperty.html
    
    * Plugins/Hosted/ProxyInstance.mm:
    (WebKit::ProxyInstance::setFieldValue): Fixed a typo. The function
    should return early if m_instanceProxy is null.
    
    LayoutTests: Test for <rdar://problem/7294267> REGRESSION (r48492): Gmail voice and
    video chat doesn't work
    https://bugs.webkit.org/show_bug.cgi?id=30295
    
    Reviewed by Darin Adler.
    
    * plugins/setProperty-expected.txt: Added.
    * plugins/setProperty.html: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49433 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 97bce03..9d019c4 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-11  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Darin Adler.
+
+        Test for <rdar://problem/7294267> REGRESSION (r48492): Gmail voice and
+        video chat doesn’t work
+        https://bugs.webkit.org/show_bug.cgi?id=30295
+
+        * plugins/setProperty-expected.txt: Added.
+        * plugins/setProperty.html: Added.
+
 2009-10-10  Cameron McCormack  <cam at mcc.id.au>
 
         Reviewed by Sam Weinig.
diff --git a/LayoutTests/plugins/setProperty-expected.txt b/LayoutTests/plugins/setProperty-expected.txt
new file mode 100644
index 0000000..c3e14c9
--- /dev/null
+++ b/LayoutTests/plugins/setProperty-expected.txt
@@ -0,0 +1,4 @@
+
+Test for https://bugs.webkit.org/show_bug.cgi?id=30295 REGRESSION (r48492): Gmail voice and video chat doesn't work.
+
+PASS: Successfully set a plug-in's property
diff --git a/LayoutTests/plugins/setProperty.html b/LayoutTests/plugins/setProperty.html
new file mode 100644
index 0000000..ff993d3
--- /dev/null
+++ b/LayoutTests/plugins/setProperty.html
@@ -0,0 +1,15 @@
+<embed name="plg" type="application/x-webkit-test-netscape" width=100 height=100></embed>
+<p>Test for <i><a href="https://bugs.webkit.org/show_bug.cgi?id=30295">https://bugs.webkit.org/show_bug.cgi?id=30295</a>
+REGRESSION (r48492): Gmail voice and video chat doesn't work</i>.</p>
+<p id="result">FAIL: Text did not run</p>
+<script>
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText();
+
+    plg.eventLoggingEnabled = true;
+    document.getElementById("result").innerText = plg.eventLoggingEnabled
+        ? "PASS: Successfully set a plug-in's property"
+        : "FAIL: Failed to set a plug-in's property";
+
+    plg.eventLoggingEnabled = false;
+</script>
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 9b4bbec..6a25ed5 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,17 @@
+2009-10-11  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/7294267> REGRESSION (r48492): Gmail voice and video chat
+        doesn’t work
+        https://bugs.webkit.org/show_bug.cgi?id=30295
+
+        Test: plugins/setProperty.html
+
+        * Plugins/Hosted/ProxyInstance.mm:
+        (WebKit::ProxyInstance::setFieldValue): Fixed a typo. The function
+        should return early if m_instanceProxy is null.
+
 2009-10-09  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/mac/Plugins/Hosted/ProxyInstance.mm b/WebKit/mac/Plugins/Hosted/ProxyInstance.mm
index 0b3a32f..6be3953 100644
--- a/WebKit/mac/Plugins/Hosted/ProxyInstance.mm
+++ b/WebKit/mac/Plugins/Hosted/ProxyInstance.mm
@@ -370,7 +370,7 @@ JSC::JSValue ProxyInstance::fieldValue(ExecState* exec, const Field* field) cons
     
 void ProxyInstance::setFieldValue(ExecState* exec, const Field* field, JSValue value) const
 {
-    if (m_instanceProxy)
+    if (!m_instanceProxy)
         return;
     
     uint64_t serverIdentifier = static_cast<const ProxyField*>(field)->serverIdentifier();

-- 
WebKit Debian packaging