[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit e5c9af2b11b8d90e0cc497aec12f162a8567f83c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 17 10:04:58 2010 +0000

    2010-02-17  Steve Block  <steveblock at google.com>
    
            Reviewed by Ariya Hidayat.
    
            Include WebCore's npruntime.h for Android in V8 bindings
            https://bugs.webkit.org/show_bug.cgi?id=35002
    
            Currently, the V8 bindings include bindings/npruntime.h, which is a
            Chromium-specific file outside of the WebKit tree.
    
            No new tests, build fix only.
    
            * bindings/v8/NPV8Object.cpp:
            * bindings/v8/NPV8Object.h:
            * bindings/v8/V8NPObject.h:
            * bindings/v8/V8NPUtils.h:
            * bindings/v8/npruntime_impl.h:
            * bindings/v8/npruntime_priv.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54880 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index db89770..788bf46 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-02-17  Steve Block  <steveblock at google.com>
+
+        Reviewed by Ariya Hidayat.
+
+        Include WebCore's npruntime.h for Android in V8 bindings
+        https://bugs.webkit.org/show_bug.cgi?id=35002
+
+        Currently, the V8 bindings include bindings/npruntime.h, which is a
+        Chromium-specific file outside of the WebKit tree.
+
+        No new tests, build fix only.
+
+        * bindings/v8/NPV8Object.cpp:
+        * bindings/v8/NPV8Object.h:
+        * bindings/v8/V8NPObject.h:
+        * bindings/v8/V8NPUtils.h:
+        * bindings/v8/npruntime_impl.h:
+        * bindings/v8/npruntime_priv.h:
+
 2010-01-07  Philippe Normand  <pnormand at igalia.com>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/WebCore/bindings/v8/NPV8Object.cpp b/WebCore/bindings/v8/NPV8Object.cpp
index d43da17..53ceea1 100644
--- a/WebCore/bindings/v8/NPV8Object.cpp
+++ b/WebCore/bindings/v8/NPV8Object.cpp
@@ -39,10 +39,15 @@
 #include "V8Index.h"
 #include "V8NPUtils.h"
 #include "V8Proxy.h"
-#include "bindings/npruntime.h"
 #include "npruntime_impl.h"
 #include "npruntime_priv.h"
 
+#if PLATFORM(CHROMIUM)
+#include <bindings/npruntime.h>
+#else
+#include "npruntime.h"
+#endif
+
 #include <stdio.h>
 #include <v8.h>
 #include <wtf/StringExtras.h>
diff --git a/WebCore/bindings/v8/NPV8Object.h b/WebCore/bindings/v8/NPV8Object.h
index b9b376e..e5550ee 100644
--- a/WebCore/bindings/v8/NPV8Object.h
+++ b/WebCore/bindings/v8/NPV8Object.h
@@ -31,15 +31,17 @@
 #define NPV8Object_h
 
 #include "V8Index.h"
+
 #if PLATFORM(CHROMIUM)
 // FIXME: Chromium uses a different npruntime.h, which is in
 // the Chromium source repository under third_party/npapi/bindings.
 // The Google-specific changes in that file should probably be
 // moved into bridge/npruntime.h, guarded by an #if PlATFORM(CHROMIUM).
-#include "bindings/npruntime.h"
+#include <bindings/npruntime.h>
 #else
-#include "bridge/npruntime.h"  // Use WebCore version for Android and other ports.
+#include "npruntime.h" // Use WebCore version for Android and other ports.
 #endif
+
 #include <v8.h>
 
 namespace WebCore {
diff --git a/WebCore/bindings/v8/V8NPObject.h b/WebCore/bindings/v8/V8NPObject.h
index 0a759b5..5924b3c 100644
--- a/WebCore/bindings/v8/V8NPObject.h
+++ b/WebCore/bindings/v8/V8NPObject.h
@@ -31,8 +31,13 @@
 #ifndef V8NPObject_h
 #define V8NPObject_h
 
+#if PLATFORM(CHROMIUM)
+#include <bindings/npruntime.h>
+#else
+#include "npruntime.h"
+#endif
+
 #include <v8.h>
-#include "third_party/npapi/bindings/npruntime.h"
 
 // These functions can be replaced by normal JS operation.
 // Getters
diff --git a/WebCore/bindings/v8/V8NPUtils.h b/WebCore/bindings/v8/V8NPUtils.h
index 82a74b3..c978d2b 100644
--- a/WebCore/bindings/v8/V8NPUtils.h
+++ b/WebCore/bindings/v8/V8NPUtils.h
@@ -30,8 +30,13 @@
 #ifndef V8NPUtils_h
 #define V8NPUtils_h
 
+#if PLATFORM(CHROMIUM)
+#include <bindings/npruntime.h>
+#else
+#include "npruntime.h"
+#endif
+
 #include <v8.h>
-#include "third_party/npapi/bindings/npruntime.h"
 
 // Convert a V8 Value of any type (string, bool, object, etc) to a NPVariant.
 void convertV8ObjectToNPVariant(v8::Local<v8::Value>, NPObject*, NPVariant*);
diff --git a/WebCore/bindings/v8/npruntime_impl.h b/WebCore/bindings/v8/npruntime_impl.h
index 31c0f42..d2377eb 100644
--- a/WebCore/bindings/v8/npruntime_impl.h
+++ b/WebCore/bindings/v8/npruntime_impl.h
@@ -31,7 +31,11 @@
 #ifndef npruntime_impl_h
 #define npruntime_impl_h
 
-#include "bindings/npruntime.h"
+#if PLATFORM(CHROMIUM)
+#include <bindings/npruntime.h>
+#else
+#include "npruntime.h"
+#endif
 
 // This file exists to support WebCore, which expects to be able to call upon
 // portions of the NPRuntime implementation.
diff --git a/WebCore/bindings/v8/npruntime_priv.h b/WebCore/bindings/v8/npruntime_priv.h
index 3887758..e5ac0e0 100644
--- a/WebCore/bindings/v8/npruntime_priv.h
+++ b/WebCore/bindings/v8/npruntime_priv.h
@@ -26,7 +26,11 @@
 #ifndef npruntime_priv_h
 #define npruntime_priv_h
 
-#include "third_party/npapi/bindings/npruntime.h"
+#if PLATFORM(CHROMIUM)
+#include <bindings/npruntime.h>
+#else
+#include "npruntime.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {

-- 
WebKit Debian packaging