Changeset 87948 in webkit
- Timestamp:
- Jun 2, 2011 1:15:34 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 12 added
- 24 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r87947 r87948 1 2011-06-02 Dimitri Glazkov <dglazkov@chromium.org> 2 3 Reviewed by Darin Adler. 4 5 Add build logistics and plumbing for window.internals object. 6 https://bugs.webkit.org/show_bug.cgi?id=60313 7 8 * fast/dom/Window/script-tests/window-property-descriptors.js: Added internals object to list of properties to skip. 9 * fast/dom/Window/window-properties.html: Ditto. 10 * fast/dom/script-tests/prototype-inheritance-2.js: Ditto. 11 * fast/dom/script-tests/prototype-inheritance.js: Ditto. 12 * fast/harness/internals-object-expected.txt: Added. 13 * fast/harness/internals-object.html: Added. 14 * platform/gtk/Skipped: Skipped the newly added test until platform supports window.internals. 15 * platform/mac-wk2/Skipped: Ditto. 16 * platform/qt/Skipped: Ditto. 17 * platform/win/Skipped: Ditto. 18 1 19 2011-06-02 Adam Barth <abarth@webkit.org> 2 20 -
trunk/LayoutTests/fast/dom/Window/script-tests/window-property-descriptors.js
r87931 r87948 19 19 "plainText" : 1, 20 20 "textInputController" : 1, 21 "internals" : 1, 21 22 // Ignore these properties because they do not exist in all implementations. They will be tested separately 22 23 "WebGLRenderingContext" : 1, -
trunk/LayoutTests/fast/dom/Window/window-properties.html
r87931 r87948 61 61 "window.plainText" : 1, 62 62 "window.textInputController" : 1, 63 "window.internals" : 1, 63 64 // Ignore these properties because they do not exist in all implementations. They will be tested separately 64 65 "window.WebGLRenderingContext" : 1, -
trunk/LayoutTests/fast/dom/script-tests/prototype-inheritance-2.js
r87931 r87948 13 13 "eventSender", "objCPlugin", "objCPluginFunction", 14 14 "appleScriptController", "plainText", "accessibilityController", 15 "internals", 15 16 // Skip our test property 16 17 "isInner", -
trunk/LayoutTests/fast/dom/script-tests/prototype-inheritance.js
r87931 r87948 13 13 "eventSender", "objCPlugin", "objCPluginFunction", 14 14 "appleScriptController", "plainText", "accessibilityController", 15 "internals", 15 16 // Ignore these properties because they do not exist in all implementations. They will be tested separately 16 17 "webkitNotifications", -
trunk/LayoutTests/platform/gtk/Skipped
r87931 r87948 1532 1532 fast/events/dropzone-002.html 1533 1533 1534 # https://bugs.webkit.org/show_bug.cgi?id=61071 1535 fast/harness/internals-object.html -
trunk/LayoutTests/platform/mac-wk2/Skipped
r87931 r87948 1518 1518 editing/undo/undo-iframe-location-change.html 1519 1519 1520 # https://bugs.webkit.org/show_bug.cgi?id=61073 1521 fast/harness/internals-object.html 1522 1520 1523 ### END OF (1) Classified failures with bug reports 1521 1524 ######################################## -
trunk/LayoutTests/platform/qt/Skipped
r87931 r87948 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=61074 2532 fast/harness/internals-object.html -
trunk/LayoutTests/platform/win/Skipped
r87931 r87948 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=61076 1323 fast/harness/internals-object.html -
trunk/Source/WebCore/ChangeLog
r87942 r87948 1 2011-06-02 Dimitri Glazkov <dglazkov@chromium.org> 2 3 Reviewed by Darin Adler. 4 5 Add build logistics and plumbing for window.internals object. 6 https://bugs.webkit.org/show_bug.cgi?id=60313 7 8 Test: fast/harness/internals-object.html 9 10 * Configurations/WebCoreTestSupport.xcconfig: Added. 11 * DerivedSources.make: Added support for generating from Internals.idl. 12 * WebCore.gyp/WebCore.gyp: Added new webcore_test_support library. 13 * WebCore.gypi: Ditto. 14 * WebCore.xcodeproj/project.pbxproj: Added WebCoreTestSupport library. 15 * testing/Internals.cpp: Added. 16 * testing/Internals.h: Added. 17 * testing/Internals.idl: Added. 18 * testing/js/WebCoreTestSupport.cpp: Added. 19 * testing/js/WebCoreTestSupport.h: Added. 20 * testing/v8/WebCoreTestSupport.cpp: Added. 21 * testing/v8/WebCoreTestSupport.h: Added. 22 1 23 2011-06-01 Adrienne Walker <enne@google.com> 2 24 -
trunk/Source/WebCore/Configurations/WebCore.xcconfig
r87931 r87948 51 51 INSTALLHDRS_SCRIPT_PHASE = YES; 52 52 PRODUCT_NAME = WebCore; 53 OTHER_LDFLAGS_BASE = -l$(SQLITE3_LIBRARY) -lobjc -lANGLE ;53 OTHER_LDFLAGS_BASE = -l$(SQLITE3_LIBRARY) -lobjc -lANGLE -allowable_client WebCoreTestSupport; 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
r87931 r87948 47 47 $(WebCore)/workers \ 48 48 $(WebCore)/svg \ 49 $(WebCore)/testing \ 49 50 $(WebCore)/websockets \ 50 51 # … … 292 293 InjectedScriptHost \ 293 294 InspectorFrontendHost \ 295 Internals \ 294 296 KeyboardEvent \ 295 297 Location \ -
trunk/Source/WebCore/WebCore.exp.in
r87931 r87948 264 264 __ZN7WebCore12IconDatabase9setClientEPNS_18IconDatabaseClientE 265 265 __ZN7WebCore12IconDatabaseC1Ev 266 __ZN7WebCore12JSDOMWrapper34virtualFunctionToPreventWeakVtableEv 266 267 __ZN7WebCore12PopupMenuMacC1EPNS_15PopupMenuClientE 267 268 __ZN7WebCore12PrintContext12pagePropertyEPNS_5FrameEPKci … … 1017 1018 __ZN7WebCore9plainTextEPKNS_5RangeENS_20TextIteratorBehaviorE 1018 1019 __ZN7WebCore9toElementEN3JSC7JSValueE 1020 __ZN7WebCore17cacheDOMStructureEPNS_17JSDOMGlobalObjectEPN3JSC9StructureEPKNS2_9ClassInfoE 1021 __ZN7WebCore21getCachedDOMStructureEPNS_17JSDOMGlobalObjectEPKN3JSC9ClassInfoE 1019 1022 __ZNK3JSC8Bindings10RootObject12globalObjectEv 1020 1023 __ZNK3WTF6String14createCFStringEv … … 1312 1315 __ZNK7WebCore9PageCache21autoreleasedPageCountEv 1313 1316 __ZTVN7WebCore12ChromeClientE 1317 __ZTVN7WebCore12JSDOMWrapperE 1314 1318 __ZTVN7WebCore16IconDatabaseBaseE 1315 1319 __ZTVN7WebCore17FileChooserClientE … … 1645 1649 __ZN7WebCore13IdentifierRep7isValidEPS0_ 1646 1650 __ZN7WebCore16ScriptController16createRootObjectEPv 1647 __ZN7WebCore17cacheDOMStructureEPNS_17JSDOMGlobalObjectEPN3JSC9StructureEPKNS2_9ClassInfoE1648 __ZN7WebCore21getCachedDOMStructureEPNS_17JSDOMGlobalObjectEPKN3JSC9ClassInfoE1649 1651 __ZNK3JSC8Bindings13RuntimeObject12defaultValueEPNS_9ExecStateENS_22PreferredPrimitiveTypeE 1650 1652 __ZTVN3JSC13RuntimeMethodE -
trunk/Source/WebCore/WebCore.gyp/WebCore.gyp
r87931 r87948 458 458 # idl rules 459 459 '<@(bindings_idl_files)', 460 '<@(webcore_test_support_idl_files)', 460 461 ], 461 462 'actions': [ … … 847 848 '--include', '../storage', 848 849 '--include', '../svg', 850 '--include', '../testing', 849 851 '--include', '../webaudio', 850 852 '--include', '../websockets', … … 1728 1730 ], 1729 1731 }, 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 }, 1730 1756 ], # targets 1731 1757 } -
trunk/Source/WebCore/WebCore.gypi
r87931 r87948 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 ], 6123 6134 'webcore_resource_files': [ 6124 6135 'English.lproj/Localizable.strings', -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r87931 r87948 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 }; 10 22 5D87BB6411E3EBC100702B6F /* WebCoreExportFileGenerator Generator */ = { 11 23 isa = PBXAggregateTarget; … … 840 852 411046410FA222A600BA436A /* ScriptEventListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 4110463F0FA222A600BA436A /* ScriptEventListener.h */; }; 841 853 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 */; }; 842 856 4123E569127B3041000FEEA7 /* WindowEventContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 4123E567127B3041000FEEA7 /* WindowEventContext.h */; }; 843 857 4123E56A127B3041000FEEA7 /* WindowEventContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4123E568127B3041000FEEA7 /* WindowEventContext.cpp */; }; … … 863 877 417253AA1354BBBC00360F2A /* MediaControlElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 417253A81354BBBC00360F2A /* MediaControlElements.cpp */; }; 864 878 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, ); }; }; 865 885 41885B9311B6FDA6003383BB /* FormSubmission.h in Headers */ = {isa = PBXBuildFile; fileRef = 41885B9111B6FDA6003383BB /* FormSubmission.h */; settings = {ATTRIBUTES = (Private, ); }; }; 866 886 41885B9411B6FDA6003383BB /* FormSubmission.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41885B9211B6FDA6003383BB /* FormSubmission.cpp */; }; … … 5997 6017 5998 6018 /* 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 }; 5999 6040 5D87BB6A11E3EBD200702B6F /* PBXContainerItemProxy */ = { 6000 6041 isa = PBXContainerItemProxy; … … 7374 7415 417253A81354BBBC00360F2A /* MediaControlElements.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaControlElements.cpp; sourceTree = "<group>"; }; 7375 7416 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>"; }; 7376 7426 41885B9111B6FDA6003383BB /* FormSubmission.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormSubmission.h; sourceTree = "<group>"; }; 7377 7427 41885B9211B6FDA6003383BB /* FormSubmission.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormSubmission.cpp; sourceTree = "<group>"; }; … … 12598 12648 12599 12649 /* 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 }; 12600 12659 5D87BB4D11E3EAEB00702B6F /* Frameworks */ = { 12601 12660 isa = PBXFrameworksBuildPhase; … … 12635 12694 children = ( 12636 12695 5D87BB4F11E3EAEB00702B6F /* WebCoreExportFileGenerator */, 12696 417DA6D013734E02007C57FB /* WebCoreTestSupport.dylib */, 12637 12697 93F19B1A08245E5A001E9ABC /* WebCore.framework */, 12638 12698 ); … … 12707 12767 1AE82EC90CAAE177002237AE /* storage */, 12708 12768 B22277CA0D00BF1E0071B782 /* svg */, 12769 417DA4CD13734204007C57FB /* testing */, 12709 12770 FD315FA212B025B100C1A359 /* webaudio */, 12710 12771 518A34BD1026C831001B6896 /* websockets */, … … 12914 12975 A83B79150CCB0078000B0825 /* Storage */, 12915 12976 A83B790A0CCAFF47000B0825 /* SVG */, 12977 417DA71213735D90007C57FB /* Testing */, 12916 12978 E1C8BE4B0E8BD0D10064CB7D /* Threads */, 12917 12979 BC9854530CD3DA8F00069BC1 /* Traversal */, … … 13381 13443 1C904DF90BA9D2C80081E9D0 /* Version.xcconfig */, 13382 13444 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */, 13445 4181707D1386EDF20057AAA4 /* WebCoreTestSupport.xcconfig */, 13383 13446 ); 13384 13447 path = Configurations; … … 13579 13642 ); 13580 13643 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; 13581 13673 sourceTree = "<group>"; 13582 13674 }; … … 19891 19983 19892 19984 /* 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 }; 19893 19995 93F198A608245E59001E9ABC /* Headers */ = { 19894 19996 isa = PBXHeadersBuildPhase; … … 23012 23114 23013 23115 /* 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 }; 23014 23134 5D87BB4E11E3EAEB00702B6F /* WebCoreExportFileGenerator */ = { 23015 23135 isa = PBXNativeTarget; … … 23081 23201 projectRoot = ""; 23082 23202 targets = ( 23203 41816F7913859C550057AAA4 /* All */, 23083 23204 93F198A508245E59001E9ABC /* WebCore */, 23084 23205 DD041FBE09D9DDBE0010AF2A /* Derived Sources */, 23085 23206 5D87BB4E11E3EAEB00702B6F /* WebCoreExportFileGenerator */, 23086 23207 5D87BB6411E3EBC100702B6F /* WebCoreExportFileGenerator Generator */, 23208 417DA6CF13734E02007C57FB /* WebCoreTestSupport */, 23087 23209 ); 23088 23210 }; … … 23295 23417 23296 23418 /* 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 }; 23297 23429 5D87BB4C11E3EAEB00702B6F /* Sources */ = { 23298 23430 isa = PBXSourcesBuildPhase; … … 25707 25839 25708 25840 /* 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 }; 25709 25856 5D87BB6B11E3EBD200702B6F /* PBXTargetDependency */ = { 25710 25857 isa = PBXTargetDependency; … … 25807 25954 baseConfigurationReference = 1CDD45E60BA9C84600F90147 /* Base.xcconfig */; 25808 25955 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; 25809 25998 }; 25810 25999 name = Production; … … 25915 26104 defaultConfigurationName = Production; 25916 26105 }; 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 }; 25917 26126 5D87BB5911E3EB0700702B6F /* Build configuration list for PBXNativeTarget "WebCoreExportFileGenerator" */ = { 25918 26127 isa = XCConfigurationList; -
trunk/Source/WebCore/bindings/js/JSDOMWrapper.cpp
r87931 r87948 33 33 namespace WebCore { 34 34 35 #ifndef NDEBUG 36 37 JSDOMWrapper::~JSDOMWrapper() 35 void JSDOMWrapper::virtualFunctionToPreventWeakVtable() 38 36 { 37 ASSERT_NOT_REACHED(); 39 38 } 40 39 41 #endif42 43 40 } // namespace WebCore -
trunk/Source/WebCore/bindings/js/JSDOMWrapper.h
r87931 r87948 49 49 50 50 protected: 51 // An inline function cannot be the first non-abstract virtual function declared 52 // in the class as it results in the vtable being generated as a weak symbol. 53 virtual void virtualFunctionToPreventWeakVtable(); 54 51 55 explicit JSDOMWrapper(JSC::Structure* structure, JSC::JSGlobalObject* globalObject) 52 56 : JSObjectWithGlobalObject(globalObject, structure) … … 57 61 // ASSERT(globalObject->scriptExecutionContext()); 58 62 } 59 60 #ifndef NDEBUG61 virtual ~JSDOMWrapper();62 #endif63 63 }; 64 64 -
trunk/Source/WebKit/chromium/ChangeLog
r87944 r87948 1 2011-06-02 Dimitri Glazkov <dglazkov@chromium.org> 2 3 Reviewed by Darin Adler. 4 5 Add build logistics and plumbing for window.internals object. 6 https://bugs.webkit.org/show_bug.cgi?id=60313 7 8 * WebKit.gyp: Added linking new webkit_test_support library. 9 * public/WebTestingSupport.h: Added. 10 * src/WebTestingSupport.cpp: Added. 11 1 12 2011-06-02 Aaron Colwell <acolwell@chromium.org> 2 13 -
trunk/Source/WebKit/chromium/WebKit.gyp
r87931 r87948 604 604 'dependencies': [ 605 605 '../../WebCore/WebCore.gyp/WebCore.gyp:webcore_bindings', 606 '../../WebCore/WebCore.gyp/WebCore.gyp:webcore_test_support', 606 607 '<(chromium_src_dir)/base/base.gyp:test_support_base', 607 608 '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl', … … 628 629 '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', 629 630 ], 631 'include_dirs': [ 632 # WARNING: Do not view this particular case as a precedent for 633 # including WebCore headers in DumpRenderTree project. 634 '../../WebCore/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code. 635 ], 630 636 'sources': [ 631 637 '<@(webkit_unittest_files)', 638 'src/WebTestingSupport.cpp', 639 'public/WebTestingSupport.h', 632 640 'tests/WebUnitTests.cpp', # Components test runner support. 633 641 ], … … 1097 1105 '<(chromium_src_dir)/webkit/support/setup_third_party.gyp:third_party_headers', 1098 1106 ] 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 for 1114 # 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 ], 1099 1121 }], 1100 1122 ], -
trunk/Tools/ChangeLog
r87946 r87948 1 2011-06-02 Dimitri Glazkov <dglazkov@chromium.org> 2 3 Reviewed by Darin Adler. 4 5 Add build logistics and plumbing for window.internals object. 6 https://bugs.webkit.org/show_bug.cgi?id=60313 7 8 * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: Added linking new WebCoreTestSupport library. 9 * DumpRenderTree/chromium/TestShell.cpp: 10 (TestShell::bindJSObjectsToWindow): Added injection code. 11 * DumpRenderTree/mac/FrameLoadDelegate.mm: 12 (-[FrameLoadDelegate didClearWindowObjectInStandardWorldForFrame:]): Ditto. 13 1 14 2011-06-02 Hao Zheng <zhenghao@chromium.org> 2 15 -
trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
r87931 r87948 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 */; }; 59 61 440590711268453800CFD48D /* WebArchiveDumpSupportMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 440590701268453800CFD48D /* WebArchiveDumpSupportMac.mm */; }; 60 62 4437730E125CBC3600AAE02C /* WebArchiveDumpSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44A997830FCDE86400580F10 /* WebArchiveDumpSupport.cpp */; }; … … 246 248 3A5626C0131C8B17002BE6D9 /* StorageTrackerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageTrackerDelegate.h; sourceTree = "<group>"; }; 247 249 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; }; 248 253 440590701268453800CFD48D /* WebArchiveDumpSupportMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebArchiveDumpSupportMac.mm; path = mac/WebArchiveDumpSupportMac.mm; sourceTree = "<group>"; }; 249 254 44A997820FCDE86400580F10 /* WebArchiveDumpSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebArchiveDumpSupport.h; path = cf/WebArchiveDumpSupport.h; sourceTree = "<group>"; }; … … 360 365 23BCB8900EA57623003C6289 /* OpenGL.framework in Frameworks */, 361 366 9340995108540CAE007F3BC8 /* WebKit.framework in Frameworks */, 367 41230BAD138C47AE00BCCFCA /* WebCoreTestSupport.dylib in Frameworks */, 362 368 ); 363 369 runOnlyForDeploymentPostprocessing = 0; … … 404 410 141BF1F5096A439800E0753C /* TestNetscapePlugIn */, 405 411 9345229B0BD12B2C0086EDA0 /* Resources */, 412 417DA9181373674D007C57FB /* WebCoreTestSupport */, 406 413 A803FF6409CAACC1009B2A37 /* Frameworks */, 407 414 9340995508540CAF007F3BC8 /* Products */, 408 415 BCB281ED0CFA711D007E533E /* Configurations */, 416 41230DF5138C759E00BCCFCA /* WebCoreTestSupport.dylib */, 409 417 ); 410 418 name = DumpRenderTree; … … 513 521 ); 514 522 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; 515 532 sourceTree = "<group>"; 516 533 }; … … 660 677 29CFBA10122736E600BC30C0 /* AccessibilityTextMarker.h in Headers */, 661 678 3A5626CC131CA036002BE6D9 /* StorageTrackerDelegate.h in Headers */, 679 417DAA1D137B3E24007C57FB /* WebCoreTestSupport.h in Headers */, 662 680 ); 663 681 runOnlyForDeploymentPostprocessing = 0; -
trunk/Tools/DumpRenderTree/chromium/TestShell.cpp
r87931 r87948 40 40 #include "WebFrame.h" 41 41 #include "WebHistoryItem.h" 42 #include "WebTestingSupport.h" 42 43 #include "WebKit.h" 43 44 #include "WebPermissions.h" … … 584 585 void TestShell::bindJSObjectsToWindow(WebFrame* frame) 585 586 { 587 WebTestingSupport::injectInternalsObject(frame); 586 588 m_accessibilityController->bindToJavascript(frame, WebString::fromUTF8("accessibilityController")); 587 589 m_layoutTestController->bindToJavascript(frame, WebString::fromUTF8("layoutTestController")); -
trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm
r87931 r87948 42 42 #import "PlainTextController.h" 43 43 #import "TextInputController.h" 44 #import "WebCoreTestSupport.h" 44 45 #import "WorkQueue.h" 45 46 #import "WorkQueueItem.h" … … 267 268 ASSERT(!exception); 268 269 270 WebCoreTestSupport::injectInternalsObject(context); 271 269 272 // Make Old-Style controllers 270 273
Note: See TracChangeset
for help on using the changeset viewer.