[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
aroben at apple.com
aroben at apple.com
Wed Dec 22 15:16:33 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e8f6f5f295cec1ed12d7dceab8135739592e3329
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 29 17:45:44 2010 +0000
Move NPRuntime-related files into WebProcess/Plugins/Netscape
Fixes <http://webkit.org/b/48645>.
Reviewed by Anders Carlsson.
* WebKit2.pro:
* WebKit2.xcodeproj/project.pbxproj:
* win/WebKit2.vcproj:
Updated the files' paths.
* WebProcess/Plugins/Netscape/JSNPMethod.cpp: Renamed from WebKit2/WebProcess/Plugins/JSNPMethod.cpp.
* WebProcess/Plugins/Netscape/JSNPMethod.h: Renamed from WebKit2/WebProcess/Plugins/JSNPMethod.h.
* WebProcess/Plugins/Netscape/JSNPObject.cpp: Renamed from WebKit2/WebProcess/Plugins/JSNPObject.cpp.
* WebProcess/Plugins/Netscape/JSNPObject.h: Renamed from WebKit2/WebProcess/Plugins/JSNPObject.h.
* WebProcess/Plugins/Netscape/NPJSObject.cpp: Renamed from WebKit2/WebProcess/Plugins/NPJSObject.cpp.
* WebProcess/Plugins/Netscape/NPJSObject.h: Renamed from WebKit2/WebProcess/Plugins/NPJSObject.h.
* WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp: Renamed from WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.cpp.
* WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h: Renamed from WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.h.
* WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp: Renamed from WebKit2/WebProcess/Plugins/NPRuntimeUtilities.cpp.
* WebProcess/Plugins/Netscape/NPRuntimeUtilities.h: Renamed from WebKit2/WebProcess/Plugins/NPRuntimeUtilities.h.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70898 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 92dc0b0..3a80d57 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,27 @@
+2010-10-29 Adam Roben <aroben at apple.com>
+
+ Move NPRuntime-related files into WebProcess/Plugins/Netscape
+
+ Fixes <http://webkit.org/b/48645>.
+
+ Reviewed by Anders Carlsson.
+
+ * WebKit2.pro:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * win/WebKit2.vcproj:
+ Updated the files' paths.
+
+ * WebProcess/Plugins/Netscape/JSNPMethod.cpp: Renamed from WebKit2/WebProcess/Plugins/JSNPMethod.cpp.
+ * WebProcess/Plugins/Netscape/JSNPMethod.h: Renamed from WebKit2/WebProcess/Plugins/JSNPMethod.h.
+ * WebProcess/Plugins/Netscape/JSNPObject.cpp: Renamed from WebKit2/WebProcess/Plugins/JSNPObject.cpp.
+ * WebProcess/Plugins/Netscape/JSNPObject.h: Renamed from WebKit2/WebProcess/Plugins/JSNPObject.h.
+ * WebProcess/Plugins/Netscape/NPJSObject.cpp: Renamed from WebKit2/WebProcess/Plugins/NPJSObject.cpp.
+ * WebProcess/Plugins/Netscape/NPJSObject.h: Renamed from WebKit2/WebProcess/Plugins/NPJSObject.h.
+ * WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp: Renamed from WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.cpp.
+ * WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h: Renamed from WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.h.
+ * WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp: Renamed from WebKit2/WebProcess/Plugins/NPRuntimeUtilities.cpp.
+ * WebProcess/Plugins/Netscape/NPRuntimeUtilities.h: Renamed from WebKit2/WebProcess/Plugins/NPRuntimeUtilities.h.
+
2010-10-29 Alexey Proskuryakov <ap at apple.com>
Reviewed by Darin Adler.
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index c6fe52f..77f95a7 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -299,14 +299,14 @@ HEADERS += \
WebProcess/InjectedBundle/InjectedBundlePageUIClient.h \
WebProcess/InjectedBundle/InjectedBundleScriptWorld.h \
WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h \
- WebProcess/Plugins/JSNPObject.h \
- WebProcess/Plugins/JSNPMethod.h \
- WebProcess/Plugins/NPJSObject.h \
- WebProcess/Plugins/NPRuntimeObjectMap.h \
- WebProcess/Plugins/NPRuntimeUtilities.h \
WebProcess/Plugins/Plugin.h \
WebProcess/Plugins/PluginController.h \
WebProcess/Plugins/PluginView.h \
+ WebProcess/Plugins/Netscape/JSNPObject.h \
+ WebProcess/Plugins/Netscape/JSNPMethod.h \
+ WebProcess/Plugins/Netscape/NPJSObject.h \
+ WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h \
+ WebProcess/Plugins/Netscape/NPRuntimeUtilities.h \
WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp \
WebProcess/Plugins/Netscape/NetscapePlugin.h \
WebProcess/Plugins/Netscape/NetscapePluginModule.h \
@@ -462,13 +462,13 @@ SOURCES += \
WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp \
WebProcess/InjectedBundle/InjectedBundleScriptWorld.cpp \
WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp \
- WebProcess/Plugins/JSNPObject.cpp \
- WebProcess/Plugins/JSNPMethod.cpp \
- WebProcess/Plugins/NPJSObject.cpp \
- WebProcess/Plugins/NPRuntimeObjectMap.cpp \
- WebProcess/Plugins/NPRuntimeUtilities.cpp \
WebProcess/Plugins/Plugin.cpp \
WebProcess/Plugins/PluginView.cpp \
+ WebProcess/Plugins/Netscape/JSNPObject.cpp \
+ WebProcess/Plugins/Netscape/JSNPMethod.cpp \
+ WebProcess/Plugins/Netscape/NPJSObject.cpp \
+ WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp \
+ WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp \
WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp \
WebProcess/Plugins/Netscape/NetscapePlugin.cpp \
WebProcess/Plugins/Netscape/NetscapePluginModule.cpp \
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index cd85dcb..a9b8417 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -1186,16 +1186,6 @@
isa = PBXGroup;
children = (
1A6FB90811E66FB100DB1371 /* Netscape */,
- 1AE49A4811FFA8CE0048B464 /* JSNPMethod.cpp */,
- 1AE49A4711FFA8CE0048B464 /* JSNPMethod.h */,
- 1AE4987711FF7FAA0048B464 /* JSNPObject.cpp */,
- 1AE4987611FF7FAA0048B464 /* JSNPObject.h */,
- 1AE4976711FF658E0048B464 /* NPJSObject.cpp */,
- 1AE4976611FF658E0048B464 /* NPJSObject.h */,
- 1A2161AF11F37664008AD0F5 /* NPRuntimeObjectMap.cpp */,
- 1A2161AE11F37664008AD0F5 /* NPRuntimeObjectMap.h */,
- 1A2162AE11F38971008AD0F5 /* NPRuntimeUtilities.cpp */,
- 1A2162AF11F38971008AD0F5 /* NPRuntimeUtilities.h */,
1A6FB7D011E651E200DB1371 /* Plugin.cpp */,
1A6FB7D111E651E200DB1371 /* Plugin.h */,
1AA56F2811E92BC80061B882 /* PluginController.h */,
@@ -1216,6 +1206,16 @@
isa = PBXGroup;
children = (
1A6FBA0111E6812B00DB1371 /* mac */,
+ 1AE49A4811FFA8CE0048B464 /* JSNPMethod.cpp */,
+ 1AE49A4711FFA8CE0048B464 /* JSNPMethod.h */,
+ 1AE4987711FF7FAA0048B464 /* JSNPObject.cpp */,
+ 1AE4987611FF7FAA0048B464 /* JSNPObject.h */,
+ 1AE4976711FF658E0048B464 /* NPJSObject.cpp */,
+ 1AE4976611FF658E0048B464 /* NPJSObject.h */,
+ 1A2161AF11F37664008AD0F5 /* NPRuntimeObjectMap.cpp */,
+ 1A2161AE11F37664008AD0F5 /* NPRuntimeObjectMap.h */,
+ 1A2162AE11F38971008AD0F5 /* NPRuntimeUtilities.cpp */,
+ 1A2162AF11F38971008AD0F5 /* NPRuntimeUtilities.h */,
1A6FBA2911E6862700DB1371 /* NetscapeBrowserFuncs.cpp */,
1A6FBA2811E6862700DB1371 /* NetscapeBrowserFuncs.h */,
1A6FBD2711E69BC200DB1371 /* NetscapePlugin.cpp */,
diff --git a/WebKit2/WebProcess/Plugins/JSNPMethod.cpp b/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.cpp
similarity index 100%
rename from WebKit2/WebProcess/Plugins/JSNPMethod.cpp
rename to WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.cpp
diff --git a/WebKit2/WebProcess/Plugins/JSNPMethod.h b/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.h
similarity index 100%
rename from WebKit2/WebProcess/Plugins/JSNPMethod.h
rename to WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.h
diff --git a/WebKit2/WebProcess/Plugins/JSNPObject.cpp b/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp
similarity index 100%
rename from WebKit2/WebProcess/Plugins/JSNPObject.cpp
rename to WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp
diff --git a/WebKit2/WebProcess/Plugins/JSNPObject.h b/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h
similarity index 100%
rename from WebKit2/WebProcess/Plugins/JSNPObject.h
rename to WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h
diff --git a/WebKit2/WebProcess/Plugins/NPJSObject.cpp b/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp
similarity index 100%
rename from WebKit2/WebProcess/Plugins/NPJSObject.cpp
rename to WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp
diff --git a/WebKit2/WebProcess/Plugins/NPJSObject.h b/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.h
similarity index 100%
rename from WebKit2/WebProcess/Plugins/NPJSObject.h
rename to WebKit2/WebProcess/Plugins/Netscape/NPJSObject.h
diff --git a/WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.cpp b/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp
similarity index 100%
rename from WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.cpp
rename to WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp
diff --git a/WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.h b/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h
similarity index 100%
rename from WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.h
rename to WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h
diff --git a/WebKit2/WebProcess/Plugins/NPRuntimeUtilities.cpp b/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp
similarity index 100%
rename from WebKit2/WebProcess/Plugins/NPRuntimeUtilities.cpp
rename to WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp
diff --git a/WebKit2/WebProcess/Plugins/NPRuntimeUtilities.h b/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.h
similarity index 100%
rename from WebKit2/WebProcess/Plugins/NPRuntimeUtilities.h
rename to WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.h
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index 9b2d479..a258d3e 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -1276,13 +1276,13 @@
>
</File>
<Filter
- Name="cf"
- >
- <File
- RelativePath="..\WebProcess\Downloads\cf\DownloadCFNet.cpp"
- >
- </File>
- </Filter>
+ Name="cf"
+ >
+ <File
+ RelativePath="..\WebProcess\Downloads\cf\DownloadCFNet.cpp"
+ >
+ </File>
+ </Filter>
</Filter>
<Filter
Name="InjectedBundle"
@@ -1500,46 +1500,6 @@
Name="Plugins"
>
<File
- RelativePath="..\WebProcess\Plugins\JSNPMethod.cpp"
- >
- </File>
- <File
- RelativePath="..\WebProcess\Plugins\JSNPMethod.h"
- >
- </File>
- <File
- RelativePath="..\WebProcess\Plugins\JSNPObject.cpp"
- >
- </File>
- <File
- RelativePath="..\WebProcess\Plugins\JSNPObject.h"
- >
- </File>
- <File
- RelativePath="..\WebProcess\Plugins\NPJSObject.cpp"
- >
- </File>
- <File
- RelativePath="..\WebProcess\Plugins\NPJSObject.h"
- >
- </File>
- <File
- RelativePath="..\WebProcess\Plugins\NPRuntimeObjectMap.cpp"
- >
- </File>
- <File
- RelativePath="..\WebProcess\Plugins\NPRuntimeObjectMap.h"
- >
- </File>
- <File
- RelativePath="..\WebProcess\Plugins\NPRuntimeUtilities.cpp"
- >
- </File>
- <File
- RelativePath="..\WebProcess\Plugins\NPRuntimeUtilities.h"
- >
- </File>
- <File
RelativePath="..\WebProcess\Plugins\Plugin.cpp"
>
</File>
@@ -1563,6 +1523,22 @@
Name="Netscape"
>
<File
+ RelativePath="..\WebProcess\Plugins\Netscape\JSNPMethod.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\WebProcess\Plugins\Netscape\JSNPMethod.h"
+ >
+ </File>
+ <File
+ RelativePath="..\WebProcess\Plugins\Netscape\JSNPObject.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\WebProcess\Plugins\Netscape\JSNPObject.h"
+ >
+ </File>
+ <File
RelativePath="..\WebProcess\Plugins\Netscape\NetscapeBrowserFuncs.cpp"
>
</File>
@@ -1594,6 +1570,30 @@
RelativePath="..\WebProcess\Plugins\Netscape\NetscapePluginStream.h"
>
</File>
+ <File
+ RelativePath="..\WebProcess\Plugins\Netscape\NPJSObject.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\WebProcess\Plugins\Netscape\NPJSObject.h"
+ >
+ </File>
+ <File
+ RelativePath="..\WebProcess\Plugins\Netscape\NPRuntimeObjectMap.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\WebProcess\Plugins\Netscape\NPRuntimeObjectMap.h"
+ >
+ </File>
+ <File
+ RelativePath="..\WebProcess\Plugins\Netscape\NPRuntimeUtilities.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\WebProcess\Plugins\Netscape\NPRuntimeUtilities.h"
+ >
+ </File>
<Filter
Name="win"
>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list