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

[abecsi at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 4003e50502071aea5834283fc8336d86ed2b7a88
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 7 11:47:55 2010 +0000

    2010-08-07  Balazs Kelemen  <kb at inf.u-szeged.hu>
    
            Reviewed by Eric Seidel.
    
            NPAPI headers should be included through npruntime_internal.h
    
            https://bugs.webkit.org/show_bug.cgi?id=43620
    
            * DerivedSources.pro:
            * WebProcess/Plugins/NPJSObject.h:
            * WebProcess/Plugins/NPRuntimeUtilities.h:
            * WebProcess/Plugins/Netscape/NetscapePluginStream.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64905 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index f7ad461..5c21fb4 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Eric Seidel.
 
+        NPAPI headers should be included through npruntime_internal.h
+
+        https://bugs.webkit.org/show_bug.cgi?id=43620
+
+        * DerivedSources.pro:
+        * WebProcess/Plugins/NPJSObject.h:
+        * WebProcess/Plugins/NPRuntimeUtilities.h:
+        * WebProcess/Plugins/Netscape/NetscapePluginStream.h:
+
+2010-08-07  Balazs Kelemen  <kb at inf.u-szeged.hu>
+
+        Reviewed by Eric Seidel.
+
         [Qt] Build WebKit2 into a static lib
 
         https://bugs.webkit.org/show_bug.cgi?id=43621
diff --git a/WebKit2/DerivedSources.pro b/WebKit2/DerivedSources.pro
index 80fb0a7..9bf2b68 100644
--- a/WebKit2/DerivedSources.pro
+++ b/WebKit2/DerivedSources.pro
@@ -8,8 +8,7 @@ WEBCORE_HEADERS_FOR_WEBKIT2 += \
     bindings/js/GCController.h \
     bindings/js/JSPluginElementFunctions.h \
     bridge/IdentifierRep.h \
-    bridge/npapi.h \
-    bridge/npruntime.h \
+    bridge/npruntime_internal.h \
     config.h \
     css/CSSComputedStyleDeclaration.h \
     dom/Event.h \
diff --git a/WebKit2/WebProcess/Plugins/NPJSObject.h b/WebKit2/WebProcess/Plugins/NPJSObject.h
index 08ac9d4..6737bd4 100644
--- a/WebKit2/WebProcess/Plugins/NPJSObject.h
+++ b/WebKit2/WebProcess/Plugins/NPJSObject.h
@@ -27,7 +27,7 @@
 #define NPJSObject_h
 
 #include <JavaScriptCore/Protect.h>
-#include <WebCore/npruntime.h>
+#include <WebCore/npruntime_internal.h>
 #include <wtf/Noncopyable.h>
 
 namespace JSC {
diff --git a/WebKit2/WebProcess/Plugins/NPRuntimeUtilities.h b/WebKit2/WebProcess/Plugins/NPRuntimeUtilities.h
index b2930b3..393cb38 100644
--- a/WebKit2/WebProcess/Plugins/NPRuntimeUtilities.h
+++ b/WebKit2/WebProcess/Plugins/NPRuntimeUtilities.h
@@ -26,7 +26,7 @@
 #ifndef NPRuntimeUtilities_h
 #define NPRuntimeUtilities_h
 
-#include <WebCore/npruntime.h>
+#include <WebCore/npruntime_internal.h>
 
 struct NPClass;
 struct NPObject;
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h b/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h
index 983324e..ca85ff8 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h
@@ -28,7 +28,7 @@
 
 #include "RunLoop.h"
 #include <WebCore/FileSystem.h>
-#include <WebCore/npapi.h>
+#include <WebCore/npruntime_internal.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>

-- 
WebKit Debian packaging