Changeset 87931 in webkit
- Timestamp:
- Jun 2, 2011 11:05:09 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 12 deleted
- 24 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r87929 r87931 1 2011-06-02 Dimitri Glazkov <dglazkov@chromium.org> 2 3 Unreviewed, rolling out r87926. 4 http://trac.webkit.org/changeset/87926 5 https://bugs.webkit.org/show_bug.cgi?id=60313 6 7 Fails to find WebCoreTestSupport.dylib on bots. 8 9 * fast/dom/Window/script-tests/window-property-descriptors.js: 10 * fast/dom/Window/window-properties.html: 11 * fast/dom/script-tests/prototype-inheritance-2.js: 12 * fast/dom/script-tests/prototype-inheritance.js: 13 * fast/harness/internals-object-expected.txt: Removed. 14 * fast/harness/internals-object.html: Removed. 15 * platform/gtk/Skipped: 16 * platform/mac-wk2/Skipped: 17 * platform/qt/Skipped: 18 * platform/win/Skipped: 19 1 20 2011-06-02 Adam Barth <abarth@webkit.org> 2 21 -
trunk/LayoutTests/fast/dom/Window/script-tests/window-property-descriptors.js
r87926 r87931 19 19 "plainText" : 1, 20 20 "textInputController" : 1, 21 "internals" : 1,22 21 // Ignore these properties because they do not exist in all implementations. They will be tested separately 23 22 "WebGLRenderingContext" : 1, -
trunk/LayoutTests/fast/dom/Window/window-properties.html
r87926 r87931 61 61 "window.plainText" : 1, 62 62 "window.textInputController" : 1, 63 "window.internals" : 1,64 63 // Ignore these properties because they do not exist in all implementations. They will be tested separately 65 64 "window.WebGLRenderingContext" : 1, -
trunk/LayoutTests/fast/dom/script-tests/prototype-inheritance-2.js
r87926 r87931 13 13 "eventSender", "objCPlugin", "objCPluginFunction", 14 14 "appleScriptController", "plainText", "accessibilityController", 15 "internals",16 15 // Skip our test property 17 16 "isInner", -
trunk/LayoutTests/fast/dom/script-tests/prototype-inheritance.js
r87926 r87931 13 13 "eventSender", "objCPlugin", "objCPluginFunction", 14 14 "appleScriptController", "plainText", "accessibilityController", 15 "internals",16 15 // Ignore these properties because they do not exist in all implementations. They will be tested separately 17 16 "webkitNotifications", -
trunk/LayoutTests/platform/gtk/Skipped
r87926 r87931 1532 1532 fast/events/dropzone-002.html 1533 1533 1534 # https://bugs.webkit.org/show_bug.cgi?id=610711535 fast/harness/internals-object.html -
trunk/LayoutTests/platform/mac-wk2/Skipped
r87926 r87931 1518 1518 editing/undo/undo-iframe-location-change.html 1519 1519 1520 # https://bugs.webkit.org/show_bug.cgi?id=610731521 fast/harness/internals-object.html1522 1523 1520 ### END OF (1) Classified failures with bug reports 1524 1521 ######################################## -
trunk/LayoutTests/platform/qt/Skipped
r87926 r87931 2528 2528 # JSC does not support setIsolatedWorldSecurityOrigin (http://webkit.org/b/61540) 2529 2529 http/tests/security/isolatedWorld/cross-origin-xhr.html 2530 2531 # https://bugs.webkit.org/show_bug.cgi?id=610742532 fast/harness/internals-object.html -
trunk/LayoutTests/platform/win/Skipped
r87926 r87931 1319 1319 # JSC does not support setIsolatedWorldSecurityOrigin (http://webkit.org/b/61540) 1320 1320 http/tests/security/isolatedWorld/cross-origin-xhr.html 1321 1322 # https://bugs.webkit.org/show_bug.cgi?id=610761323 fast/harness/internals-object.html -
trunk/Source/WebCore/ChangeLog
r87930 r87931 1 2011-06-02 Dimitri Glazkov <dglazkov@chromium.org> 2 3 Unreviewed, rolling out r87926. 4 http://trac.webkit.org/changeset/87926 5 https://bugs.webkit.org/show_bug.cgi?id=60313 6 7 Fails to find WebCoreTestSupport.dylib on bots. 8 9 * Configurations/WebCore.xcconfig: 10 * Configurations/WebCoreTestSupport.xcconfig: Removed. 11 * DerivedSources.make: 12 * WebCore.exp.in: 13 * WebCore.gyp/WebCore.gyp: 14 * WebCore.gypi: 15 * WebCore.xcodeproj/project.pbxproj: 16 * bindings/js/JSDOMWrapper.cpp: 17 (WebCore::JSDOMWrapper::~JSDOMWrapper): 18 * bindings/js/JSDOMWrapper.h: 19 * testing/Internals.cpp: Removed. 20 * testing/Internals.h: Removed. 21 * testing/Internals.idl: Removed. 22 * testing/js/WebCoreTestSupport.cpp: Removed. 23 * testing/js/WebCoreTestSupport.h: Removed. 24 * testing/v8/WebCoreTestSupport.cpp: Removed. 25 * testing/v8/WebCoreTestSupport.h: Removed. 26 1 27 2011-06-02 Carlos Garcia Campos <cgarcia@igalia.com> 2 28 -
trunk/Source/WebCore/Configurations/WebCore.xcconfig
r87926 r87931 51 51 INSTALLHDRS_SCRIPT_PHASE = YES; 52 52 PRODUCT_NAME = WebCore; 53 OTHER_LDFLAGS_BASE = -l$(SQLITE3_LIBRARY) -lobjc -lANGLE -allowable_client WebCoreTestSupport;53 OTHER_LDFLAGS_BASE = -l$(SQLITE3_LIBRARY) -lobjc -lANGLE; 54 54 OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(REAL_PLATFORM_NAME)); 55 55 OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework QuartzCore; -
trunk/Source/WebCore/DerivedSources.make
r87926 r87931 47 47 $(WebCore)/workers \ 48 48 $(WebCore)/svg \ 49 $(WebCore)/testing \50 49 $(WebCore)/websockets \ 51 50 # … … 293 292 InjectedScriptHost \ 294 293 InspectorFrontendHost \ 295 Internals \296 294 KeyboardEvent \ 297 295 Location \ -
trunk/Source/WebCore/WebCore.exp.in
r87926 r87931 264 264 __ZN7WebCore12IconDatabase9setClientEPNS_18IconDatabaseClientE 265 265 __ZN7WebCore12IconDatabaseC1Ev 266 __ZN7WebCore12JSDOMWrapper34virtualFunctionToPreventWeakVtableEv267 266 __ZN7WebCore12PopupMenuMacC1EPNS_15PopupMenuClientE 268 267 __ZN7WebCore12PrintContext12pagePropertyEPNS_5FrameEPKci … … 1018 1017 __ZN7WebCore9plainTextEPKNS_5RangeENS_20TextIteratorBehaviorE 1019 1018 __ZN7WebCore9toElementEN3JSC7JSValueE 1020 __ZN7WebCore17cacheDOMStructureEPNS_17JSDOMGlobalObjectEPN3JSC9StructureEPKNS2_9ClassInfoE1021 __ZN7WebCore21getCachedDOMStructureEPNS_17JSDOMGlobalObjectEPKN3JSC9ClassInfoE1022 1019 __ZNK3JSC8Bindings10RootObject12globalObjectEv 1023 1020 __ZNK3WTF6String14createCFStringEv … … 1315 1312 __ZNK7WebCore9PageCache21autoreleasedPageCountEv 1316 1313 __ZTVN7WebCore12ChromeClientE 1317 __ZTVN7WebCore12JSDOMWrapperE1318 1314 __ZTVN7WebCore16IconDatabaseBaseE 1319 1315 __ZTVN7WebCore17FileChooserClientE … … 1649 1645 __ZN7WebCore13IdentifierRep7isValidEPS0_ 1650 1646 __ZN7WebCore16ScriptController16createRootObjectEPv 1647 __ZN7WebCore17cacheDOMStructureEPNS_17JSDOMGlobalObjectEPN3JSC9StructureEPKNS2_9ClassInfoE 1648 __ZN7WebCore21getCachedDOMStructureEPNS_17JSDOMGlobalObjectEPKN3JSC9ClassInfoE 1651 1649 __ZNK3JSC8Bindings13RuntimeObject12defaultValueEPNS_9ExecStateENS_22PreferredPrimitiveTypeE 1652 1650 __ZTVN3JSC13RuntimeMethodE -
trunk/Source/WebCore/WebCore.gyp/WebCore.gyp
r87926 r87931 458 458 # idl rules 459 459 '<@(bindings_idl_files)', 460 '<@(webcore_test_support_idl_files)',461 460 ], 462 461 'actions': [ … … 848 847 '--include', '../storage', 849 848 '--include', '../svg', 850 '--include', '../testing',851 849 '--include', '../webaudio', 852 850 '--include', '../websockets', … … 1730 1728 ], 1731 1729 }, 1732 {1733 'target_name': 'webcore_test_support',1734 'type': 'static_library',1735 'dependencies': [1736 'webcore',1737 ],1738 'include_dirs': [1739 '<(INTERMEDIATE_DIR)',1740 '<(SHARED_INTERMEDIATE_DIR)/webcore',1741 '<(SHARED_INTERMEDIATE_DIR)/webkit',1742 '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings',1743 '<@(webcore_include_dirs)',1744 '../testing',1745 '../testing/v8',1746 ],1747 'sources': [1748 '<@(webcore_test_support_files)',1749 '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/V8Internals.cpp',1750 '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8Internals.h',1751 ],1752 'sources/': [1753 ['exclude', 'testing/js'],1754 ],1755 },1756 1730 ], # targets 1757 1731 } -
trunk/Source/WebCore/WebCore.gypi
r87926 r87931 6121 6121 'xml/XSLTUnicodeSort.h', 6122 6122 ], 6123 'webcore_test_support_idl_files': [6124 'testing/Internals.idl',6125 ],6126 'webcore_test_support_files': [6127 'testing/v8/WebCoreTestSupport.cpp',6128 'testing/v8/WebCoreTestSupport.h',6129 'testing/js/WebCoreTestSupport.cpp',6130 'testing/js/WebCoreTestSupport.h',6131 'testing/Internals.cpp',6132 'testing/Internals.h',6133 ],6134 6123 'webcore_resource_files': [ 6135 6124 'English.lproj/Localizable.strings', -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r87926 r87931 8 8 9 9 /* Begin PBXAggregateTarget section */ 10 41816F7913859C550057AAA4 /* All */ = {11 isa = PBXAggregateTarget;12 buildConfigurationList = 41816F8113859C640057AAA4 /* Build configuration list for PBXAggregateTarget "All" */;13 buildPhases = (14 );15 dependencies = (16 41816F8313859C7A0057AAA4 /* PBXTargetDependency */,17 41816F8513859C7D0057AAA4 /* PBXTargetDependency */,18 );19 name = All;20 productName = All;21 };22 10 5D87BB6411E3EBC100702B6F /* WebCoreExportFileGenerator Generator */ = { 23 11 isa = PBXAggregateTarget; … … 852 840 411046410FA222A600BA436A /* ScriptEventListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 4110463F0FA222A600BA436A /* ScriptEventListener.h */; }; 853 841 411046420FA222A600BA436A /* ScriptEventListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 411046400FA222A600BA436A /* ScriptEventListener.cpp */; }; 854 4123081B138C429700BCCFCA /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93F19B1A08245E5A001E9ABC /* WebCore.framework */; };855 41230913138C42FF00BCCFCA /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8216299029F4FB501000131 /* JavaScriptCore.framework */; };856 842 4123E569127B3041000FEEA7 /* WindowEventContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 4123E567127B3041000FEEA7 /* WindowEventContext.h */; }; 857 843 4123E56A127B3041000FEEA7 /* WindowEventContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4123E568127B3041000FEEA7 /* WindowEventContext.cpp */; }; … … 877 863 417253AA1354BBBC00360F2A /* MediaControlElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 417253A81354BBBC00360F2A /* MediaControlElements.cpp */; }; 878 864 417253AB1354BBBC00360F2A /* MediaControlElements.h in Headers */ = {isa = PBXBuildFile; fileRef = 417253A91354BBBC00360F2A /* MediaControlElements.h */; }; 879 417DA6D913734E6E007C57FB /* Internals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 417DA4CF13734326007C57FB /* Internals.cpp */; };880 417DA6DA13734E6E007C57FB /* Internals.h in Headers */ = {isa = PBXBuildFile; fileRef = 417DA4CE13734326007C57FB /* Internals.h */; };881 417DA71D13735DFA007C57FB /* JSInternals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 417DA71B13735DFA007C57FB /* JSInternals.cpp */; };882 417DA71E13735DFA007C57FB /* JSInternals.h in Headers */ = {isa = PBXBuildFile; fileRef = 417DA71C13735DFA007C57FB /* JSInternals.h */; };883 41815C1E138319830057AAA4 /* WebCoreTestSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41815C1C138319830057AAA4 /* WebCoreTestSupport.cpp */; };884 41815C1F138319830057AAA4 /* WebCoreTestSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 41815C1D138319830057AAA4 /* WebCoreTestSupport.h */; settings = {ATTRIBUTES = (Private, ); }; };885 865 41885B9311B6FDA6003383BB /* FormSubmission.h in Headers */ = {isa = PBXBuildFile; fileRef = 41885B9111B6FDA6003383BB /* FormSubmission.h */; settings = {ATTRIBUTES = (Private, ); }; }; 886 866 41885B9411B6FDA6003383BB /* FormSubmission.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41885B9211B6FDA6003383BB /* FormSubmission.cpp */; }; … … 6017 5997 6018 5998 /* Begin PBXContainerItemProxy section */ 6019 417DA6D413734E0D007C57FB /* PBXContainerItemProxy */ = {6020 isa = PBXContainerItemProxy;6021 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;6022 proxyType = 1;6023 remoteGlobalIDString = 93F198A508245E59001E9ABC;6024 remoteInfo = WebCore;6025 };6026 41816F8213859C7A0057AAA4 /* PBXContainerItemProxy */ = {6027 isa = PBXContainerItemProxy;6028 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;6029 proxyType = 1;6030 remoteGlobalIDString = 93F198A508245E59001E9ABC;6031 remoteInfo = WebCore;6032 };6033 41816F8413859C7D0057AAA4 /* PBXContainerItemProxy */ = {6034 isa = PBXContainerItemProxy;6035 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;6036 proxyType = 1;6037 remoteGlobalIDString = 417DA6CF13734E02007C57FB;6038 remoteInfo = WebCoreTestSupport;6039 };6040 5999 5D87BB6A11E3EBD200702B6F /* PBXContainerItemProxy */ = { 6041 6000 isa = PBXContainerItemProxy; … … 7415 7374 417253A81354BBBC00360F2A /* MediaControlElements.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaControlElements.cpp; sourceTree = "<group>"; }; 7416 7375 417253A91354BBBC00360F2A /* MediaControlElements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaControlElements.h; sourceTree = "<group>"; }; 7417 417DA4CE13734326007C57FB /* Internals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Internals.h; sourceTree = "<group>"; };7418 417DA4CF13734326007C57FB /* Internals.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Internals.cpp; sourceTree = "<group>"; };7419 417DA6D013734E02007C57FB /* WebCoreTestSupport.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = WebCoreTestSupport.dylib; sourceTree = BUILT_PRODUCTS_DIR; };7420 417DA71B13735DFA007C57FB /* JSInternals.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInternals.cpp; sourceTree = "<group>"; };7421 417DA71C13735DFA007C57FB /* JSInternals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSInternals.h; sourceTree = "<group>"; };7422 41813F9113818AD60057AAA4 /* Internals.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Internals.idl; sourceTree = "<group>"; };7423 41815C1C138319830057AAA4 /* WebCoreTestSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCoreTestSupport.cpp; sourceTree = "<group>"; };7424 41815C1D138319830057AAA4 /* WebCoreTestSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreTestSupport.h; sourceTree = "<group>"; };7425 4181707D1386EDF20057AAA4 /* WebCoreTestSupport.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebCoreTestSupport.xcconfig; sourceTree = "<group>"; };7426 7376 41885B9111B6FDA6003383BB /* FormSubmission.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormSubmission.h; sourceTree = "<group>"; }; 7427 7377 41885B9211B6FDA6003383BB /* FormSubmission.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormSubmission.cpp; sourceTree = "<group>"; }; … … 12648 12598 12649 12599 /* Begin PBXFrameworksBuildPhase section */ 12650 417DA6CE13734E02007C57FB /* Frameworks */ = {12651 isa = PBXFrameworksBuildPhase;12652 buildActionMask = 2147483647;12653 files = (12654 41230913138C42FF00BCCFCA /* JavaScriptCore.framework in Frameworks */,12655 4123081B138C429700BCCFCA /* WebCore.framework in Frameworks */,12656 );12657 runOnlyForDeploymentPostprocessing = 0;12658 };12659 12600 5D87BB4D11E3EAEB00702B6F /* Frameworks */ = { 12660 12601 isa = PBXFrameworksBuildPhase; … … 12694 12635 children = ( 12695 12636 5D87BB4F11E3EAEB00702B6F /* WebCoreExportFileGenerator */, 12696 417DA6D013734E02007C57FB /* WebCoreTestSupport.dylib */,12697 12637 93F19B1A08245E5A001E9ABC /* WebCore.framework */, 12698 12638 ); … … 12767 12707 1AE82EC90CAAE177002237AE /* storage */, 12768 12708 B22277CA0D00BF1E0071B782 /* svg */, 12769 417DA4CD13734204007C57FB /* testing */,12770 12709 FD315FA212B025B100C1A359 /* webaudio */, 12771 12710 518A34BD1026C831001B6896 /* websockets */, … … 12975 12914 A83B79150CCB0078000B0825 /* Storage */, 12976 12915 A83B790A0CCAFF47000B0825 /* SVG */, 12977 417DA71213735D90007C57FB /* Testing */,12978 12916 E1C8BE4B0E8BD0D10064CB7D /* Threads */, 12979 12917 BC9854530CD3DA8F00069BC1 /* Traversal */, … … 13443 13381 1C904DF90BA9D2C80081E9D0 /* Version.xcconfig */, 13444 13382 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */, 13445 4181707D1386EDF20057AAA4 /* WebCoreTestSupport.xcconfig */,13446 13383 ); 13447 13384 path = Configurations; … … 13642 13579 ); 13643 13580 path = shadow; 13644 sourceTree = "<group>";13645 };13646 417DA4CD13734204007C57FB /* testing */ = {13647 isa = PBXGroup;13648 children = (13649 41815C1B138319630057AAA4 /* js */,13650 417DA4CF13734326007C57FB /* Internals.cpp */,13651 417DA4CE13734326007C57FB /* Internals.h */,13652 41813F9113818AD60057AAA4 /* Internals.idl */,13653 );13654 path = testing;13655 sourceTree = "<group>";13656 };13657 417DA71213735D90007C57FB /* Testing */ = {13658 isa = PBXGroup;13659 children = (13660 417DA71B13735DFA007C57FB /* JSInternals.cpp */,13661 417DA71C13735DFA007C57FB /* JSInternals.h */,13662 );13663 name = Testing;13664 sourceTree = "<group>";13665 };13666 41815C1B138319630057AAA4 /* js */ = {13667 isa = PBXGroup;13668 children = (13669 41815C1C138319830057AAA4 /* WebCoreTestSupport.cpp */,13670 41815C1D138319830057AAA4 /* WebCoreTestSupport.h */,13671 );13672 path = js;13673 13581 sourceTree = "<group>"; 13674 13582 }; … … 19983 19891 19984 19892 /* Begin PBXHeadersBuildPhase section */ 19985 417DA6CC13734E02007C57FB /* Headers */ = {19986 isa = PBXHeadersBuildPhase;19987 buildActionMask = 2147483647;19988 files = (19989 417DA6DA13734E6E007C57FB /* Internals.h in Headers */,19990 417DA71E13735DFA007C57FB /* JSInternals.h in Headers */,19991 41815C1F138319830057AAA4 /* WebCoreTestSupport.h in Headers */,19992 );19993 runOnlyForDeploymentPostprocessing = 0;19994 };19995 19893 93F198A608245E59001E9ABC /* Headers */ = { 19996 19894 isa = PBXHeadersBuildPhase; … … 23114 23012 23115 23013 /* Begin PBXNativeTarget section */ 23116 417DA6CF13734E02007C57FB /* WebCoreTestSupport */ = {23117 isa = PBXNativeTarget;23118 buildConfigurationList = 417DA6D813734E47007C57FB /* Build configuration list for PBXNativeTarget "WebCoreTestSupport" */;23119 buildPhases = (23120 417DA6CC13734E02007C57FB /* Headers */,23121 417DA6CD13734E02007C57FB /* Sources */,23122 417DA6CE13734E02007C57FB /* Frameworks */,23123 );23124 buildRules = (23125 );23126 dependencies = (23127 417DA6D513734E0D007C57FB /* PBXTargetDependency */,23128 );23129 name = WebCoreTestSupport;23130 productName = WebCoreTestSupport;23131 productReference = 417DA6D013734E02007C57FB /* WebCoreTestSupport.dylib */;23132 productType = "com.apple.product-type.library.dynamic";23133 };23134 23014 5D87BB4E11E3EAEB00702B6F /* WebCoreExportFileGenerator */ = { 23135 23015 isa = PBXNativeTarget; … … 23201 23081 projectRoot = ""; 23202 23082 targets = ( 23203 41816F7913859C550057AAA4 /* All */,23204 23083 93F198A508245E59001E9ABC /* WebCore */, 23205 23084 DD041FBE09D9DDBE0010AF2A /* Derived Sources */, 23206 23085 5D87BB4E11E3EAEB00702B6F /* WebCoreExportFileGenerator */, 23207 23086 5D87BB6411E3EBC100702B6F /* WebCoreExportFileGenerator Generator */, 23208 417DA6CF13734E02007C57FB /* WebCoreTestSupport */,23209 23087 ); 23210 23088 }; … … 23417 23295 23418 23296 /* Begin PBXSourcesBuildPhase section */ 23419 417DA6CD13734E02007C57FB /* Sources */ = {23420 isa = PBXSourcesBuildPhase;23421 buildActionMask = 2147483647;23422 files = (23423 417DA6D913734E6E007C57FB /* Internals.cpp in Sources */,23424 417DA71D13735DFA007C57FB /* JSInternals.cpp in Sources */,23425 41815C1E138319830057AAA4 /* WebCoreTestSupport.cpp in Sources */,23426 );23427 runOnlyForDeploymentPostprocessing = 0;23428 };23429 23297 5D87BB4C11E3EAEB00702B6F /* Sources */ = { 23430 23298 isa = PBXSourcesBuildPhase; … … 25839 25707 25840 25708 /* Begin PBXTargetDependency section */ 25841 417DA6D513734E0D007C57FB /* PBXTargetDependency */ = {25842 isa = PBXTargetDependency;25843 target = 93F198A508245E59001E9ABC /* WebCore */;25844 targetProxy = 417DA6D413734E0D007C57FB /* PBXContainerItemProxy */;25845 };25846 41816F8313859C7A0057AAA4 /* PBXTargetDependency */ = {25847 isa = PBXTargetDependency;25848 target = 93F198A508245E59001E9ABC /* WebCore */;25849 targetProxy = 41816F8213859C7A0057AAA4 /* PBXContainerItemProxy */;25850 };25851 41816F8513859C7D0057AAA4 /* PBXTargetDependency */ = {25852 isa = PBXTargetDependency;25853 target = 417DA6CF13734E02007C57FB /* WebCoreTestSupport */;25854 targetProxy = 41816F8413859C7D0057AAA4 /* PBXContainerItemProxy */;25855 };25856 25709 5D87BB6B11E3EBD200702B6F /* PBXTargetDependency */ = { 25857 25710 isa = PBXTargetDependency; … … 25954 25807 baseConfigurationReference = 1CDD45E60BA9C84600F90147 /* Base.xcconfig */; 25955 25808 buildSettings = { 25956 };25957 name = Production;25958 };25959 417DA6D113734E02007C57FB /* Debug */ = {25960 isa = XCBuildConfiguration;25961 baseConfigurationReference = 4181707D1386EDF20057AAA4 /* WebCoreTestSupport.xcconfig */;25962 buildSettings = {25963 };25964 name = Debug;25965 };25966 417DA6D213734E02007C57FB /* Release */ = {25967 isa = XCBuildConfiguration;25968 baseConfigurationReference = 4181707D1386EDF20057AAA4 /* WebCoreTestSupport.xcconfig */;25969 buildSettings = {25970 };25971 name = Release;25972 };25973 417DA6D313734E02007C57FB /* Production */ = {25974 isa = XCBuildConfiguration;25975 baseConfigurationReference = 4181707D1386EDF20057AAA4 /* WebCoreTestSupport.xcconfig */;25976 buildSettings = {25977 };25978 name = Production;25979 };25980 41816F7A13859C560057AAA4 /* Debug */ = {25981 isa = XCBuildConfiguration;25982 buildSettings = {25983 PRODUCT_NAME = All;25984 };25985 name = Debug;25986 };25987 41816F7B13859C560057AAA4 /* Release */ = {25988 isa = XCBuildConfiguration;25989 buildSettings = {25990 PRODUCT_NAME = All;25991 };25992 name = Release;25993 };25994 41816F7C13859C560057AAA4 /* Production */ = {25995 isa = XCBuildConfiguration;25996 buildSettings = {25997 PRODUCT_NAME = All;25998 25809 }; 25999 25810 name = Production; … … 26104 25915 defaultConfigurationName = Production; 26105 25916 }; 26106 417DA6D813734E47007C57FB /* Build configuration list for PBXNativeTarget "WebCoreTestSupport" */ = {26107 isa = XCConfigurationList;26108 buildConfigurations = (26109 417DA6D113734E02007C57FB /* Debug */,26110 417DA6D213734E02007C57FB /* Release */,26111 417DA6D313734E02007C57FB /* Production */,26112 );26113 defaultConfigurationIsVisible = 0;26114 defaultConfigurationName = Production;26115 };26116 41816F8113859C640057AAA4 /* Build configuration list for PBXAggregateTarget "All" */ = {26117 isa = XCConfigurationList;26118 buildConfigurations = (26119 41816F7A13859C560057AAA4 /* Debug */,26120 41816F7B13859C560057AAA4 /* Release */,26121 41816F7C13859C560057AAA4 /* Production */,26122 );26123 defaultConfigurationIsVisible = 0;26124 defaultConfigurationName = Production;26125 };26126 25917 5D87BB5911E3EB0700702B6F /* Build configuration list for PBXNativeTarget "WebCoreExportFileGenerator" */ = { 26127 25918 isa = XCConfigurationList; -
trunk/Source/WebCore/bindings/js/JSDOMWrapper.cpp
r87926 r87931 33 33 namespace WebCore { 34 34 35 void JSDOMWrapper::virtualFunctionToPreventWeakVtable() 35 #ifndef NDEBUG 36 37 JSDOMWrapper::~JSDOMWrapper() 36 38 { 37 ASSERT_NOT_REACHED();38 39 } 39 40 41 #endif 42 40 43 } // namespace WebCore -
trunk/Source/WebCore/bindings/js/JSDOMWrapper.h
r87926 r87931 49 49 50 50 protected: 51 // An inline function cannot be the first non-abstract virtual function declared52 // in the class as it results in the vtable being generated as a weak symbol.53 virtual void virtualFunctionToPreventWeakVtable();54 55 51 explicit JSDOMWrapper(JSC::Structure* structure, JSC::JSGlobalObject* globalObject) 56 52 : JSObjectWithGlobalObject(globalObject, structure) … … 61 57 // ASSERT(globalObject->scriptExecutionContext()); 62 58 } 59 60 #ifndef NDEBUG 61 virtual ~JSDOMWrapper(); 62 #endif 63 63 }; 64 64 -
trunk/Source/WebKit/chromium/ChangeLog
r87927 r87931 1 2011-06-02 Dimitri Glazkov <dglazkov@chromium.org> 2 3 Unreviewed, rolling out r87926. 4 http://trac.webkit.org/changeset/87926 5 https://bugs.webkit.org/show_bug.cgi?id=60313 6 7 Fails to find WebCoreTestSupport.dylib on bots. 8 9 * WebKit.gyp: 10 * public/WebTestingSupport.h: Removed. 11 * src/WebTestingSupport.cpp: Removed. 12 1 13 2011-06-02 Aaron Colwell <acolwell@chromium.org> 2 14 -
trunk/Source/WebKit/chromium/WebKit.gyp
r87926 r87931 604 604 'dependencies': [ 605 605 '../../WebCore/WebCore.gyp/WebCore.gyp:webcore_bindings', 606 '../../WebCore/WebCore.gyp/WebCore.gyp:webcore_test_support',607 606 '<(chromium_src_dir)/base/base.gyp:test_support_base', 608 607 '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl', … … 629 628 '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', 630 629 ], 631 'include_dirs': [632 # WARNING: Do not view this particular case as a precedent for633 # including WebCore headers in DumpRenderTree project.634 '../../WebCore/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code.635 ],636 630 'sources': [ 637 631 '<@(webkit_unittest_files)', 638 'src/WebTestingSupport.cpp',639 'public/WebTestingSupport.h',640 632 'tests/WebUnitTests.cpp', # Components test runner support. 641 633 ], … … 1105 1097 '<(chromium_src_dir)/webkit/support/setup_third_party.gyp:third_party_headers', 1106 1098 ] 1107 }],1108 ['component!="shared_library"', {1109 'dependencies': [1110 '../../WebCore/WebCore.gyp/WebCore.gyp:webcore_test_support',1111 ],1112 'include_dirs': [1113 # WARNING: Do not view this particular case as a precedent for1114 # including WebCore headers in DumpRenderTree project.1115 '../../WebCore/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code.1116 ],1117 'sources': [1118 'src/WebTestingSupport.cpp',1119 'public/WebTestingSupport.h',1120 ],1121 1099 }], 1122 1100 ], -
trunk/Tools/ChangeLog
r87926 r87931 1 2011-06-02 Dimitri Glazkov <dglazkov@chromium.org> 2 3 Unreviewed, rolling out r87926. 4 http://trac.webkit.org/changeset/87926 5 https://bugs.webkit.org/show_bug.cgi?id=60313 6 7 Fails to find WebCoreTestSupport.dylib on bots. 8 9 * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: 10 * DumpRenderTree/chromium/TestShell.cpp: 11 (TestShell::bindJSObjectsToWindow): 12 * DumpRenderTree/mac/FrameLoadDelegate.mm: 13 (-[FrameLoadDelegate didClearWindowObjectInStandardWorldForFrame:]): 14 1 15 2011-05-21 Dimitri Glazkov <dglazkov@chromium.org> 2 16 -
trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
r87926 r87931 57 57 3A5626CB131CA02A002BE6D9 /* StorageTrackerDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A5626C1131C8B17002BE6D9 /* StorageTrackerDelegate.mm */; }; 58 58 3A5626CC131CA036002BE6D9 /* StorageTrackerDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 3A5626C0131C8B17002BE6D9 /* StorageTrackerDelegate.h */; }; 59 41230BAD138C47AE00BCCFCA /* WebCoreTestSupport.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 41230BAA138C477A00BCCFCA /* WebCoreTestSupport.dylib */; };60 417DAA1D137B3E24007C57FB /* WebCoreTestSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 417DAA1C137B3E24007C57FB /* WebCoreTestSupport.h */; };61 59 440590711268453800CFD48D /* WebArchiveDumpSupportMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 440590701268453800CFD48D /* WebArchiveDumpSupportMac.mm */; }; 62 60 4437730E125CBC3600AAE02C /* WebArchiveDumpSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44A997830FCDE86400580F10 /* WebArchiveDumpSupport.cpp */; }; … … 248 246 3A5626C0131C8B17002BE6D9 /* StorageTrackerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageTrackerDelegate.h; sourceTree = "<group>"; }; 249 247 3A5626C1131C8B17002BE6D9 /* StorageTrackerDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StorageTrackerDelegate.mm; sourceTree = "<group>"; }; 250 41230BAA138C477A00BCCFCA /* WebCoreTestSupport.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = WebCoreTestSupport.dylib; sourceTree = BUILT_PRODUCTS_DIR; };251 41230DF5138C759E00BCCFCA /* WebCoreTestSupport.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = WebCoreTestSupport.dylib; path = /Volumes/Work/WebKit/WebKitBuild/Debug/WebCoreTestSupport.dylib; sourceTree = "<absolute>"; };252 417DAA1C137B3E24007C57FB /* WebCoreTestSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebCoreTestSupport.h; path = WebCoreTestSupport/WebCoreTestSupport.h; sourceTree = BUILT_PRODUCTS_DIR; };253 248 440590701268453800CFD48D /* WebArchiveDumpSupportMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebArchiveDumpSupportMac.mm; path = mac/WebArchiveDumpSupportMac.mm; sourceTree = "<group>"; }; 254 249 44A997820FCDE86400580F10 /* WebArchiveDumpSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebArchiveDumpSupport.h; path = cf/WebArchiveDumpSupport.h; sourceTree = "<group>"; }; … … 365 360 23BCB8900EA57623003C6289 /* OpenGL.framework in Frameworks */, 366 361 9340995108540CAE007F3BC8 /* WebKit.framework in Frameworks */, 367 41230BAD138C47AE00BCCFCA /* WebCoreTestSupport.dylib in Frameworks */,368 362 ); 369 363 runOnlyForDeploymentPostprocessing = 0; … … 410 404 141BF1F5096A439800E0753C /* TestNetscapePlugIn */, 411 405 9345229B0BD12B2C0086EDA0 /* Resources */, 412 417DA9181373674D007C57FB /* WebCoreTestSupport */,413 406 A803FF6409CAACC1009B2A37 /* Frameworks */, 414 407 9340995508540CAF007F3BC8 /* Products */, 415 408 BCB281ED0CFA711D007E533E /* Configurations */, 416 41230DF5138C759E00BCCFCA /* WebCoreTestSupport.dylib */,417 409 ); 418 410 name = DumpRenderTree; … … 521 513 ); 522 514 path = mac; 523 sourceTree = "<group>";524 };525 417DA9181373674D007C57FB /* WebCoreTestSupport */ = {526 isa = PBXGroup;527 children = (528 417DAA1C137B3E24007C57FB /* WebCoreTestSupport.h */,529 41230BAA138C477A00BCCFCA /* WebCoreTestSupport.dylib */,530 );531 name = WebCoreTestSupport;532 515 sourceTree = "<group>"; 533 516 }; … … 677 660 29CFBA10122736E600BC30C0 /* AccessibilityTextMarker.h in Headers */, 678 661 3A5626CC131CA036002BE6D9 /* StorageTrackerDelegate.h in Headers */, 679 417DAA1D137B3E24007C57FB /* WebCoreTestSupport.h in Headers */,680 662 ); 681 663 runOnlyForDeploymentPostprocessing = 0; -
trunk/Tools/DumpRenderTree/chromium/TestShell.cpp
r87926 r87931 40 40 #include "WebFrame.h" 41 41 #include "WebHistoryItem.h" 42 #include "WebTestingSupport.h"43 42 #include "WebKit.h" 44 43 #include "WebPermissions.h" … … 585 584 void TestShell::bindJSObjectsToWindow(WebFrame* frame) 586 585 { 587 WebTestingSupport::injectInternalsObject(frame);588 586 m_accessibilityController->bindToJavascript(frame, WebString::fromUTF8("accessibilityController")); 589 587 m_layoutTestController->bindToJavascript(frame, WebString::fromUTF8("layoutTestController")); -
trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm
r87926 r87931 42 42 #import "PlainTextController.h" 43 43 #import "TextInputController.h" 44 #import "WebCoreTestSupport.h"45 44 #import "WorkQueue.h" 46 45 #import "WorkQueueItem.h" … … 268 267 ASSERT(!exception); 269 268 270 WebCoreTestSupport::injectInternalsObject(context);271 272 269 // Make Old-Style controllers 273 270
Note: See TracChangeset
for help on using the changeset viewer.