Changeset 74058 in webkit
- Timestamp:
- Dec 14, 2010 1:45:09 PM (13 years ago)
- Location:
- trunk/WebKit2
- Files:
-
- 1 added
- 5 edited
- 2 moved
-
ChangeLog (modified) (1 diff)
-
Shared/Plugins/Netscape (added)
-
Shared/Plugins/Netscape/NetscapePluginModule.cpp (moved) (moved from trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginModule.cpp)
-
Shared/Plugins/Netscape/NetscapePluginModule.h (moved) (moved from trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginModule.h)
-
WebKit2.pro (modified) (5 diffs)
-
WebKit2.xcodeproj/project.pbxproj (modified) (11 diffs)
-
win/WebKit2.vcproj (modified) (2 diffs)
-
win/WebKit2Common.vsprops (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit2/ChangeLog
r74046 r74058 1 2010-12-14 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Adam Roben. 4 5 Move NetscapePluginModule.{cpp|h} to Shared/Plugins/Netscape 6 https://bugs.webkit.org/show_bug.cgi?id=51052 7 8 * Shared/Plugins/Netscape/NetscapePluginModule.cpp: Renamed from WebKit2/WebProcess/Plugins/Netscape/NetscapePluginModule.cpp. 9 * Shared/Plugins/Netscape/NetscapePluginModule.h: Renamed from WebKit2/WebProcess/Plugins/Netscape/NetscapePluginModule.h. 10 * WebKit2.pro: 11 * WebKit2.xcodeproj/project.pbxproj: 12 * win/WebKit2.vcproj: 13 * win/WebKit2Common.vsprops: 14 1 15 2010-12-14 Anders Carlsson <andersca@apple.com> 2 16 -
trunk/WebKit2/WebKit2.pro
r74000 r74058 125 125 Shared/API/c \ 126 126 Shared/CoreIPCSupport \ 127 Shared/Plugins/Netscape \ 127 128 Shared/qt \ 128 129 UIProcess \ … … 268 269 Shared/WebURLResponse.h \ 269 270 Shared/WebUserContentURLPattern.h \ 271 Shared/Plugins/Netscape/NetscapePluginModule.h \ 270 272 Shared/qt/CrashHandler.h \ 271 273 Shared/qt/PlatformCertificateInfo.h \ … … 380 382 WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp \ 381 383 WebProcess/Plugins/Netscape/NetscapePlugin.h \ 382 WebProcess/Plugins/Netscape/NetscapePluginModule.h \383 384 WebProcess/Plugins/Netscape/NetscapePluginStream.h \ 384 385 WebProcess/Plugins/Plugin.h \ … … 440 441 Shared/API/c/WKURLResponse.cpp \ 441 442 Shared/API/c/WKUserContentURLPattern.cpp \ 443 Shared/Plugins/Netscape/NetscapePluginModule.cpp \ 442 444 Shared/BackingStore.cpp \ 443 445 Shared/ChildProcess.cpp \ … … 584 586 WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp \ 585 587 WebProcess/Plugins/Netscape/NetscapePlugin.cpp \ 586 WebProcess/Plugins/Netscape/NetscapePluginModule.cpp \587 588 WebProcess/Plugins/Netscape/NetscapePluginStream.cpp \ 588 589 WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp \ -
trunk/WebKit2/WebKit2.xcodeproj/project.pbxproj
r74046 r74058 111 111 1A4A9AA812B7E796008FE984 /* WKTextInputWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4A9AA612B7E796008FE984 /* WKTextInputWindowController.h */; }; 112 112 1A4A9AA912B7E796008FE984 /* WKTextInputWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A4A9AA712B7E796008FE984 /* WKTextInputWindowController.mm */; }; 113 1A4A9C5512B816CF008FE984 /* NetscapePluginModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A4A9C5312B816CF008FE984 /* NetscapePluginModule.cpp */; }; 114 1A4A9C5612B816CF008FE984 /* NetscapePluginModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4A9C5412B816CF008FE984 /* NetscapePluginModule.h */; }; 113 115 1A50DB66110A3D57000D3FE5 /* WebProcess.app in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1A50DB1E110A3BDC000D3FE5 /* WebProcess.app */; }; 114 116 1A594ABA112A1FB6009DE7C7 /* WebUIClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A594AB8112A1FB6009DE7C7 /* WebUIClient.cpp */; }; … … 129 131 1A6FB7D211E651E200DB1371 /* Plugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FB7D011E651E200DB1371 /* Plugin.cpp */; }; 130 132 1A6FB7D311E651E200DB1371 /* Plugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6FB7D111E651E200DB1371 /* Plugin.h */; }; 131 1A6FB90B11E66FBC00DB1371 /* NetscapePluginModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6FB90911E66FBC00DB1371 /* NetscapePluginModule.h */; };132 1A6FB90C11E66FBC00DB1371 /* NetscapePluginModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FB90A11E66FBC00DB1371 /* NetscapePluginModule.cpp */; };133 133 1A6FBA2A11E6862700DB1371 /* NetscapeBrowserFuncs.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6FBA2811E6862700DB1371 /* NetscapeBrowserFuncs.h */; }; 134 134 1A6FBA2B11E6862700DB1371 /* NetscapeBrowserFuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FBA2911E6862700DB1371 /* NetscapeBrowserFuncs.cpp */; }; … … 743 743 1A4A9AA612B7E796008FE984 /* WKTextInputWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKTextInputWindowController.h; sourceTree = "<group>"; }; 744 744 1A4A9AA712B7E796008FE984 /* WKTextInputWindowController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKTextInputWindowController.mm; sourceTree = "<group>"; }; 745 1A4A9C5312B816CF008FE984 /* NetscapePluginModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetscapePluginModule.cpp; sourceTree = "<group>"; }; 746 1A4A9C5412B816CF008FE984 /* NetscapePluginModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetscapePluginModule.h; sourceTree = "<group>"; }; 745 747 1A4F976A100E7B6600637A18 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; }; 746 748 1A4F976B100E7B6600637A18 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; }; … … 765 767 1A6FB7D011E651E200DB1371 /* Plugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Plugin.cpp; sourceTree = "<group>"; }; 766 768 1A6FB7D111E651E200DB1371 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Plugin.h; sourceTree = "<group>"; }; 767 1A6FB90911E66FBC00DB1371 /* NetscapePluginModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetscapePluginModule.h; sourceTree = "<group>"; };768 1A6FB90A11E66FBC00DB1371 /* NetscapePluginModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetscapePluginModule.cpp; sourceTree = "<group>"; };769 769 1A6FBA2811E6862700DB1371 /* NetscapeBrowserFuncs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetscapeBrowserFuncs.h; sourceTree = "<group>"; }; 770 770 1A6FBA2911E6862700DB1371 /* NetscapeBrowserFuncs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetscapeBrowserFuncs.cpp; sourceTree = "<group>"; }; … … 1409 1409 sourceTree = "<group>"; 1410 1410 }; 1411 1A4A9C5212B816CF008FE984 /* Netscape */ = { 1412 isa = PBXGroup; 1413 children = ( 1414 1A4A9C5312B816CF008FE984 /* NetscapePluginModule.cpp */, 1415 1A4A9C5412B816CF008FE984 /* NetscapePluginModule.h */, 1416 ); 1417 path = Netscape; 1418 sourceTree = "<group>"; 1419 }; 1411 1420 1A4F9769100E7B6600637A18 /* Configurations */ = { 1412 1421 isa = PBXGroup; … … 1493 1502 1A6FBD2711E69BC200DB1371 /* NetscapePlugin.cpp */, 1494 1503 1A6FBD2611E69BC200DB1371 /* NetscapePlugin.h */, 1495 1A6FB90A11E66FBC00DB1371 /* NetscapePluginModule.cpp */,1496 1A6FB90911E66FBC00DB1371 /* NetscapePluginModule.h */,1497 1504 1AA5889111EE70400061B882 /* NetscapePluginStream.cpp */, 1498 1505 1AA5889011EE70400061B882 /* NetscapePluginStream.h */, … … 1609 1616 isa = PBXGroup; 1610 1617 children = ( 1618 1A4A9C5212B816CF008FE984 /* Netscape */, 1611 1619 1A2D90D11281C966001EB962 /* PluginProcessCreationParameters.cpp */, 1612 1620 1A2D90D01281C966001EB962 /* PluginProcessCreationParameters.h */, … … 2441 2449 1A6FBA2A11E6862700DB1371 /* NetscapeBrowserFuncs.h in Headers */, 2442 2450 1A6FBD2811E69BC200DB1371 /* NetscapePlugin.h in Headers */, 2443 1A6FB90B11E66FBC00DB1371 /* NetscapePluginModule.h in Headers */,2444 2451 1AA5889211EE70400061B882 /* NetscapePluginStream.h in Headers */, 2445 2452 BCC57162115ADB42001CCAF9 /* NotImplemented.h in Headers */, … … 2699 2706 F62A76B912B1B25F0005F1B6 /* WebDatabaseManagerProxyMessages.h in Headers */, 2700 2707 1A4A9AA812B7E796008FE984 /* WKTextInputWindowController.h in Headers */, 2708 1A4A9C5612B816CF008FE984 /* NetscapePluginModule.h in Headers */, 2701 2709 ); 2702 2710 runOnlyForDeploymentPostprocessing = 0; … … 2874 2882 1A6FBD2911E69BC200DB1371 /* NetscapePlugin.cpp in Sources */, 2875 2883 1AE5B7FB11E7AED200BA6767 /* NetscapePluginMac.mm in Sources */, 2876 1A6FB90C11E66FBC00DB1371 /* NetscapePluginModule.cpp in Sources */,2877 2884 1AA5889311EE70400061B882 /* NetscapePluginStream.cpp in Sources */, 2878 2885 BC111B51112F619200337BAB /* PageClientImpl.mm in Sources */, … … 3115 3122 BC857E8712B71EBB00EDEB2E /* WebPageProxyMac.mm in Sources */, 3116 3123 1A4A9AA912B7E796008FE984 /* WKTextInputWindowController.mm in Sources */, 3124 1A4A9C5512B816CF008FE984 /* NetscapePluginModule.cpp in Sources */, 3117 3125 ); 3118 3126 runOnlyForDeploymentPostprocessing = 0; -
trunk/WebKit2/win/WebKit2.vcproj
r74000 r74058 843 843 </File> 844 844 <Filter 845 Name="Plugins" 846 > 847 <Filter 848 Name="Netscape" 849 > 850 <File 851 RelativePath="..\Shared\Plugins\Netscape\NetscapePluginModule.cpp" 852 > 853 </File> 854 <File 855 RelativePath="..\Shared\Plugins\Netscape\NetscapePluginModule.h" 856 > 857 </File> 858 </Filter> 859 </Filter> 860 <Filter 845 861 Name="cf" 846 862 > … … 1775 1791 <File 1776 1792 RelativePath="..\WebProcess\Plugins\Netscape\NetscapePlugin.h" 1777 >1778 </File>1779 <File1780 RelativePath="..\WebProcess\Plugins\Netscape\NetscapePluginModule.cpp"1781 >1782 </File>1783 <File1784 RelativePath="..\WebProcess\Plugins\Netscape\NetscapePluginModule.h"1785 1793 > 1786 1794 </File> -
trunk/WebKit2/win/WebKit2Common.vsprops
r73281 r74058 7 7 <Tool 8 8 Name="VCCLCompilerTool" 9 AdditionalIncludeDirectories=""$(ProjectDir)\..\Platform";"$(ProjectDir)\..\Platform\CoreIPC";"$(ProjectDir)\..\PluginProcess";"$(ProjectDir)\..\Shared";"$(ProjectDir)\..\Shared\win";"$(ProjectDir)\..\Shared\API\c";"$(ProjectDir)\..\Shared\API\c\cf";"$(ProjectDir)\..\Shared\API\c\win";"$(ProjectDir)\..\Shared\CoreIPCSupport";"$(ProjectDir)\..\ UIProcess";"$(ProjectDir)\..\UIProcess\API\C";"$(ProjectDir)\..\UIProcess\API\C\win";"$(ProjectDir)\..\UIProcess\API\cpp";"$(ProjectDir)\..\UIProcess\API\win";"$(ProjectDir)\..\UIProcess\Authentication";"$(ProjectDir)\..\UIProcess\Downloads";"$(ProjectDir)\..\UIProcess\Launcher";"$(ProjectDir)\..\UIProcess\Plugins";"$(ProjectDir)\..\UIProcess\win";"$(ProjectDir)\..\WebProcess";"$(ProjectDir)\..\WebProcess\WebCoreSupport";"$(ProjectDir)\..\WebProcess\WebCoreSupport\win";"$(ProjectDir)\..\WebProcess\WebPage";"$(ProjectDir)\..\WebProcess\WebPage\win";"$(ProjectDir)\..\WebProcess\InjectedBundle";"$(ProjectDir)\..\WebProcess\InjectedBundle\API\c";"$(ProjectDir)\..\WebProcess\InjectedBundle\DOM";"$(ProjectDir)\..\WebProcess\InjectedBundle\win";"$(ProjectDir)\..\WebProcess\Plugins";"$(ProjectDir)\..\WebProcess\Plugins\Netscape";"$(ProjectDir)\..\WebProcess\win";"$(ProjectDir)\..\WebProcess\Authentication";"$(ProjectDir)\..\WebProcess\Downloads";"$(ProjectDir)\..\WebProcess\Downloads\cf";"$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources";"$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\private";"$(WebKitLibrariesDir)\Include";"$(WebKitLibrariesDir)\Include\private";"$(WebKitLibrariesDir)\Include\pthreads";"$(WebKitOutputDir)\Include\JavaScriptCore";"$(WebKitOutputDir)\Include\private\JavaScriptCore";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\private\JavaScriptCore";"$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders""9 AdditionalIncludeDirectories=""$(ProjectDir)\..\Platform";"$(ProjectDir)\..\Platform\CoreIPC";"$(ProjectDir)\..\PluginProcess";"$(ProjectDir)\..\Shared";"$(ProjectDir)\..\Shared\win";"$(ProjectDir)\..\Shared\API\c";"$(ProjectDir)\..\Shared\API\c\cf";"$(ProjectDir)\..\Shared\API\c\win";"$(ProjectDir)\..\Shared\CoreIPCSupport";"$(ProjectDir)\..\Shared\Plugins\Netscape";"$(ProjectDir)\..\UIProcess";"$(ProjectDir)\..\UIProcess\API\C";"$(ProjectDir)\..\UIProcess\API\C\win";"$(ProjectDir)\..\UIProcess\API\cpp";"$(ProjectDir)\..\UIProcess\API\win";"$(ProjectDir)\..\UIProcess\Authentication";"$(ProjectDir)\..\UIProcess\Downloads";"$(ProjectDir)\..\UIProcess\Launcher";"$(ProjectDir)\..\UIProcess\Plugins";"$(ProjectDir)\..\UIProcess\win";"$(ProjectDir)\..\WebProcess";"$(ProjectDir)\..\WebProcess\WebCoreSupport";"$(ProjectDir)\..\WebProcess\WebCoreSupport\win";"$(ProjectDir)\..\WebProcess\WebPage";"$(ProjectDir)\..\WebProcess\WebPage\win";"$(ProjectDir)\..\WebProcess\InjectedBundle";"$(ProjectDir)\..\WebProcess\InjectedBundle\API\c";"$(ProjectDir)\..\WebProcess\InjectedBundle\DOM";"$(ProjectDir)\..\WebProcess\InjectedBundle\win";"$(ProjectDir)\..\WebProcess\Plugins";"$(ProjectDir)\..\WebProcess\Plugins\Netscape";"$(ProjectDir)\..\WebProcess\win";"$(ProjectDir)\..\WebProcess\Authentication";"$(ProjectDir)\..\WebProcess\Downloads";"$(ProjectDir)\..\WebProcess\Downloads\cf";"$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources";"$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\private";"$(WebKitLibrariesDir)\Include";"$(WebKitLibrariesDir)\Include\private";"$(WebKitLibrariesDir)\Include\pthreads";"$(WebKitOutputDir)\Include\JavaScriptCore";"$(WebKitOutputDir)\Include\private\JavaScriptCore";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\private\JavaScriptCore";"$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders"" 10 10 PreprocessorDefinitions="_USRDLL;WEBKIT_EXPORTS;FRAMEWORK_NAME=WebKit;BUILDING_WEBKIT" 11 11 UsePrecompiledHeader="2"
Note: See TracChangeset
for help on using the changeset viewer.
