[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[tony at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 6a48289c708bda4a4d8c059d1264a5edbcf5d3a8
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 4 23:24:28 2010 +0000

    2010-11-04  Tony Chang  <tony at chromium.org>
    
            Reviewed by Adam Barth.
    
            make platform/chromium/plugins/multiple-plugins.html pass on all platforms
            https://bugs.webkit.org/show_bug.cgi?id=49026
    
            Move the test from the chromium directory to the top level LayoutTests/plugins directory.
    
            * plugins/multiple-plugins-expected.txt: Renamed from LayoutTests/platform/chromium/plugins/multiple-plugins-expected.txt.
            * plugins/multiple-plugins.html: Renamed from LayoutTests/platform/chromium/plugins/multiple-plugins.html.
    2010-11-04  Tony Chang  <tony at chromium.org>
    
            Reviewed by Adam Barth.
    
            make platform/chromium/plugins/multiple-plugins.html pass on all platforms
            https://bugs.webkit.org/show_bug.cgi?id=49026
    
            Have the testObject.bar property return the string "bar".  This lets
            us run and pass platform/chromium/plugins/multiple-plugins.html on all
            platforms.
    
            * DumpRenderTree/TestNetscapePlugIn/TestObject.cpp:
            (testGetProperty):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71363 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 44a8fc0..126197f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-04  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        make platform/chromium/plugins/multiple-plugins.html pass on all platforms
+        https://bugs.webkit.org/show_bug.cgi?id=49026
+
+        Move the test from the chromium directory to the top level LayoutTests/plugins directory.
+
+        * plugins/multiple-plugins-expected.txt: Renamed from LayoutTests/platform/chromium/plugins/multiple-plugins-expected.txt.
+        * plugins/multiple-plugins.html: Renamed from LayoutTests/platform/chromium/plugins/multiple-plugins.html.
+
 2010-11-04  Dumitru Daniliuc  <dumi at chromium.org>
 
         Unreviewed, updating Chromium expectations.
diff --git a/LayoutTests/platform/chromium/plugins/multiple-plugins-expected.txt b/LayoutTests/plugins/multiple-plugins-expected.txt
similarity index 100%
rename from LayoutTests/platform/chromium/plugins/multiple-plugins-expected.txt
rename to LayoutTests/plugins/multiple-plugins-expected.txt
diff --git a/LayoutTests/platform/chromium/plugins/multiple-plugins.html b/LayoutTests/plugins/multiple-plugins.html
similarity index 100%
rename from LayoutTests/platform/chromium/plugins/multiple-plugins.html
rename to LayoutTests/plugins/multiple-plugins.html
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0da0e6d..8fef675 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-04  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        make platform/chromium/plugins/multiple-plugins.html pass on all platforms
+        https://bugs.webkit.org/show_bug.cgi?id=49026
+
+        Have the testObject.bar property return the string "bar".  This lets
+        us run and pass platform/chromium/plugins/multiple-plugins.html on all
+        platforms.
+
+        * DumpRenderTree/TestNetscapePlugIn/TestObject.cpp:
+        (testGetProperty):
+
 2010-11-04  Mihai Parparita  <mihaip at chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/WebKitTools/DumpRenderTree/TestNetscapePlugIn/TestObject.cpp b/WebKitTools/DumpRenderTree/TestNetscapePlugIn/TestObject.cpp
index 0b32191..ce9f73e 100644
--- a/WebKitTools/DumpRenderTree/TestNetscapePlugIn/TestObject.cpp
+++ b/WebKitTools/DumpRenderTree/TestNetscapePlugIn/TestObject.cpp
@@ -61,10 +61,14 @@ NPClass *getTestClass(void)
 
 static bool identifiersInitialized = false;
 
-#define ID_OBJECT_POINTER 2
-
 #define NUM_ENUMERATABLE_TEST_IDENTIFIERS 2
-#define NUM_TEST_IDENTIFIERS 3
+
+enum {
+    ID_PROPERTY_FOO = 0,
+    ID_PROPERTY_BAR,
+    ID_PROPERTY_OBJECT_POINTER,
+    NUM_TEST_IDENTIFIERS,
+};
 
 static NPIdentifier testIdentifiers[NUM_TEST_IDENTIFIERS];
 static const NPUTF8 *testIdentifierNames[NUM_TEST_IDENTIFIERS] = {
@@ -134,7 +138,13 @@ static bool testHasProperty(NPObject*, NPIdentifier name)
 
 static bool testGetProperty(NPObject* npobj, NPIdentifier name, NPVariant* result)
 {
-    if (name == testIdentifiers[ID_OBJECT_POINTER]) {
+    if (name == testIdentifiers[ID_PROPERTY_FOO]) {
+        char* mem = static_cast<char*>(browser->memalloc(4));
+        strcpy(mem, "foo");
+        STRINGZ_TO_NPVARIANT(mem, *result);
+        return true;
+    }
+    if (name == testIdentifiers[ID_PROPERTY_OBJECT_POINTER]) {
         int32_t objectPointer = static_cast<int32_t>(reinterpret_cast<long long>(npobj));
 
         INT32_TO_NPVARIANT(objectPointer, *result);

-- 
WebKit Debian packaging