Changeset 30923 in webkit
- Timestamp:
- Mar 10, 2008 4:52:27 AM (16 years ago)
- Location:
- trunk
- Files:
-
- 30 added
- 9 deleted
- 45 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r30915 r30923 1 2008-03-07 Simon Hausmann <hausmann@webkit.org> 2 3 Reviewed by Darin. 4 5 Done with Lars. 6 7 Added plugins subdirectory to the include path. 8 9 * WebKit.pri: 10 1 11 2008-03-09 Alp Toker <alp@atoker.com> 2 12 -
trunk/LayoutTests/ChangeLog
r30905 r30923 1 2008-03-07 Simon Hausmann <hausmann@webkit.org> 2 3 Reviewed by Darin. 4 5 Done with Lars. 6 7 Added a testcase for http://bugs.webkit.org/show_bug.cgi?id=16815 8 9 * fast/js/navigator-plugins-crash-expected.txt: Added. 10 * fast/js/navigator-plugins-crash.html: Added. 11 1 12 2008-03-08 Oliver Hunt <oliver@apple.com> 2 13 -
trunk/WebCore/ChangeLog
r30922 r30923 1 2008-03-07 Simon Hausmann <hausmann@webkit.org> 2 3 Reviewed by Darin. 4 5 Done with Lars. 6 7 http://bugs.webkit.org/show_bug.cgi?id=16815 8 9 Ported the manually written JS bindings of window.navigator, 10 window.navigator.plugins and window.navigator.mimeTypes to 11 auto-generated bindings. 12 13 Moved the globally cached plugin and mimetype information to a 14 per WebCore::Page shared PluginData structure. 15 16 Implemented window.navigator.plugins.refresh() in a 17 platform-independent way. 18 19 * DerivedSources.make: 20 * GNUmakefile.am: 21 * WebCore.pro: 22 * WebCore.vcproj/WebCore.vcproj: 23 * WebCore.xcodeproj/project.pbxproj: 24 * bindings/js/JSDOMWindowBase.cpp: 25 (WebCore::JSDOMWindowBase::getValueProperty): 26 * bindings/js/JSMimeTypeArrayCustom.cpp: Added. 27 (WebCore::JSMimeTypeArray::canGetItemsForName): 28 (WebCore::JSMimeTypeArray::nameGetter): 29 * bindings/js/JSNavigatorCustom.cpp: Added. 30 (WebCore::needsYouTubeQuirk): 31 (WebCore::JSNavigator::appVersion): 32 * bindings/js/JSPluginArrayCustom.cpp: Added. 33 (WebCore::JSPluginArray::canGetItemsForName): 34 (WebCore::JSPluginArray::nameGetter): 35 * bindings/js/JSPluginCustom.cpp: Added. 36 (WebCore::JSPlugin::canGetItemsForName): 37 (WebCore::JSPlugin::nameGetter): 38 * bindings/js/kjs_navigator.cpp: Removed. 39 * bindings/js/kjs_navigator.h: Removed. 40 * dom/Clipboard.cpp: 41 * dom/DOMImplementation.cpp: 42 (WebCore::DOMImplementation::createDocument): 43 * loader/FrameLoader.cpp: 44 (WebCore::FrameLoader::shouldUsePlugin): 45 * page/DOMWindow.cpp: 46 (WebCore::DOMWindow::clear): 47 (WebCore::DOMWindow::navigator): 48 * page/DOMWindow.h: 49 * page/DOMWindow.idl: 50 * page/DragController.cpp: 51 * page/Frame.cpp: 52 * page/Frame.h: 53 * page/Navigator.cpp: Added. 54 (WebCore::Navigator::Navigator): 55 (WebCore::Navigator::~Navigator): 56 (WebCore::Navigator::disconnectFrame): 57 (WebCore::Navigator::appCodeName): 58 (WebCore::Navigator::appName): 59 (WebCore::Navigator::appVersion): 60 (WebCore::Navigator::language): 61 (WebCore::Navigator::userAgent): 62 (WebCore::Navigator::platform): 63 (WebCore::Navigator::plugins): 64 (WebCore::Navigator::mimeTypes): 65 (WebCore::Navigator::product): 66 (WebCore::Navigator::productSub): 67 (WebCore::Navigator::vendor): 68 (WebCore::Navigator::vendorSub): 69 (WebCore::Navigator::cookieEnabled): 70 (WebCore::Navigator::javaEnabled): 71 * page/Navigator.h: Added. 72 (WebCore::Navigator::create): 73 (WebCore::Navigator::frame): 74 * page/Navigator.idl: Added. 75 * page/Page.cpp: 76 (WebCore::Page::refreshPlugins): 77 (WebCore::Page::pluginData): 78 * page/Page.h: 79 * page/Plugin.h: Removed. 80 * page/mac/FrameMac.mm: 81 * page/mac/WebCoreFrameBridge.mm: 82 (-[WebCoreFrameBridge canProvideDocumentSource]): 83 * page/mac/WebCoreViewFactory.h: 84 * page/qt/FrameQt.cpp: 85 * page/win/FrameWin.cpp: 86 * platform/gtk/TemporaryLinkStubs.cpp: 87 * platform/mac/PlugInInfoStoreMac.mm: Removed. 88 * platform/qt/MIMETypeRegistryQt.cpp: 89 (WebCore::MIMETypeRegistry::getMIMETypeForExtension): 90 * plugins/MimeType.cpp: Added. 91 (WebCore::MimeType::MimeType): 92 (WebCore::MimeType::~MimeType): 93 (WebCore::MimeType::type): 94 (WebCore::MimeType::suffixes): 95 (WebCore::MimeType::description): 96 (WebCore::MimeType::enabledPlugin): 97 * plugins/MimeType.h: Added. 98 (WebCore::MimeType::create): 99 * plugins/MimeType.idl: Added. 100 * plugins/MimeTypeArray.cpp: Added. 101 (WebCore::MimeTypeArray::MimeTypeArray): 102 (WebCore::MimeTypeArray::~MimeTypeArray): 103 (WebCore::MimeTypeArray::length): 104 (WebCore::MimeTypeArray::item): 105 (WebCore::MimeTypeArray::canGetItemsForName): 106 (WebCore::MimeTypeArray::nameGetter): 107 (WebCore::MimeTypeArray::getPluginData): 108 * plugins/MimeTypeArray.h: Added. 109 (WebCore::MimeTypeArray::create): 110 (WebCore::MimeTypeArray::disconnectFrame): 111 * plugins/MimeTypeArray.idl: Added. 112 * plugins/Plugin.cpp: Added. 113 (WebCore::Plugin::Plugin): 114 (WebCore::Plugin::~Plugin): 115 (WebCore::Plugin::name): 116 (WebCore::Plugin::filename): 117 (WebCore::Plugin::description): 118 (WebCore::Plugin::length): 119 (WebCore::Plugin::item): 120 (WebCore::Plugin::canGetItemsForName): 121 (WebCore::Plugin::nameGetter): 122 * plugins/Plugin.h: Added. 123 (WebCore::Plugin::create): 124 * plugins/Plugin.idl: Added. 125 * plugins/PluginArray.cpp: Added. 126 (WebCore::PluginArray::PluginArray): 127 (WebCore::PluginArray::~PluginArray): 128 (WebCore::PluginArray::length): 129 (WebCore::PluginArray::item): 130 (WebCore::PluginArray::canGetItemsForName): 131 (WebCore::PluginArray::nameGetter): 132 (WebCore::PluginArray::refresh): 133 (WebCore::PluginArray::getPluginData): 134 * plugins/PluginArray.h: Added. 135 (WebCore::PluginArray::create): 136 (WebCore::PluginArray::disconnectFrame): 137 * plugins/PluginArray.idl: Added. 138 * plugins/PluginData.cpp: Added. 139 (WebCore::PluginData::PluginData): 140 (WebCore::PluginData::~PluginData): 141 (WebCore::PluginData::supportsMimeType): 142 (WebCore::PluginData::pluginNameForMimeType): 143 * plugins/PluginData.h: Added. 144 (WebCore::PluginData::create): 145 (WebCore::PluginData::disconnectPage): 146 (WebCore::PluginData::page): 147 (WebCore::PluginData::plugins): 148 (WebCore::PluginData::mimes): 149 * plugins/mac/PluginDataMac.mm: Added. 150 (WebCore::PluginData::initPlugins): 151 (WebCore::PluginData::refresh): 152 * plugins/qt/PluginDataQt.cpp: Added. 153 (WebCore::PluginData::initPlugins): 154 * plugins/win/PluginDataWin.cpp: Added. 155 (WebCore::PluginData::initPlugins): 156 (WebCore::PluginData::refresh): 157 1 158 2008-03-10 Simon Hausmann <hausmann@webkit.org> 2 159 -
trunk/WebCore/DerivedSources.make
r30919 r30923 34 34 $(WebCore)/html \ 35 35 $(WebCore)/page \ 36 $(WebCore)/plugins \ 36 37 $(WebCore)/storage \ 37 38 $(WebCore)/xml \ … … 344 345 JSEventTargetBase.lut.h \ 345 346 JSLocation.lut.h \ 347 JSPlugin.h \ 348 JSPluginArray.h \ 349 JSNavigator.h \ 350 JSMimeType.h \ 351 JSMimeTypeArray.h \ 346 352 JSRGBColor.lut.h \ 347 353 JSXMLHttpRequest.lut.h \ 348 354 JSXSLTProcessor.lut.h \ 349 kjs_navigator.lut.h \350 355 \ 351 356 JSHTMLInputElementBaseTable.cpp \ -
trunk/WebCore/GNUmakefile.am
r30874 r30923 55 55 WebCore/bindings/js/JSXMLHttpRequest.lut.h \ 56 56 WebCore/bindings/js/JSXSLTProcessor.lut.h \ 57 WebCore/bindings/js/kjs_navigator.lut.h \58 57 WebCore/bindings/js/JSHTMLInputElementBaseTable.cpp 59 58 … … 172 171 DerivedSources/JSKeyboardEvent.h \ 173 172 DerivedSources/JSMediaList.h \ 173 DerivedSources/JSMimeType.h \ 174 DerivedSources/JSMimeTypeArray.h \ 174 175 DerivedSources/JSMouseEvent.h \ 175 176 DerivedSources/JSMutationEvent.h \ 176 177 DerivedSources/JSNamedNodeMap.h \ 178 DerivedSources/JSNavigator.h \ 177 179 DerivedSources/JSNode.h \ 178 180 DerivedSources/JSNodeFilter.h \ … … 181 183 DerivedSources/JSNotation.h \ 182 184 DerivedSources/JSOverflowEvent.h \ 185 DerivedSources/JSPlugin.h \ 186 DerivedSources/JSPluginArray.h \ 183 187 DerivedSources/JSProcessingInstruction.h \ 184 188 DerivedSources/JSProgressEvent.h \ … … 298 302 DerivedSources/JSKeyboardEvent.cpp \ 299 303 DerivedSources/JSMediaList.cpp \ 304 DerivedSources/JSMimeType.cpp \ 305 DerivedSources/JSMimeTypeArray.cpp \ 300 306 DerivedSources/JSMouseEvent.cpp \ 301 307 DerivedSources/JSMutationEvent.cpp \ 302 308 DerivedSources/JSNamedNodeMap.cpp \ 309 DerivedSources/JSNavigator.cpp \ 303 310 DerivedSources/JSNode.cpp \ 304 311 DerivedSources/JSNodeFilter.cpp \ … … 307 314 DerivedSources/JSNotation.cpp \ 308 315 DerivedSources/JSOverflowEvent.cpp \ 316 DerivedSources/JSPlugin.cpp \ 317 DerivedSources/JSPluginArray.cpp \ 309 318 DerivedSources/JSProcessingInstruction.cpp \ 310 319 DerivedSources/JSProgressEvent.cpp \ … … 444 453 WebCore/page/DOMWindow.idl \ 445 454 WebCore/page/History.idl \ 455 WebCore/page/Navigator.idl \ 446 456 WebCore/page/Screen.idl \ 457 WebCore/plugins/MimeType.idl \ 458 WebCore/plugins/MimeTypeArray.idl \ 459 WebCore/plugins/Plugin.idl \ 460 WebCore/plugins/PluginArray.idl \ 447 461 WebCore/xml/DOMParser.idl \ 448 462 WebCore/xml/XMLHttpRequestException.idl \ … … 488 502 WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp \ 489 503 WebCore/bindings/js/JSHTMLSelectElementCustom.cpp \ 504 WebCore/bindings/js/JSMimeTypeArrayCustom.cpp \ 490 505 WebCore/bindings/js/JSNamedNodeMapCustom.cpp \ 491 506 WebCore/bindings/js/JSNamedNodesCollection.cpp \ 507 WebCore/bindings/js/JSNavigatorCustom.cpp \ 492 508 WebCore/bindings/js/JSNodeCustom.cpp \ 493 509 WebCore/bindings/js/JSNodeFilterCondition.cpp \ … … 496 512 WebCore/bindings/js/JSNodeListCustom.cpp \ 497 513 WebCore/bindings/js/JSRGBColor.cpp \ 514 WebCore/bindings/js/JSPluginArrayCustom.cpp \ 515 WebCore/bindings/js/JSPluginCustom.cpp \ 498 516 WebCore/bindings/js/JSStyleSheetCustom.cpp \ 499 517 WebCore/bindings/js/JSStyleSheetListCustom.cpp \ … … 504 522 WebCore/bindings/js/kjs_events.cpp \ 505 523 WebCore/bindings/js/kjs_html.cpp \ 506 WebCore/bindings/js/kjs_navigator.cpp \507 524 WebCore/bindings/js/kjs_proxy.cpp \ 508 525 WebCore/bindings/js/PausedTimeouts.cpp \ … … 804 821 WebCore/page/JavaScriptDebugServer.cpp \ 805 822 WebCore/page/MouseEventWithHitTestResults.cpp \ 823 WebCore/page/Navigator.cpp \ 806 824 WebCore/page/Page.cpp \ 807 825 WebCore/page/PageGroup.cpp \ … … 865 883 WebCore/platform/text/UnicodeRange.cpp \ 866 884 WebCore/platform/Widget.cpp \ 885 WebCore/plugins/MimeType.cpp \ 886 WebCore/plugins/MimeTypeArray.cpp \ 887 WebCore/plugins/Plugin.cpp \ 888 WebCore/plugins/PluginArray.cpp \ 889 WebCore/plugins/PluginData.cpp \ 867 890 WebCore/plugins/PluginDatabase.cpp \ 868 891 WebCore/plugins/PluginInfoStore.cpp \ … … 2051 2074 $(WebCore)/storage \ 2052 2075 $(WebCore)/svg \ 2053 $(WebCore)/xml 2076 $(WebCore)/xml \ 2077 $(WebCore)/plugins 2054 2078 2055 2079 DerivedSources/JS%.h: DerivedSources/JS%.cpp; … … 2071 2095 JSRGBColor.lut.h \ 2072 2096 JSXMLHttpRequest.lut.h \ 2073 JSXSLTProcessor.lut.h \ 2074 kjs_navigator.lut.h 2075 2097 JSXSLTProcessor.lut.h 2098 -
trunk/WebCore/WebCore.pro
r30874 r30923 254 254 bindings/js/JSRGBColor.cpp \ 255 255 bindings/js/JSXMLHttpRequest.cpp \ 256 bindings/js/JSXSLTProcessor.cpp \ 257 bindings/js/kjs_navigator.cpp 256 bindings/js/JSXSLTProcessor.cpp 258 257 259 258 LUT_TABLE_FILES += \ … … 386 385 page/History.idl \ 387 386 page/Screen.idl \ 387 page/Navigator.idl \ 388 plugins/Plugin.idl \ 389 plugins/MimeType.idl \ 390 plugins/PluginArray.idl \ 391 plugins/MimeTypeArray.idl \ 388 392 xml/DOMParser.idl \ 389 393 xml/XMLHttpRequestException.idl \ … … 429 433 bindings/js/JSNamedNodeMapCustom.cpp \ 430 434 bindings/js/JSNamedNodesCollection.cpp \ 435 bindings/js/JSNavigatorCustom.cpp \ 431 436 bindings/js/JSNodeCustom.cpp \ 432 437 bindings/js/JSNodeFilterCondition.cpp \ … … 440 445 bindings/js/JSXMLHttpRequest.cpp \ 441 446 bindings/js/JSXSLTProcessor.cpp \ 447 bindings/js/JSPluginCustom.cpp \ 448 bindings/js/JSPluginArrayCustom.cpp \ 449 bindings/js/JSMimeTypeArrayCustom.cpp \ 442 450 bindings/js/kjs_binding.cpp \ 443 451 bindings/js/kjs_events.cpp \ 444 452 bindings/js/kjs_html.cpp \ 445 bindings/js/kjs_navigator.cpp \446 453 bindings/js/kjs_proxy.cpp \ 447 454 bindings/js/PausedTimeouts.cpp \ … … 733 740 page/DOMSelection.cpp \ 734 741 page/DOMWindow.cpp \ 742 page/Navigator.cpp \ 735 743 page/DragController.cpp \ 736 744 page/EventHandler.cpp \ … … 748 756 page/Settings.cpp \ 749 757 page/WindowFeatures.cpp \ 758 plugins/PluginData.cpp \ 759 plugins/PluginArray.cpp \ 760 plugins/Plugin.cpp \ 761 plugins/MimeType.cpp \ 762 plugins/MimeTypeArray.cpp \ 750 763 platform/Arena.cpp \ 751 764 platform/text/AtomicString.cpp \ … … 912 925 $$PWD/../WebKit/qt/Api/qwebview.h \ 913 926 $$PWD/../WebKit/qt/Api/qwebhistoryinterface.h \ 927 $$PWD/../WebKit/qt/Api/qwebpluginfactory.h \ 914 928 $$PWD/../WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h \ 915 929 $$PWD/platform/network/qt/QNetworkReplyHandler.h … … 977 991 platform/qt/WheelEventQt.cpp \ 978 992 platform/qt/WidgetQt.cpp \ 993 plugins/qt/PluginDataQt.cpp \ 979 994 ../WebKit/qt/WebCoreSupport/ChromeClientQt.cpp \ 980 995 ../WebKit/qt/WebCoreSupport/ContextMenuClientQt.cpp \ … … 990 1005 ../WebKit/qt/Api/qwebsettings.cpp \ 991 1006 ../WebKit/qt/Api/qwebhistoryinterface.cpp \ 1007 ../WebKit/qt/Api/qwebpluginfactory.cpp 992 1008 993 1009 unix: SOURCES += platform/qt/SystemTimeQt.cpp … … 999 1015 $$PWD/../WebKit/qt/Api/qwebnetworkinterface.h \ 1000 1016 $$PWD/../WebKit/qt/Api/qwebnetworkinterface_p.h \ 1001 $$PWD/../WebKit/qt/Api/qwebobjectplugin.h \1002 $$PWD/../WebKit/qt/Api/qwebobjectplugin_p.h \1003 $$PWD/../WebKit/qt/Api/qwebobjectpluginconnector.h \1004 1017 $$PWD/../WebKit/qt/Api/qcookiejar.h 1005 1018 1006 1019 SOURCES += \ 1007 1020 ../WebKit/qt/Api/qwebnetworkinterface.cpp \ 1008 ../WebKit/qt/Api/qwebobjectplugin.cpp \1009 ../WebKit/qt/Api/qwebobjectpluginconnector.cpp \1010 1021 ../WebKit/qt/Api/qcookiejar.cpp 1011 1022 -
trunk/WebCore/WebCore.vcproj/WebCore.vcproj
r30920 r30923 1367 1367 </File> 1368 1368 <File 1369 RelativePath="..\..\WebKitBuild\obj\WebCore\DerivedSources\JSMimeType.cpp" 1370 > 1371 </File> 1372 <File 1373 RelativePath="..\..\WebKitBuild\obj\WebCore\DerivedSources\JSMimeType.h" 1374 > 1375 </File> 1376 <File 1377 RelativePath="..\..\WebKitBuild\obj\WebCore\DerivedSources\JSMimeTypeArray.cpp" 1378 > 1379 </File> 1380 <File 1381 RelativePath="..\..\WebKitBuild\obj\WebCore\DerivedSources\JSMimeTypeArray.h" 1382 > 1383 </File> 1384 <File 1369 1385 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSMouseEvent.cpp" 1370 1386 > … … 1391 1407 </File> 1392 1408 <File 1409 RelativePath="..\..\WebKitBuild\obj\WebCore\DerivedSources\JSNavigator.cpp" 1410 > 1411 </File> 1412 <File 1413 RelativePath="..\..\WebKitBuild\obj\WebCore\DerivedSources\JSNavigator.h" 1414 > 1415 </File> 1416 <File 1393 1417 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSNode.cpp" 1394 1418 > … … 1436 1460 <File 1437 1461 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSOverflowEvent.h" 1462 > 1463 </File> 1464 <File 1465 RelativePath="..\..\WebKitBuild\obj\WebCore\DerivedSources\JSPlugin.cpp" 1466 > 1467 </File> 1468 <File 1469 RelativePath="..\..\WebKitBuild\obj\WebCore\DerivedSources\JSPlugin.h" 1470 > 1471 </File> 1472 <File 1473 RelativePath="..\..\WebKitBuild\obj\WebCore\DerivedSources\JSPluginArray.cpp" 1474 > 1475 </File> 1476 <File 1477 RelativePath="..\..\WebKitBuild\obj\WebCore\DerivedSources\JSPluginArray.h" 1438 1478 > 1439 1479 </File> … … 2993 3033 </File> 2994 3034 <File 3035 RelativePath="..\page\Navigator.cpp" 3036 > 3037 </File> 3038 <File 3039 RelativePath="..\page\Navigator.h" 3040 > 3041 </File> 3042 <File 2995 3043 RelativePath="..\page\Page.cpp" 2996 >2997 </File>2998 <File2999 RelativePath="..\page\Page.h"3000 3044 > 3001 3045 </File> … … 9474 9518 </File> 9475 9519 <File 9520 RelativePath="..\bindings\js\JSMimeTypeArrayCustom.cpp" 9521 > 9522 </File> 9523 <File 9476 9524 RelativePath="..\bindings\js\JSNamedNodeMapCustom.cpp" 9477 9525 > … … 9486 9534 </File> 9487 9535 <File 9536 RelativePath="..\bindings\js\JSNavigatorCustom.cpp" 9537 > 9538 </File> 9539 <File 9488 9540 RelativePath="..\bindings\js\JSNodeCustom.cpp" 9489 9541 > … … 9518 9570 </File> 9519 9571 <File 9572 RelativePath="..\bindings\js\JSPluginArrayCustom.cpp" 9573 > 9574 </File> 9575 <File 9576 RelativePath="..\bindings\js\JSPluginCustom.cpp" 9577 > 9578 </File> 9579 <File 9520 9580 RelativePath="..\bindings\js\JSSQLResultSetRowListCustom.cpp" 9521 9581 > … … 9615 9675 <File 9616 9676 RelativePath="..\bindings\js\kjs_html.h" 9617 >9618 </File>9619 <File9620 RelativePath="..\bindings\js\kjs_navigator.cpp"9621 >9622 </File>9623 <File9624 RelativePath="..\bindings\js\kjs_navigator.h"9625 9677 > 9626 9678 </File> … … 9655 9707 > 9656 9708 <File 9709 RelativePath="..\plugins\MimeType.cpp" 9710 > 9711 </File> 9712 <File 9713 RelativePath="..\plugins\MimeType.h" 9714 > 9715 </File> 9716 <File 9717 RelativePath="..\plugins\MimeTypeArray.cpp" 9718 > 9719 </File> 9720 <File 9721 RelativePath="..\plugins\MimeTypeArray.h" 9722 > 9723 </File> 9724 <File 9657 9725 RelativePath="..\plugins\npapi.cpp" 9658 9726 > … … 9660 9728 <File 9661 9729 RelativePath="..\plugins\npfunctions.h" 9730 > 9731 </File> 9732 <File 9733 RelativePath="..\plugins\Plugin.cpp" 9734 > 9735 </File> 9736 <File 9737 RelativePath="..\plugins\Plugin.h" 9738 > 9739 </File> 9740 <File 9741 RelativePath="..\plugins\PluginArray.cpp" 9742 > 9743 </File> 9744 <File 9745 RelativePath="..\plugins\PluginArray.h" 9746 > 9747 </File> 9748 <File 9749 RelativePath="..\plugins\PluginData.cpp" 9750 > 9751 </File> 9752 <File 9753 RelativePath="..\plugins\PluginData.h" 9662 9754 > 9663 9755 </File> … … 9711 9803 <File 9712 9804 RelativePath="..\plugins\win\PluginDatabaseWin.cpp" 9805 > 9806 </File> 9807 <File 9808 RelativePath="..\plugins\win\PluginDataWin.cpp" 9713 9809 > 9714 9810 </File> -
trunk/WebCore/WebCore.xcodeproj/project.pbxproj
r30897 r30923 560 560 65CBFEF90974F607001DAC25 /* FrameView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65CBFEF70974F607001DAC25 /* FrameView.cpp */; }; 561 561 65CBFEFA0974F607001DAC25 /* FrameView.h in Headers */ = {isa = PBXBuildFile; fileRef = 65CBFEF80974F607001DAC25 /* FrameView.h */; settings = {ATTRIBUTES = (Private, ); }; }; 562 65D1C1CA09932B22000CB324 /* Plugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 65D1C1C909932B22000CB324 /* Plugin.h */; };563 562 65DF31DA09D1C123000BE325 /* JSAttr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65DF31D809D1C122000BE325 /* JSAttr.cpp */; }; 564 563 65DF31DB09D1C123000BE325 /* JSAttr.h in Headers */ = {isa = PBXBuildFile; fileRef = 65DF31D909D1C123000BE325 /* JSAttr.h */; }; … … 1640 1639 93B70D6B09EB0C7C009D8468 /* kjs_html.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B70D4F09EB0C7C009D8468 /* kjs_html.cpp */; }; 1641 1640 93B70D6C09EB0C7C009D8468 /* kjs_html.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B70D5009EB0C7C009D8468 /* kjs_html.h */; }; 1642 93B70D6D09EB0C7C009D8468 /* kjs_navigator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B70D5109EB0C7C009D8468 /* kjs_navigator.cpp */; };1643 93B70D6E09EB0C7C009D8468 /* kjs_navigator.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B70D5209EB0C7C009D8468 /* kjs_navigator.h */; };1644 1641 93B70D6F09EB0C7C009D8468 /* kjs_proxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B70D5309EB0C7C009D8468 /* kjs_proxy.cpp */; }; 1645 1642 93B70D7009EB0C7C009D8468 /* kjs_proxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B70D5409EB0C7C009D8468 /* kjs_proxy.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 2044 2041 A81872240977D3C0005826D9 /* NameNodeList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A81872190977D3C0005826D9 /* NameNodeList.cpp */; }; 2045 2042 A81872250977D3C0005826D9 /* ChildNodeList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A818721A0977D3C0005826D9 /* ChildNodeList.cpp */; }; 2046 A82398A809B3ACF500B60641 /* PlugInInfoStoreMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A82398A709B3ACF500B60641 /* PlugInInfoStoreMac.mm */; };2047 2043 A8239E0009B3CF8A00B60641 /* Logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8239DFE09B3CF8A00B60641 /* Logging.cpp */; }; 2048 2044 A8239E0109B3CF8A00B60641 /* Logging.h in Headers */ = {isa = PBXBuildFile; fileRef = A8239DFF09B3CF8A00B60641 /* Logging.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 2575 2571 A8F4FB940C169E7B002AFED5 /* SVGRenderSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = A8F4FB930C169E7B002AFED5 /* SVGRenderSupport.h */; }; 2576 2572 A8F4FB960C169E85002AFED5 /* SVGRenderSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8F4FB950C169E85002AFED5 /* SVGRenderSupport.cpp */; }; 2573 A9C6E4E30D745E05006442E9 /* MimeType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9C6E4E10D745E05006442E9 /* MimeType.cpp */; }; 2574 A9C6E4E40D745E05006442E9 /* MimeType.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C6E4E20D745E05006442E9 /* MimeType.h */; }; 2575 A9C6E4E70D745E18006442E9 /* MimeTypeArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9C6E4E50D745E18006442E9 /* MimeTypeArray.cpp */; }; 2576 A9C6E4E80D745E18006442E9 /* MimeTypeArray.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C6E4E60D745E18006442E9 /* MimeTypeArray.h */; }; 2577 A9C6E4EB0D745E2B006442E9 /* Plugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9C6E4E90D745E2B006442E9 /* Plugin.cpp */; }; 2578 A9C6E4EC0D745E2B006442E9 /* Plugin.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C6E4EA0D745E2B006442E9 /* Plugin.h */; }; 2579 A9C6E4EF0D745E38006442E9 /* PluginArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9C6E4ED0D745E38006442E9 /* PluginArray.cpp */; }; 2580 A9C6E4F00D745E38006442E9 /* PluginArray.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C6E4EE0D745E38006442E9 /* PluginArray.h */; }; 2581 A9C6E4F30D745E48006442E9 /* PluginData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9C6E4F10D745E48006442E9 /* PluginData.cpp */; }; 2582 A9C6E4F40D745E48006442E9 /* PluginData.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C6E4F20D745E48006442E9 /* PluginData.h */; }; 2583 A9C6E4F60D745E61006442E9 /* PluginDataMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9C6E4F50D745E61006442E9 /* PluginDataMac.mm */; }; 2584 A9C6E5A50D746458006442E9 /* Navigator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9C6E5A30D746458006442E9 /* Navigator.cpp */; }; 2585 A9C6E5A60D746458006442E9 /* Navigator.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C6E5A40D746458006442E9 /* Navigator.h */; }; 2586 A9C6E6470D7465CA006442E9 /* JSMimeTypeArrayCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9C6E6460D7465CA006442E9 /* JSMimeTypeArrayCustom.cpp */; }; 2587 A9C6E6490D7465D8006442E9 /* JSNavigatorCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9C6E6480D7465D8006442E9 /* JSNavigatorCustom.cpp */; }; 2588 A9C6E64C0D7465E7006442E9 /* JSPluginArrayCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9C6E64A0D7465E7006442E9 /* JSPluginArrayCustom.cpp */; }; 2589 A9C6E64D0D7465E7006442E9 /* JSPluginCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9C6E64B0D7465E7006442E9 /* JSPluginCustom.cpp */; }; 2590 A9D247F70D757E3400FDF959 /* JSNavigator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9D247F50D757E3300FDF959 /* JSNavigator.cpp */; }; 2591 A9D247F80D757E3400FDF959 /* JSNavigator.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D247F60D757E3300FDF959 /* JSNavigator.h */; }; 2592 A9D247FE0D757E6900FDF959 /* JSPlugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9D247FA0D757E6900FDF959 /* JSPlugin.cpp */; }; 2593 A9D247FF0D757E6900FDF959 /* JSPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D247FB0D757E6900FDF959 /* JSPlugin.h */; }; 2594 A9D248000D757E6900FDF959 /* JSPluginArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9D247FC0D757E6900FDF959 /* JSPluginArray.cpp */; }; 2595 A9D248010D757E6900FDF959 /* JSPluginArray.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D247FD0D757E6900FDF959 /* JSPluginArray.h */; }; 2596 A9D248060D757E7D00FDF959 /* JSMimeType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9D248020D757E7D00FDF959 /* JSMimeType.cpp */; }; 2597 A9D248070D757E7D00FDF959 /* JSMimeType.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D248030D757E7D00FDF959 /* JSMimeType.h */; }; 2598 A9D248080D757E7D00FDF959 /* JSMimeTypeArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9D248040D757E7D00FDF959 /* JSMimeTypeArray.cpp */; }; 2599 A9D248090D757E7D00FDF959 /* JSMimeTypeArray.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D248050D757E7D00FDF959 /* JSMimeTypeArray.h */; }; 2577 2600 AA0972CC0B6947A800A705E9 /* SVGInlineTextBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA0972CA0B6947A800A705E9 /* SVGInlineTextBox.cpp */; }; 2578 2601 AA0972CD0B6947A800A705E9 /* SVGInlineTextBox.h in Headers */ = {isa = PBXBuildFile; fileRef = AA0972CB0B6947A800A705E9 /* SVGInlineTextBox.h */; }; … … 4897 4920 65CBFEF70974F607001DAC25 /* FrameView.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FrameView.cpp; sourceTree = "<group>"; }; 4898 4921 65CBFEF80974F607001DAC25 /* FrameView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FrameView.h; sourceTree = "<group>"; }; 4899 65D1C1C909932B22000CB324 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Plugin.h; sourceTree = "<group>"; };4900 4922 65DF31D809D1C122000BE325 /* JSAttr.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSAttr.cpp; sourceTree = "<group>"; }; 4901 4923 65DF31D909D1C123000BE325 /* JSAttr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSAttr.h; sourceTree = "<group>"; }; … … 5927 5949 93B70D4F09EB0C7C009D8468 /* kjs_html.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = kjs_html.cpp; sourceTree = "<group>"; }; 5928 5950 93B70D5009EB0C7C009D8468 /* kjs_html.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = kjs_html.h; sourceTree = "<group>"; }; 5929 93B70D5109EB0C7C009D8468 /* kjs_navigator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = kjs_navigator.cpp; sourceTree = "<group>"; };5930 93B70D5209EB0C7C009D8468 /* kjs_navigator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = kjs_navigator.h; sourceTree = "<group>"; };5931 5951 93B70D5309EB0C7C009D8468 /* kjs_proxy.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = kjs_proxy.cpp; sourceTree = "<group>"; }; 5932 5952 93B70D5409EB0C7C009D8468 /* kjs_proxy.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = kjs_proxy.h; sourceTree = "<group>"; }; … … 6165 6185 A81872190977D3C0005826D9 /* NameNodeList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = NameNodeList.cpp; sourceTree = "<group>"; }; 6166 6186 A818721A0977D3C0005826D9 /* ChildNodeList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ChildNodeList.cpp; sourceTree = "<group>"; }; 6167 A82398A709B3ACF500B60641 /* PlugInInfoStoreMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = PlugInInfoStoreMac.mm; sourceTree = "<group>"; };6168 6187 A8239DFE09B3CF8A00B60641 /* Logging.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Logging.cpp; sourceTree = "<group>"; }; 6169 6188 A8239DFF09B3CF8A00B60641 /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Logging.h; sourceTree = "<group>"; }; … … 6569 6588 A8F4FB930C169E7B002AFED5 /* SVGRenderSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGRenderSupport.h; sourceTree = "<group>"; }; 6570 6589 A8F4FB950C169E85002AFED5 /* SVGRenderSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGRenderSupport.cpp; sourceTree = "<group>"; }; 6590 A9C6E4E10D745E05006442E9 /* MimeType.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MimeType.cpp; sourceTree = "<group>"; }; 6591 A9C6E4E20D745E05006442E9 /* MimeType.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MimeType.h; sourceTree = "<group>"; }; 6592 A9C6E4E50D745E18006442E9 /* MimeTypeArray.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MimeTypeArray.cpp; sourceTree = "<group>"; }; 6593 A9C6E4E60D745E18006442E9 /* MimeTypeArray.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MimeTypeArray.h; sourceTree = "<group>"; }; 6594 A9C6E4E90D745E2B006442E9 /* Plugin.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Plugin.cpp; sourceTree = "<group>"; }; 6595 A9C6E4EA0D745E2B006442E9 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Plugin.h; sourceTree = "<group>"; }; 6596 A9C6E4ED0D745E38006442E9 /* PluginArray.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PluginArray.cpp; sourceTree = "<group>"; }; 6597 A9C6E4EE0D745E38006442E9 /* PluginArray.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PluginArray.h; sourceTree = "<group>"; }; 6598 A9C6E4F10D745E48006442E9 /* PluginData.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PluginData.cpp; sourceTree = "<group>"; }; 6599 A9C6E4F20D745E48006442E9 /* PluginData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PluginData.h; sourceTree = "<group>"; }; 6600 A9C6E4F50D745E61006442E9 /* PluginDataMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = PluginDataMac.mm; path = mac/PluginDataMac.mm; sourceTree = "<group>"; }; 6601 A9C6E5A30D746458006442E9 /* Navigator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Navigator.cpp; sourceTree = "<group>"; }; 6602 A9C6E5A40D746458006442E9 /* Navigator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Navigator.h; sourceTree = "<group>"; }; 6603 A9C6E6460D7465CA006442E9 /* JSMimeTypeArrayCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSMimeTypeArrayCustom.cpp; sourceTree = "<group>"; }; 6604 A9C6E6480D7465D8006442E9 /* JSNavigatorCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSNavigatorCustom.cpp; sourceTree = "<group>"; }; 6605 A9C6E64A0D7465E7006442E9 /* JSPluginArrayCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSPluginArrayCustom.cpp; sourceTree = "<group>"; }; 6606 A9C6E64B0D7465E7006442E9 /* JSPluginCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSPluginCustom.cpp; sourceTree = "<group>"; }; 6607 A9C6E65D0D746694006442E9 /* Navigator.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Navigator.idl; sourceTree = "<group>"; }; 6608 A9C6E65E0D7466F2006442E9 /* MimeType.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = MimeType.idl; sourceTree = "<group>"; }; 6609 A9C6E65F0D746700006442E9 /* MimeTypeArray.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = MimeTypeArray.idl; sourceTree = "<group>"; }; 6610 A9C6E6600D74670C006442E9 /* Plugin.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Plugin.idl; sourceTree = "<group>"; }; 6611 A9C6E6610D74671E006442E9 /* PluginArray.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = PluginArray.idl; sourceTree = "<group>"; }; 6612 A9D247F50D757E3300FDF959 /* JSNavigator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSNavigator.cpp; sourceTree = "<group>"; }; 6613 A9D247F60D757E3300FDF959 /* JSNavigator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSNavigator.h; sourceTree = "<group>"; }; 6614 A9D247FA0D757E6900FDF959 /* JSPlugin.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSPlugin.cpp; sourceTree = "<group>"; }; 6615 A9D247FB0D757E6900FDF959 /* JSPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSPlugin.h; sourceTree = "<group>"; }; 6616 A9D247FC0D757E6900FDF959 /* JSPluginArray.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSPluginArray.cpp; sourceTree = "<group>"; }; 6617 A9D247FD0D757E6900FDF959 /* JSPluginArray.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSPluginArray.h; sourceTree = "<group>"; }; 6618 A9D248020D757E7D00FDF959 /* JSMimeType.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSMimeType.cpp; sourceTree = "<group>"; }; 6619 A9D248030D757E7D00FDF959 /* JSMimeType.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSMimeType.h; sourceTree = "<group>"; }; 6620 A9D248040D757E7D00FDF959 /* JSMimeTypeArray.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSMimeTypeArray.cpp; sourceTree = "<group>"; }; 6621 A9D248050D757E7D00FDF959 /* JSMimeTypeArray.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSMimeTypeArray.h; sourceTree = "<group>"; }; 6571 6622 AA0972CA0B6947A800A705E9 /* SVGInlineTextBox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGInlineTextBox.cpp; sourceTree = "<group>"; }; 6572 6623 AA0972CB0B6947A800A705E9 /* SVGInlineTextBox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGInlineTextBox.h; sourceTree = "<group>"; }; … … 8172 8223 A83B79220CCB00F0000B0825 /* XML */, 8173 8224 A83B790C0CCAFF83000B0825 /* XPath */, 8225 A9D247F90D757E4100FDF959 /* Plugins */, 8174 8226 ); 8175 8227 name = "Derived Sources"; … … 8403 8455 isa = PBXGroup; 8404 8456 children = ( 8457 A9C6E6610D74671E006442E9 /* PluginArray.idl */, 8458 A9C6E6600D74670C006442E9 /* Plugin.idl */, 8459 A9C6E65F0D746700006442E9 /* MimeTypeArray.idl */, 8460 A9C6E65E0D7466F2006442E9 /* MimeType.idl */, 8461 A9C6E4F50D745E61006442E9 /* PluginDataMac.mm */, 8462 A9C6E4F10D745E48006442E9 /* PluginData.cpp */, 8463 A9C6E4F20D745E48006442E9 /* PluginData.h */, 8464 A9C6E4ED0D745E38006442E9 /* PluginArray.cpp */, 8465 A9C6E4EE0D745E38006442E9 /* PluginArray.h */, 8466 A9C6E4E90D745E2B006442E9 /* Plugin.cpp */, 8467 A9C6E4EA0D745E2B006442E9 /* Plugin.h */, 8468 A9C6E4E50D745E18006442E9 /* MimeTypeArray.cpp */, 8469 A9C6E4E60D745E18006442E9 /* MimeTypeArray.h */, 8470 A9C6E4E10D745E05006442E9 /* MimeType.cpp */, 8471 A9C6E4E20D745E05006442E9 /* MimeType.h */, 8405 8472 5DCF836C0D59159800953BC6 /* PluginInfoStore.h */, 8406 8473 ); … … 8528 8595 BC3FCAA80AC3DB5800BA54AD /* PlatformScrollBar.h */, 8529 8596 BC7B2AF90450824100A8000F /* PlatformScrollBarMac.mm */, 8530 A82398A709B3ACF500B60641 /* PlugInInfoStoreMac.mm */,8531 8597 0668E18E0ADD9640004128E0 /* PopupMenuMac.mm */, 8532 8598 1CE24F960D7CAF0E007E04C2 /* SchedulePairMac.mm */, … … 8564 8630 isa = PBXGroup; 8565 8631 children = ( 8632 A9C6E65D0D746694006442E9 /* Navigator.idl */, 8633 A9C6E5A30D746458006442E9 /* Navigator.cpp */, 8634 A9C6E5A40D746458006442E9 /* Navigator.h */, 8566 8635 06693F450BFBC91600216072 /* inspector */, 8567 8636 93C09A820B064F05005ABD4D /* mac */, … … 10787 10856 sourceTree = "<group>"; 10788 10857 }; 10858 A9D247F90D757E4100FDF959 /* Plugins */ = { 10859 isa = PBXGroup; 10860 children = ( 10861 A9D248020D757E7D00FDF959 /* JSMimeType.cpp */, 10862 A9D248030D757E7D00FDF959 /* JSMimeType.h */, 10863 A9D248040D757E7D00FDF959 /* JSMimeTypeArray.cpp */, 10864 A9D248050D757E7D00FDF959 /* JSMimeTypeArray.h */, 10865 A9D247FA0D757E6900FDF959 /* JSPlugin.cpp */, 10866 A9D247FB0D757E6900FDF959 /* JSPlugin.h */, 10867 A9D247FC0D757E6900FDF959 /* JSPluginArray.cpp */, 10868 A9D247FD0D757E6900FDF959 /* JSPluginArray.h */, 10869 ); 10870 name = Plugins; 10871 sourceTree = "<group>"; 10872 }; 10789 10873 B22277CA0D00BF1E0071B782 /* svg */ = { 10790 10874 isa = PBXGroup; … … 11653 11737 93B70D4F09EB0C7C009D8468 /* kjs_html.cpp */, 11654 11738 93B70D5009EB0C7C009D8468 /* kjs_html.h */, 11655 93B70D5109EB0C7C009D8468 /* kjs_navigator.cpp */,11656 93B70D5209EB0C7C009D8468 /* kjs_navigator.h */,11657 11739 93B70D5309EB0C7C009D8468 /* kjs_proxy.cpp */, 11658 11740 93B70D5409EB0C7C009D8468 /* kjs_proxy.h */, … … 11710 11792 isa = PBXGroup; 11711 11793 children = ( 11794 A9C6E64A0D7465E7006442E9 /* JSPluginArrayCustom.cpp */, 11795 A9C6E64B0D7465E7006442E9 /* JSPluginCustom.cpp */, 11796 A9C6E6480D7465D8006442E9 /* JSNavigatorCustom.cpp */, 11797 A9C6E6460D7465CA006442E9 /* JSMimeTypeArrayCustom.cpp */, 11798 A766F3520D6BDE3500ABDDB3 /* JSCanvasPixelArrayCustom.cpp */, 11712 11799 BC2ED6BB0C6BD2F000920BFF /* JSAttrCustom.cpp */, 11713 11800 A766F3520D6BDE3500ABDDB3 /* JSCanvasPixelArrayCustom.cpp */, … … 11772 11859 BC98543B0CD3D98B00069BC1 /* JSConsole.cpp */, 11773 11860 BC98543C0CD3D98B00069BC1 /* JSConsole.h */, 11861 A9D247F50D757E3300FDF959 /* JSNavigator.cpp */, 11862 A9D247F60D757E3300FDF959 /* JSNavigator.h */, 11774 11863 BC5A86B30C3367E800EEA649 /* JSDOMSelection.cpp */, 11775 11864 BC5A86B40C3367E800EEA649 /* JSDOMSelection.h */, … … 13917 14006 B2C3DA2B0D006C1D00EF6F26 /* PlatformString.h in Headers */, 13918 14007 935C476B09AC4D4F00A6AAB4 /* PlatformWheelEvent.h in Headers */, 13919 65D1C1CA09932B22000CB324 /* Plugin.h in Headers */,13920 14008 1AC694C80A3B1676003F5049 /* PluginDocument.h in Headers */, 13921 14009 B2B1F7170D00CAA8004AEA64 /* PointerEventsHitRules.h in Headers */, … … 14345 14433 93B70D6A09EB0C7C009D8468 /* kjs_events.h in Headers */, 14346 14434 93B70D6C09EB0C7C009D8468 /* kjs_html.h in Headers */, 14347 93B70D6E09EB0C7C009D8468 /* kjs_navigator.h in Headers */,14348 14435 656581F509D1508D000E61D7 /* kjs_navigator.lut.h in Headers */, 14349 14436 93B70D7009EB0C7C009D8468 /* kjs_proxy.h in Headers */, … … 14446 14533 C02B14C20D81E02A00D8A970 /* JavaScriptDebugListener.h in Headers */, 14447 14534 C02B14C40D81E02A00D8A970 /* JavaScriptDebugServer.h in Headers */, 14535 A9C6E4E40D745E05006442E9 /* MimeType.h in Headers */, 14536 A9C6E4E80D745E18006442E9 /* MimeTypeArray.h in Headers */, 14537 A9C6E4EC0D745E2B006442E9 /* Plugin.h in Headers */, 14538 A9C6E4F00D745E38006442E9 /* PluginArray.h in Headers */, 14539 A9C6E4F40D745E48006442E9 /* PluginData.h in Headers */, 14540 A9C6E5A60D746458006442E9 /* Navigator.h in Headers */, 14541 A9D247F80D757E3400FDF959 /* JSNavigator.h in Headers */, 14542 A9D247FF0D757E6900FDF959 /* JSPlugin.h in Headers */, 14543 A9D248010D757E6900FDF959 /* JSPluginArray.h in Headers */, 14544 A9D248070D757E7D00FDF959 /* JSMimeType.h in Headers */, 14545 A9D248090D757E7D00FDF959 /* JSMimeTypeArray.h in Headers */, 14448 14546 ); 14449 14547 runOnlyForDeploymentPostprocessing = 0; … … 15561 15659 BC94D1080C274F88006BC617 /* PlatformScreenMac.mm in Sources */, 15562 15660 93F19ADC08245E59001E9ABC /* PlatformScrollBarMac.mm in Sources */, 15563 A82398A809B3ACF500B60641 /* PlugInInfoStoreMac.mm in Sources */,15564 15661 1AC694C70A3B1676003F5049 /* PluginDocument.cpp in Sources */, 15565 15662 B2B1F7160D00CAA8004AEA64 /* PointerEventsHitRules.cpp in Sources */, … … 15984 16081 93B70D6909EB0C7C009D8468 /* kjs_events.cpp in Sources */, 15985 16082 93B70D6B09EB0C7C009D8468 /* kjs_html.cpp in Sources */, 15986 93B70D6D09EB0C7C009D8468 /* kjs_navigator.cpp in Sources */,15987 16083 93B70D6F09EB0C7C009D8468 /* kjs_proxy.cpp in Sources */, 15988 16084 BCB16C2C0979C3BD00467741 /* loader.cpp in Sources */, … … 16068 16164 BC6932730D7E293900AE44D1 /* JSDOMWindowBase.cpp in Sources */, 16069 16165 C02B14C30D81E02A00D8A970 /* JavaScriptDebugServer.cpp in Sources */, 16166 A9C6E4E30D745E05006442E9 /* MimeType.cpp in Sources */, 16167 A9C6E4E70D745E18006442E9 /* MimeTypeArray.cpp in Sources */, 16168 A9C6E4EB0D745E2B006442E9 /* Plugin.cpp in Sources */, 16169 A9C6E4EF0D745E38006442E9 /* PluginArray.cpp in Sources */, 16170 A9C6E4F30D745E48006442E9 /* PluginData.cpp in Sources */, 16171 A9C6E4F60D745E61006442E9 /* PluginDataMac.mm in Sources */, 16172 A9C6E5A50D746458006442E9 /* Navigator.cpp in Sources */, 16173 A9C6E6470D7465CA006442E9 /* JSMimeTypeArrayCustom.cpp in Sources */, 16174 A9C6E6490D7465D8006442E9 /* JSNavigatorCustom.cpp in Sources */, 16175 A9C6E64C0D7465E7006442E9 /* JSPluginArrayCustom.cpp in Sources */, 16176 A9C6E64D0D7465E7006442E9 /* JSPluginCustom.cpp in Sources */, 16177 A9D247F70D757E3400FDF959 /* JSNavigator.cpp in Sources */, 16178 A9D247FE0D757E6900FDF959 /* JSPlugin.cpp in Sources */, 16179 A9D248000D757E6900FDF959 /* JSPluginArray.cpp in Sources */, 16180 A9D248060D757E7D00FDF959 /* JSMimeType.cpp in Sources */, 16181 A9D248080D757E7D00FDF959 /* JSMimeTypeArray.cpp in Sources */, 16070 16182 ); 16071 16183 runOnlyForDeploymentPostprocessing = 0; -
trunk/WebCore/bindings/js/JSDOMWindowBase.cpp
r30787 r30923 61 61 #include "htmlediting.h" 62 62 #include "kjs_events.h" 63 #include "kjs_navigator.h"64 63 #include "kjs_proxy.h" 65 64 #include <wtf/AlwaysInline.h> … … 162 161 event WebCore::JSDOMWindowBase::Event_ DontDelete 163 162 location WebCore::JSDOMWindowBase::Location_ DontDelete 164 navigator WebCore::JSDOMWindowBase::Navigator_ DontDelete165 clientInformation WebCore::JSDOMWindowBase::ClientInformation DontDelete166 163 # -- Event Listeners -- 167 164 onabort WebCore::JSDOMWindowBase::Onabort DontDelete … … 454 451 case Location_: 455 452 return location(); 456 case Navigator_:457 case ClientInformation: {458 if (!allowsAccessFrom(exec))459 return jsUndefined();460 // Store the navigator in the object so we get the same one each time.461 Navigator* n = new Navigator(exec->lexicalGlobalObject()->objectPrototype(), impl()->frame());462 // FIXME: this will make the "navigator" object accessible from windows that fail463 // the security check the first time, but not subsequent times, seems weird.464 const_cast<JSDOMWindowBase*>(this)->putDirect("navigator", n, DontDelete);465 const_cast<JSDOMWindowBase*>(this)->putDirect("clientInformation", n, DontDelete);466 return n;467 }468 453 case Image: 469 454 if (!allowsAccessFrom(exec)) -
trunk/WebCore/dom/Clipboard.cpp
r30735 r30923 31 31 #include "FrameLoader.h" 32 32 #include "Image.h" 33 #include "PluginInfoStore.h"34 33 35 34 namespace WebCore { -
trunk/WebCore/dom/DOMImplementation.cpp
r30490 r30923 39 39 #include "MIMETypeRegistry.h" 40 40 #include "Page.h" 41 #include "PluginData.h" 41 42 #include "PluginDocument.h" 42 #include "PluginInfoStore.h"43 43 #include "RegularExpression.h" 44 44 #include "Settings.h" … … 367 367 #endif 368 368 369 PluginData* pluginData = 0; 370 if (frame && frame->page()) 371 pluginData = frame->page()->pluginData(); 372 369 373 // PDF is one image type for which a plugin can override built-in support. 370 374 // We do not want QuickTime to take over all image types, obviously. 371 if ((type == "application/pdf" || type == "text/pdf") && PluginInfoStore::supportsMIMEType(type))375 if ((type == "application/pdf" || type == "text/pdf") && pluginData && pluginData->supportsMimeType(type)) 372 376 return new PluginDocument(this, frame); 373 377 if (Image::supportsType(type)) … … 376 380 // Disallowing plug-ins to use text/plain prevents plug-ins from hijacking a fundamental type that the browser is expected to handle, 377 381 // and also serves as an optimization to prevent loading the plug-in database in the common case. 378 if (type != "text/plain" && PluginInfoStore::supportsMIMEType(type))382 if (type != "text/plain" && pluginData && pluginData->supportsMimeType(type)) 379 383 return new PluginDocument(this, frame); 380 384 if (isTextMIMEType(type)) -
trunk/WebCore/loader/FrameLoader.cpp
r30890 r30923 68 68 #include "PageCache.h" 69 69 #include "PageGroup.h" 70 #include "Plugin InfoStore.h"70 #include "PluginData.h" 71 71 #include "ProgressTracker.h" 72 72 #include "RenderPart.h" … … 1597 1597 // Allow other plug-ins to win over QuickTime because if the user has installed a plug-in that 1598 1598 // can handle TIFF (which QuickTime can also handle) they probably intended to override QT. 1599 if ( (mimeType == "image/tiff" || mimeType == "image/tif" || mimeType == "image/x-tiff")) {1600 String pluginName = PluginInfoStore::pluginNameForMIMEType(mimeType);1599 if (m_frame->page() && (mimeType == "image/tiff" || mimeType == "image/tif" || mimeType == "image/x-tiff")) { 1600 String pluginName = m_frame->page()->pluginData()->pluginNameForMimeType(mimeType); 1601 1601 if (!pluginName.isEmpty() && !pluginName.contains("QuickTime", false)) 1602 1602 return true; -
trunk/WebCore/page/DOMWindow.cpp
r30434 r30923 43 43 #include "History.h" 44 44 #include "MessageEvent.h" 45 #include "Navigator.h" 45 46 #include "Page.h" 46 47 #include "PlatformScreen.h" … … 155 156 m_console->disconnectFrame(); 156 157 m_console = 0; 158 159 if (m_navigator) 160 m_navigator->disconnectFrame(); 161 m_navigator = 0; 157 162 } 158 163 … … 218 223 m_console = Console::create(m_frame); 219 224 return m_console.get(); 225 } 226 227 Navigator* DOMWindow::navigator() const 228 { 229 if (!m_navigator) 230 m_navigator = Navigator::create(m_frame); 231 return m_navigator.get(); 220 232 } 221 233 -
trunk/WebCore/page/DOMWindow.h
r30434 r30923 45 45 class Frame; 46 46 class History; 47 class Navigator; 47 48 class Screen; 48 49 … … 70 71 BarInfo* statusbar() const; 71 72 BarInfo* toolbar() const; 73 Navigator* navigator() const; 74 Navigator* clientInformation() const { return navigator(); } 72 75 73 76 DOMSelection* getSelection(); … … 171 174 mutable RefPtr<BarInfo> m_toolbar; 172 175 mutable RefPtr<Console> m_console; 176 mutable RefPtr<Navigator> m_navigator; 173 177 }; 174 178 -
trunk/WebCore/page/DOMWindow.idl
r30735 r30923 45 45 attribute [Replaceable] BarInfo statusbar; 46 46 attribute [Replaceable] BarInfo toolbar; 47 attribute [Replaceable] Navigator navigator; 48 attribute [Replaceable] Navigator clientInformation; 47 49 48 50 DOMSelection getSelection(); -
trunk/WebCore/page/DragController.cpp
r30015 r30923 52 52 #include "Node.h" 53 53 #include "Page.h" 54 #include "PluginInfoStore.h"55 54 #include "RenderFileUploadControl.h" 56 55 #include "RenderImage.h" -
trunk/WebCore/page/Frame.cpp
r30897 r30923 56 56 #include "Logging.h" 57 57 #include "MediaFeatureNames.h" 58 #include "Navigator.h" 58 59 #include "NodeList.h" 59 60 #include "Page.h" -
trunk/WebCore/page/Frame.h
r30900 r30923 100 100 class Node; 101 101 class Page; 102 class PluginData; 102 103 class Range; 103 104 class RegularExpression; -
trunk/WebCore/page/Page.cpp
r30874 r30923 26 26 #include "ContextMenuController.h" 27 27 #include "EditorClient.h" 28 #include "DOMWindow.h" 28 29 #include "DragController.h" 29 30 #include "FileSystem.h" … … 37 38 #include "JavaScriptDebugServer.h" 38 39 #include "Logging.h" 40 #include "Navigator.h" 39 41 #include "PageGroup.h" 42 #include "PluginData.h" 40 43 #include "ProgressTracker.h" 41 44 #include "RenderWidget.h" … … 220 223 } 221 224 225 void Page::refreshPlugins(bool reload) 226 { 227 if (!allPages) 228 return; 229 230 PluginData::refresh(); 231 232 Vector<RefPtr<Frame> > framesNeedingReload; 233 234 HashSet<Page*>::iterator end = allPages->end(); 235 for (HashSet<Page*>::iterator it = allPages->begin(); it != end; ++it) { 236 (*it)->m_pluginData = 0; 237 238 if (reload) { 239 for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext()) { 240 if (frame->loader()->containsPlugins()) 241 framesNeedingReload.append(frame); 242 } 243 } 244 } 245 246 for (size_t i = 0; i < framesNeedingReload.size(); ++i) 247 framesNeedingReload[i]->loader()->reload(); 248 } 249 250 PluginData* Page::pluginData() const 251 { 252 if (!m_pluginData) 253 m_pluginData = PluginData::create(this); 254 return m_pluginData.get(); 255 } 256 222 257 static Frame* incrementFrame(Frame* curr, bool forward, bool wrapFlag) 223 258 { -
trunk/WebCore/page/Page.h
r30840 r30923 57 57 class Node; 58 58 class PageGroup; 59 class PluginData; 59 60 class ProgressTracker; 60 61 class Selection; … … 73 74 ~Page(); 74 75 76 static void refreshPlugins(bool reload); 77 PluginData* pluginData() const; 78 75 79 EditorClient* editorClient() const { return m_editorClient; } 76 80 … … 166 170 RefPtr<Node> m_focusedNode; 167 171 172 mutable RefPtr<PluginData> m_pluginData; 173 168 174 EditorClient* m_editorClient; 169 175 -
trunk/WebCore/page/mac/FrameMac.mm
r30900 r30923 70 70 #import "PlatformScrollBar.h" 71 71 #import "PlatformWheelEvent.h" 72 #import "Plugin.h"73 72 #import "RegularExpression.h" 74 73 #import "RenderImage.h" -
trunk/WebCore/page/mac/WebCoreFrameBridge.mm
r30816 r30923 65 65 #import "PlatformMouseEvent.h" 66 66 #import "PlatformScreen.h" 67 #import "Plugin InfoStore.h"67 #import "PluginData.h" 68 68 #import "RenderImage.h" 69 69 #import "RenderPart.h" … … 1153 1153 if (WebCore::DOMImplementation::isTextMIMEType(mimeType) || 1154 1154 Image::supportsType(mimeType) || 1155 PluginInfoStore::supportsMIMEType(mimeType))1155 (m_frame->page() && m_frame->page()->pluginData()->supportsMimeType(mimeType))) 1156 1156 return NO; 1157 1157 -
trunk/WebCore/page/mac/WebCoreViewFactory.h
r30168 r30923 36 36 37 37 - (NSArray *)pluginsInfo; // array of id <WebCorePluginInfo> 38 - (void)refreshPlugins:(BOOL)reloadPages; 39 - (NSString *)pluginNameForMIMEType:(NSString *)MIMEType; 40 - (BOOL)pluginSupportsMIMEType:(NSString *)MIMEType; 38 - (void)refreshPlugins; 41 39 42 40 - (NSString *)inputElementAltText; -
trunk/WebCore/page/qt/FrameQt.cpp
r30788 r30923 49 49 #include "Document.h" 50 50 #include "Settings.h" 51 #include "Plugin.h"52 51 #include "FrameView.h" 53 52 #include "FramePrivate.h" -
trunk/WebCore/page/win/FrameWin.cpp
r30787 r30923 46 46 #include "NotImplemented.h" 47 47 #include "Page.h" 48 #include "Plugin.h"49 48 #include "PluginDatabase.h" 50 49 #include "PluginView.h" -
trunk/WebCore/platform/gtk/TemporaryLinkStubs.cpp
r30840 r30923 36 36 #include "PluginDatabase.h" 37 37 #include "PluginPackage.h" 38 #include "PluginData.h" 38 39 #include "SharedBuffer.h" 39 40 … … 78 79 79 80 PassRefPtr<SharedBuffer> SharedBuffer::createWithContentsOfFile(const String&) { notImplemented(); return 0; } 81 82 void PluginData::initPlugins() { notImplemented(); } 83 void PluginData::refresh() { notImplemented(); } 84 80 85 } 81 86 -
trunk/WebCore/platform/qt/MIMETypeRegistryQt.cpp
r29663 r30923 28 28 #include "config.h" 29 29 #include "MIMETypeRegistry.h" 30 31 #include "NotImplemented.h"32 #if QT_VERSION < 0x04040033 #include "qwebobjectplugin_p.h"34 #endif35 30 36 31 namespace WebCore { … … 80 75 ++e; 81 76 } 82 // ### FIXME: Qt 4.483 #if QT_VERSION < 0x04040084 QString type = QWebFactoryLoader::self()->mimeTypeForExtension(ext);85 if (!type.isEmpty())86 return type;87 #endif88 77 89 78 return "application/octet-stream"; -
trunk/WebKit.pri
r29898 r30923 98 98 $$BASE_DIR/WebCore/history \ 99 99 $$BASE_DIR/WebCore/xml \ 100 $$BASE_DIR/WebCore/html 100 $$BASE_DIR/WebCore/html \ 101 $$BASE_DIR/WebCore/plugins 101 102 102 103 -
trunk/WebKit/mac/ChangeLog
r30902 r30923 1 2008-03-07 Simon Hausmann <hausmann@webkit.org> 2 3 Reviewed by Darin. 4 5 Done with Lars. 6 7 Simplified WebViewFactory's refreshPlugins method to only refresh the 8 plugins and not reload the frames anymore since that's now done in a 9 platform independent manner by WebCore::Page. 10 11 Also removed the now unused pluginNameForMIMEType and 12 pluginSupportsMIMEType methods. 13 14 * WebCoreSupport/WebViewFactory.mm: 15 * WebView/WebFrame.mm: 16 * WebView/WebFrameInternal.h: 17 * WebView/WebView.mm: 18 1 19 2008-03-08 Mark Rowe <mrowe@apple.com> 2 20 -
trunk/WebKit/mac/WebCoreSupport/WebViewFactory.mm
r30168 r30923 72 72 } 73 73 74 - (NSString *)pluginNameForMIMEType:(NSString *)MIMEType 75 { 76 return [[[WebPluginDatabase sharedDatabase] pluginForMIMEType:MIMEType] name]; 77 } 78 79 - (void)refreshPlugins:(BOOL)reloadPages 74 - (void)refreshPlugins 80 75 { 81 76 [[WebPluginDatabase sharedDatabase] refresh]; 82 if (reloadPages) {83 [WebView _makeAllWebViewsPerformSelector:@selector(_reloadForPluginChanges)];84 }85 }86 87 - (BOOL)pluginSupportsMIMEType:(NSString *)MIMEType88 {89 return [[WebPluginDatabase sharedDatabase] pluginForMIMEType:MIMEType] != nil;90 77 } 91 78 -
trunk/WebKit/mac/WebView/WebFrame.mm
r30897 r30923 362 362 } 363 363 364 - (void)_reloadForPluginChanges365 {366 Frame* coreFrame = core(self);367 for (Frame* frame = coreFrame; frame; frame = frame->tree()->traverseNext(coreFrame)) {368 NSView <WebDocumentView> *documentView = [[kit(frame) frameView] documentView];369 if (([documentView isKindOfClass:[WebHTMLView class]] && coreFrame->loader()->containsPlugins()))370 [kit(frame) reload];371 }372 }373 374 364 - (void)_attachScriptDebugger 375 365 { -
trunk/WebKit/mac/WebView/WebFrameInternal.h
r30897 r30923 150 150 - (int)_numPendingOrLoadingRequests:(BOOL)recurse; 151 151 152 - (void)_reloadForPluginChanges;153 154 152 - (void)_attachScriptDebugger; 155 153 - (void)_detachScriptDebugger; -
trunk/WebKit/mac/WebView/WebView.mm
r30836 r30923 1282 1282 } 1283 1283 1284 - (void)_reloadForPluginChanges1285 {1286 [[self mainFrame] _reloadForPluginChanges];1287 }1288 1289 1284 - (NSCachedURLResponse *)_cachedResponseForURL:(NSURL *)URL 1290 1285 { -
trunk/WebKit/qt/Api/qwebnetworkinterface.cpp
r30388 r30923 27 27 #include "qwebnetworkinterface.h" 28 28 #include "qwebnetworkinterface_p.h" 29 #include "qwebobjectpluginconnector.h"30 29 #include "qwebpage.h" 31 30 #include "qcookiejar.h" … … 362 361 bool QWebNetworkJob::cancelled() const 363 362 { 364 return !d->resourceHandle && !d->connector;363 return !d->resourceHandle; 365 364 } 366 365 … … 451 450 job->d->resourceHandle = handle; 452 451 job->d->interface = interface; 453 job->d->connector = 0;454 452 455 453 job->d->request.init(handle->request()); … … 480 478 DEBUG() << "QWebNetworkManager::cancel:" << job->d->request.httpHeader.toString(); 481 479 job->d->resourceHandle = 0; 482 job->d->connector = 0;483 480 job->d->interface->cancelJob(job); 484 481 handle->getInternal()->m_job = 0; … … 497 494 if (!client) 498 495 return; 499 } else if (!job->d->connector){496 } else { 500 497 return; 501 498 } … … 572 569 if (client) 573 570 client->didReceiveResponse(job->d->resourceHandle, response); 574 if (job->d->connector)575 emit job->d->connector->started(job);576 571 577 572 } … … 588 583 if (!client) 589 584 return; 590 } else if (!job->d->connector){585 } else { 591 586 return; 592 587 } … … 598 593 if (client) 599 594 client->didReceiveData(job->d->resourceHandle, data.constData(), data.length(), data.length() /*FixMe*/); 600 if (job->d->connector)601 emit job->d->connector->data(job, data);602 595 603 596 } … … 618 611 if (!client) 619 612 return; 620 } else if (!job->d->connector){613 } else { 621 614 job->deref(); 622 615 return; … … 645 638 } 646 639 } 647 648 if (job->d->connector)649 emit job->d->connector->finished(job, errorCode);650 640 651 641 DEBUG() << "receivedFinished done" << job->d->request.url; -
trunk/WebKit/qt/Api/qwebnetworkinterface_p.h
r29663 r30923 58 58 , redirected(false) 59 59 , interface(0) 60 , connector(0)61 60 , jobStatus(QWebNetworkJob::JobCreated) 62 61 {} … … 70 69 71 70 QWebNetworkInterface *interface; 72 QWebObjectPluginConnector *connector;73 71 QWebNetworkJob::JobStatus jobStatus; 74 72 QString errorString; -
trunk/WebKit/qt/Api/qwebpage.cpp
r29731 r30923 129 129 #else 130 130 networkManager = 0; 131 pluginFactory = 0; 131 132 #endif 132 133 insideOpenCall = false; … … 1407 1408 } 1408 1409 1410 void QWebPage::setPluginFactory(QWebPluginFactory *factory) 1411 { 1412 d->pluginFactory = factory; 1413 } 1414 1415 QWebPluginFactory *QWebPage::pluginFactory() const 1416 { 1417 return d->pluginFactory; 1418 } 1419 1409 1420 #endif 1410 1421 -
trunk/WebKit/qt/Api/qwebpage.h
r29730 r30923 43 43 class QWebFrameData; 44 44 class QWebNetworkInterface; 45 class QWebPluginFactory; 45 46 46 47 namespace WebCore { … … 172 173 void setNetworkAccessManager(QNetworkAccessManager *manager); 173 174 QNetworkAccessManager *networkAccessManager() const; 175 176 void setPluginFactory(QWebPluginFactory *factory); 177 QWebPluginFactory *pluginFactory() const; 174 178 #endif 175 179 -
trunk/WebKit/qt/Api/qwebpage_p.h
r29713 r30923 155 155 156 156 QAction *actions[QWebPage::WebActionCount]; 157 158 #if QT_VERSION >= 0x040400 159 QWebPluginFactory *pluginFactory; 160 #endif 157 161 }; 158 162 -
trunk/WebKit/qt/ChangeLog
r30870 r30923 1 2008-03-07 Simon Hausmann <hausmann@webkit.org> 2 3 Reviewed by Darin. 4 5 Done with Lars. 6 7 Replaced the QWebObjectPlugin interfaces with QWebPluginFactory. 8 9 * Api/qwebnetworkinterface.cpp: 10 (QWebNetworkManager::add): 11 (QWebNetworkManager::cancel): 12 (QWebNetworkManager::started): 13 (QWebNetworkManager::data): 14 (QWebNetworkManager::finished): 15 * Api/qwebnetworkinterface_p.h: 16 (QWebNetworkJobPrivate::QWebNetworkJobPrivate): 17 * Api/qwebobjectplugin.cpp: Removed. 18 * Api/qwebobjectplugin.h: Removed. 19 * Api/qwebobjectplugin_p.h: Removed. 20 * Api/qwebobjectpluginconnector.cpp: Removed. 21 * Api/qwebobjectpluginconnector.h: Removed. 22 * Api/qwebpage.cpp: 23 (QWebPagePrivate::QWebPagePrivate): 24 (QWebPage::setPluginFactory): 25 (QWebPage::pluginFactory): 26 * Api/qwebpage.h: 27 * Api/qwebpage_p.h: 28 * Api/qwebpluginfactory.cpp: Added. 29 (QWebPluginFactory::QWebPluginFactory): 30 (QWebPluginFactory::~QWebPluginFactory): 31 (QWebPluginFactory::refreshPlugins): 32 (QWebPluginFactory::extension): 33 * Api/qwebpluginfactory.h: Added. 34 (MimeType::): 35 * WebCoreSupport/FrameLoaderClientQt.cpp: 36 (WebCore::FrameLoaderClientQt::objectContentType): 37 (WebCore::FrameLoaderClientQt::createPlugin): 38 1 39 2008-03-07 Simon Hausmann <hausmann@webkit.org> 2 40 -
trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
r30549 r30923 38 38 #include "ResourceResponse.h" 39 39 #include "Page.h" 40 #include "PluginData.h" 40 41 #include "ProgressTracker.h" 41 42 #include "ResourceRequest.h" … … 51 52 #include "qwebframe_p.h" 52 53 #include "qwebhistoryinterface.h" 54 #include "qwebpluginfactory.h" 53 55 54 56 #include <qfileinfo.h> … … 61 63 #else 62 64 #include "qwebnetworkinterface_p.h" 63 #include "qwebobjectplugin_p.h"64 65 #endif 65 66 … … 908 909 return ObjectContentImage; 909 910 910 // ### FIXME Qt 4.4 911 #if QT_VERSION < 0x040400 912 if (QWebFactoryLoader::self()->supportsMimeType(mimeType)) 913 return ObjectContentNetscapePlugin; 914 #endif 911 if (m_frame->page() && m_frame->page()->pluginData()->supportsMimeType(mimeType)) 912 return ObjectContentOtherPlugin; 915 913 916 914 if (MIMETypeRegistry::isSupportedNonImageMIMEType(mimeType)) … … 973 971 } 974 972 975 // ### FIXME: qt 4.4976 #if QT_VERSION < 0x040400 977 if (!object)978 object = QWebFactoryLoader::self()->create(m_webFrame, qurl, mimeType, params, values);979 #endif 973 if (!object) { 974 QWebPluginFactory* factory = m_webFrame->page()->pluginFactory(); 975 if (factory) 976 object = factory->create(mimeType, qurl, params, values); 977 } 980 978 981 979 if (object) { -
trunk/WebKitTools/ChangeLog
r30920 r30923 1 2008-03-07 Simon Hausmann <hausmann@webkit.org> 2 3 Reviewed by Darin. 4 5 Done with Lars. 6 7 Ported the netscape test plugin to QWebPluginFactory. 8 9 * DumpRenderTree/qt/DumpRenderTree.cpp: 10 (WebCore::WebPage::WebPage): 11 * DumpRenderTree/qt/main.cpp: 12 * DumpRenderTree/qt/testplugin.cpp: 13 (TestPlugin::plugins): 14 (TestPlugin::create): 15 * DumpRenderTree/qt/testplugin.h: 16 1 17 2008-03-09 Steve Falkenburg <sfalken@apple.com> 2 18 -
trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
r29689 r30923 30 30 #include "DumpRenderTree.h" 31 31 #include "jsobjects.h" 32 #include "testplugin.h" 32 33 33 34 #include <QDir> … … 88 89 connect(this, SIGNAL(geometryChangeRequest(const QRect &)), 89 90 this, SLOT(setViewGeometry(const QRect & ))); 91 92 setPluginFactory(new TestPlugin(this)); 90 93 } 91 94 -
trunk/WebKitTools/DumpRenderTree/qt/main.cpp
r29663 r30923 29 29 30 30 #include "DumpRenderTree.h" 31 #include "testplugin.h"32 31 33 32 #include <qstringlist.h> … … 48 47 #if defined(__GLIBC__) 49 48 #include <execinfo.h> 50 #endif51 52 #if QT_VERSION < 0x04040053 Q_IMPORT_PLUGIN(testplugin)54 49 #endif 55 50 -
trunk/WebKitTools/DumpRenderTree/qt/testplugin.cpp
r29663 r30923 28 28 #include "testplugin.h" 29 29 30 #if QT_VERSION < 0x04040031 32 30 TestPlugin::TestPlugin(QObject *parent) 33 : QWeb ObjectPlugin(parent)31 : QWebPluginFactory(parent) 34 32 { 35 33 } … … 39 37 } 40 38 41 Q StringList TestPlugin::keys() const39 QList<QWebPluginFactory::Plugin> TestPlugin::plugins() const 42 40 { 43 return QStringList(QLatin1String("testplugin")); 41 QWebPluginFactory::Plugin plugin; 42 43 plugin.name = "testplugin"; 44 plugin.description = "testdescription"; 45 MimeType mimeType; 46 mimeType.name = "testtype"; 47 mimeType.fileExtensions.append("testsuffixes"); 48 plugin.mimeTypes.append(mimeType); 49 50 plugin.name = "testplugin2"; 51 plugin.description = "testdescription2"; 52 mimeType.name = "testtype2"; 53 mimeType.fileExtensions.append("testsuffixes2"); 54 mimeType.fileExtensions.append("testsuffixes3"); 55 plugin.mimeTypes.append(mimeType); 56 57 return QList<QWebPluginFactory::Plugin>() << plugin; 44 58 } 45 59 46 QString TestPlugin::descriptionForKey(const QString &) const 47 { 48 return QLatin1String("testdescription"); 49 } 50 51 QStringList TestPlugin::mimetypesForKey(const QString &) const 52 { 53 return QStringList(QLatin1String("testtype")); 54 } 55 56 QStringList TestPlugin::extensionsForMimetype(const QString &) const 57 { 58 return QStringList(QLatin1String("testsuffixes")); 59 } 60 61 QObject *TestPlugin::create(QWebObjectPluginConnector *, 62 const QUrl &, 63 const QString &, 64 const QStringList &, 65 const QStringList &) const 60 QObject *TestPlugin::create(const QString &mimeType, 61 const QUrl &url, 62 const QStringList &argumentNames, 63 const QStringList &argumentValues) const 66 64 { 67 65 return 0; 68 66 } 69 67 70 Q_EXPORT_PLUGIN2(testplugin, TestPlugin)71 #endif -
trunk/WebKitTools/DumpRenderTree/qt/testplugin.h
r29663 r30923 26 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 27 */ 28 #include <qglobal.h> 29 #if QT_VERSION < 0x040400 30 #define QT_STATICPLUGIN 31 #include <qwebobjectplugin.h> 28 #include <qwebpluginfactory.h> 32 29 33 30 34 class TestPlugin : public QWeb ObjectPlugin31 class TestPlugin : public QWebPluginFactory 35 32 { 36 33 public: … … 38 35 virtual ~TestPlugin(); 39 36 40 virtual Q StringList keys() const;37 virtual QList<Plugin> plugins() const; 41 38 42 virtual QString descriptionForKey(const QString &key) const; 43 virtual QStringList mimetypesForKey(const QString &key) const; 44 virtual QStringList extensionsForMimetype(const QString &mimeType) const; 45 virtual QObject *create(QWebObjectPluginConnector *connector, 39 virtual QObject *create(const QString &mimeType, 46 40 const QUrl &url, 47 const QString &mimeType,48 41 const QStringList &argumentNames, 49 42 const QStringList &argumentValues) const; 43 50 44 }; 51 45 52 #endif
Note: See TracChangeset
for help on using the changeset viewer.