Changeset 87931 in webkit


Ignore:
Timestamp:
Jun 2, 2011 11:05:09 AM (13 years ago)
Author:
Dimitri Glazkov
Message:

2011-06-02 Dimitri Glazkov <Dimitri Glazkov>

Unreviewed, rolling out r87926.
http://trac.webkit.org/changeset/87926
https://bugs.webkit.org/show_bug.cgi?id=60313

Fails to find WebCoreTestSupport.dylib on bots.

  • fast/dom/Window/script-tests/window-property-descriptors.js:
  • fast/dom/Window/window-properties.html:
  • fast/dom/script-tests/prototype-inheritance-2.js:
  • fast/dom/script-tests/prototype-inheritance.js:
  • fast/harness/internals-object-expected.txt: Removed.
  • fast/harness/internals-object.html: Removed.
  • platform/gtk/Skipped:
  • platform/mac-wk2/Skipped:
  • platform/qt/Skipped:
  • platform/win/Skipped:

2011-06-02 Dimitri Glazkov <Dimitri Glazkov>

Unreviewed, rolling out r87926.
http://trac.webkit.org/changeset/87926
https://bugs.webkit.org/show_bug.cgi?id=60313

Fails to find WebCoreTestSupport.dylib on bots.

  • Configurations/WebCore.xcconfig:
  • Configurations/WebCoreTestSupport.xcconfig: Removed.
  • DerivedSources.make:
  • WebCore.exp.in:
  • WebCore.gyp/WebCore.gyp:
  • WebCore.gypi:
  • WebCore.xcodeproj/project.pbxproj:
  • bindings/js/JSDOMWrapper.cpp: (WebCore::JSDOMWrapper::~JSDOMWrapper):
  • bindings/js/JSDOMWrapper.h:
  • testing/Internals.cpp: Removed.
  • testing/Internals.h: Removed.
  • testing/Internals.idl: Removed.
  • testing/js/WebCoreTestSupport.cpp: Removed.
  • testing/js/WebCoreTestSupport.h: Removed.
  • testing/v8/WebCoreTestSupport.cpp: Removed.
  • testing/v8/WebCoreTestSupport.h: Removed.

2011-06-02 Dimitri Glazkov <Dimitri Glazkov>

Unreviewed, rolling out r87926.
http://trac.webkit.org/changeset/87926
https://bugs.webkit.org/show_bug.cgi?id=60313

Fails to find WebCoreTestSupport.dylib on bots.

  • WebKit.gyp:
  • public/WebTestingSupport.h: Removed.
  • src/WebTestingSupport.cpp: Removed.

2011-06-02 Dimitri Glazkov <Dimitri Glazkov>

Unreviewed, rolling out r87926.
http://trac.webkit.org/changeset/87926
https://bugs.webkit.org/show_bug.cgi?id=60313

Fails to find WebCoreTestSupport.dylib on bots.

  • DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
  • DumpRenderTree/chromium/TestShell.cpp: (TestShell::bindJSObjectsToWindow):
  • DumpRenderTree/mac/FrameLoadDelegate.mm: (-[FrameLoadDelegate didClearWindowObjectInStandardWorldForFrame:]):
Location:
trunk
Files:
12 deleted
24 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r87929 r87931  
     12011-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
    1202011-06-02  Adam Barth  <abarth@webkit.org>
    221
  • trunk/LayoutTests/fast/dom/Window/script-tests/window-property-descriptors.js

    r87926 r87931  
    1919    "plainText" : 1,
    2020    "textInputController" : 1,
    21     "internals" : 1,
    2221    // Ignore these properties because they do not exist in all implementations. They will be tested separately
    2322    "WebGLRenderingContext" : 1,
  • trunk/LayoutTests/fast/dom/Window/window-properties.html

    r87926 r87931  
    6161    "window.plainText" : 1,
    6262    "window.textInputController" : 1,
    63     "window.internals" : 1,
    6463    // Ignore these properties because they do not exist in all implementations. They will be tested separately
    6564    "window.WebGLRenderingContext" : 1,
  • trunk/LayoutTests/fast/dom/script-tests/prototype-inheritance-2.js

    r87926 r87931  
    1313    "eventSender", "objCPlugin", "objCPluginFunction",
    1414    "appleScriptController", "plainText", "accessibilityController",
    15     "internals",
    1615    // Skip our test property
    1716    "isInner",
  • trunk/LayoutTests/fast/dom/script-tests/prototype-inheritance.js

    r87926 r87931  
    1313    "eventSender", "objCPlugin", "objCPluginFunction",
    1414    "appleScriptController", "plainText", "accessibilityController",
    15     "internals",
    1615    // Ignore these properties because they do not exist in all implementations. They will be tested separately
    1716    "webkitNotifications",
  • trunk/LayoutTests/platform/gtk/Skipped

    r87926 r87931  
    15321532fast/events/dropzone-002.html
    15331533
    1534 # https://bugs.webkit.org/show_bug.cgi?id=61071
    1535 fast/harness/internals-object.html
  • trunk/LayoutTests/platform/mac-wk2/Skipped

    r87926 r87931  
    15181518editing/undo/undo-iframe-location-change.html
    15191519
    1520 # https://bugs.webkit.org/show_bug.cgi?id=61073
    1521 fast/harness/internals-object.html
    1522 
    15231520### END OF (1) Classified failures with bug reports
    15241521########################################
  • trunk/LayoutTests/platform/qt/Skipped

    r87926 r87931  
    25282528# JSC does not support setIsolatedWorldSecurityOrigin (http://webkit.org/b/61540)
    25292529http/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

    r87926 r87931  
    13191319# JSC does not support setIsolatedWorldSecurityOrigin (http://webkit.org/b/61540)
    13201320http/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

    r87930 r87931  
     12011-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
    1272011-06-02  Carlos Garcia Campos  <cgarcia@igalia.com>
    228
  • trunk/Source/WebCore/Configurations/WebCore.xcconfig

    r87926 r87931  
    5151INSTALLHDRS_SCRIPT_PHASE = YES;
    5252PRODUCT_NAME = WebCore;
    53 OTHER_LDFLAGS_BASE = -l$(SQLITE3_LIBRARY) -lobjc -lANGLE -allowable_client WebCoreTestSupport;
     53OTHER_LDFLAGS_BASE = -l$(SQLITE3_LIBRARY) -lobjc -lANGLE;
    5454OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(REAL_PLATFORM_NAME));
    5555OTHER_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  
    4747    $(WebCore)/workers \
    4848    $(WebCore)/svg \
    49     $(WebCore)/testing \
    5049    $(WebCore)/websockets \
    5150#
     
    293292    InjectedScriptHost \
    294293    InspectorFrontendHost \
    295     Internals \
    296294    KeyboardEvent \
    297295    Location \
  • trunk/Source/WebCore/WebCore.exp.in

    r87926 r87931  
    264264__ZN7WebCore12IconDatabase9setClientEPNS_18IconDatabaseClientE
    265265__ZN7WebCore12IconDatabaseC1Ev
    266 __ZN7WebCore12JSDOMWrapper34virtualFunctionToPreventWeakVtableEv
    267266__ZN7WebCore12PopupMenuMacC1EPNS_15PopupMenuClientE
    268267__ZN7WebCore12PrintContext12pagePropertyEPNS_5FrameEPKci
     
    10181017__ZN7WebCore9plainTextEPKNS_5RangeENS_20TextIteratorBehaviorE
    10191018__ZN7WebCore9toElementEN3JSC7JSValueE
    1020 __ZN7WebCore17cacheDOMStructureEPNS_17JSDOMGlobalObjectEPN3JSC9StructureEPKNS2_9ClassInfoE
    1021 __ZN7WebCore21getCachedDOMStructureEPNS_17JSDOMGlobalObjectEPKN3JSC9ClassInfoE
    10221019__ZNK3JSC8Bindings10RootObject12globalObjectEv
    10231020__ZNK3WTF6String14createCFStringEv
     
    13151312__ZNK7WebCore9PageCache21autoreleasedPageCountEv
    13161313__ZTVN7WebCore12ChromeClientE
    1317 __ZTVN7WebCore12JSDOMWrapperE
    13181314__ZTVN7WebCore16IconDatabaseBaseE
    13191315__ZTVN7WebCore17FileChooserClientE
     
    16491645__ZN7WebCore13IdentifierRep7isValidEPS0_
    16501646__ZN7WebCore16ScriptController16createRootObjectEPv
     1647__ZN7WebCore17cacheDOMStructureEPNS_17JSDOMGlobalObjectEPN3JSC9StructureEPKNS2_9ClassInfoE
     1648__ZN7WebCore21getCachedDOMStructureEPNS_17JSDOMGlobalObjectEPKN3JSC9ClassInfoE
    16511649__ZNK3JSC8Bindings13RuntimeObject12defaultValueEPNS_9ExecStateENS_22PreferredPrimitiveTypeE
    16521650__ZTVN3JSC13RuntimeMethodE
  • trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

    r87926 r87931  
    458458        # idl rules
    459459        '<@(bindings_idl_files)',
    460         '<@(webcore_test_support_idl_files)',
    461460      ],
    462461      'actions': [
     
    848847              '--include', '../storage',
    849848              '--include', '../svg',
    850               '--include', '../testing',
    851849              '--include', '../webaudio',
    852850              '--include', '../websockets',
     
    17301728      ],
    17311729    },
    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     },
    17561730  ],  # targets
    17571731}
  • trunk/Source/WebCore/WebCore.gypi

    r87926 r87931  
    61216121            'xml/XSLTUnicodeSort.h',
    61226122        ],
    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         ],
    61346123        'webcore_resource_files': [
    61356124            'English.lproj/Localizable.strings',
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r87926 r87931  
    88
    99/* 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                 };
    2210                5D87BB6411E3EBC100702B6F /* WebCoreExportFileGenerator Generator */ = {
    2311                        isa = PBXAggregateTarget;
     
    852840                411046410FA222A600BA436A /* ScriptEventListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 4110463F0FA222A600BA436A /* ScriptEventListener.h */; };
    853841                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 */; };
    856842                4123E569127B3041000FEEA7 /* WindowEventContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 4123E567127B3041000FEEA7 /* WindowEventContext.h */; };
    857843                4123E56A127B3041000FEEA7 /* WindowEventContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4123E568127B3041000FEEA7 /* WindowEventContext.cpp */; };
     
    877863                417253AA1354BBBC00360F2A /* MediaControlElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 417253A81354BBBC00360F2A /* MediaControlElements.cpp */; };
    878864                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, ); }; };
    885865                41885B9311B6FDA6003383BB /* FormSubmission.h in Headers */ = {isa = PBXBuildFile; fileRef = 41885B9111B6FDA6003383BB /* FormSubmission.h */; settings = {ATTRIBUTES = (Private, ); }; };
    886866                41885B9411B6FDA6003383BB /* FormSubmission.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41885B9211B6FDA6003383BB /* FormSubmission.cpp */; };
     
    60175997
    60185998/* 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                 };
    60405999                5D87BB6A11E3EBD200702B6F /* PBXContainerItemProxy */ = {
    60416000                        isa = PBXContainerItemProxy;
     
    74157374                417253A81354BBBC00360F2A /* MediaControlElements.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaControlElements.cpp; sourceTree = "<group>"; };
    74167375                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>"; };
    74267376                41885B9111B6FDA6003383BB /* FormSubmission.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormSubmission.h; sourceTree = "<group>"; };
    74277377                41885B9211B6FDA6003383BB /* FormSubmission.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormSubmission.cpp; sourceTree = "<group>"; };
     
    1264812598
    1264912599/* 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                 };
    1265912600                5D87BB4D11E3EAEB00702B6F /* Frameworks */ = {
    1266012601                        isa = PBXFrameworksBuildPhase;
     
    1269412635                        children = (
    1269512636                                5D87BB4F11E3EAEB00702B6F /* WebCoreExportFileGenerator */,
    12696                                 417DA6D013734E02007C57FB /* WebCoreTestSupport.dylib */,
    1269712637                                93F19B1A08245E5A001E9ABC /* WebCore.framework */,
    1269812638                        );
     
    1276712707                                1AE82EC90CAAE177002237AE /* storage */,
    1276812708                                B22277CA0D00BF1E0071B782 /* svg */,
    12769                                 417DA4CD13734204007C57FB /* testing */,
    1277012709                                FD315FA212B025B100C1A359 /* webaudio */,
    1277112710                                518A34BD1026C831001B6896 /* websockets */,
     
    1297512914                                A83B79150CCB0078000B0825 /* Storage */,
    1297612915                                A83B790A0CCAFF47000B0825 /* SVG */,
    12977                                 417DA71213735D90007C57FB /* Testing */,
    1297812916                                E1C8BE4B0E8BD0D10064CB7D /* Threads */,
    1297912917                                BC9854530CD3DA8F00069BC1 /* Traversal */,
     
    1344313381                                1C904DF90BA9D2C80081E9D0 /* Version.xcconfig */,
    1344413382                                1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */,
    13445                                 4181707D1386EDF20057AAA4 /* WebCoreTestSupport.xcconfig */,
    1344613383                        );
    1344713384                        path = Configurations;
     
    1364213579                        );
    1364313580                        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;
    1367313581                        sourceTree = "<group>";
    1367413582                };
     
    1998319891
    1998419892/* 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                 };
    1999519893                93F198A608245E59001E9ABC /* Headers */ = {
    1999619894                        isa = PBXHeadersBuildPhase;
     
    2311423012
    2311523013/* 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                 };
    2313423014                5D87BB4E11E3EAEB00702B6F /* WebCoreExportFileGenerator */ = {
    2313523015                        isa = PBXNativeTarget;
     
    2320123081                        projectRoot = "";
    2320223082                        targets = (
    23203                                 41816F7913859C550057AAA4 /* All */,
    2320423083                                93F198A508245E59001E9ABC /* WebCore */,
    2320523084                                DD041FBE09D9DDBE0010AF2A /* Derived Sources */,
    2320623085                                5D87BB4E11E3EAEB00702B6F /* WebCoreExportFileGenerator */,
    2320723086                                5D87BB6411E3EBC100702B6F /* WebCoreExportFileGenerator Generator */,
    23208                                 417DA6CF13734E02007C57FB /* WebCoreTestSupport */,
    2320923087                        );
    2321023088                };
     
    2341723295
    2341823296/* 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                 };
    2342923297                5D87BB4C11E3EAEB00702B6F /* Sources */ = {
    2343023298                        isa = PBXSourcesBuildPhase;
     
    2583925707
    2584025708/* 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                 };
    2585625709                5D87BB6B11E3EBD200702B6F /* PBXTargetDependency */ = {
    2585725710                        isa = PBXTargetDependency;
     
    2595425807                        baseConfigurationReference = 1CDD45E60BA9C84600F90147 /* Base.xcconfig */;
    2595525808                        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;
    2599825809                        };
    2599925810                        name = Production;
     
    2610425915                        defaultConfigurationName = Production;
    2610525916                };
    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                 };
    2612625917                5D87BB5911E3EB0700702B6F /* Build configuration list for PBXNativeTarget "WebCoreExportFileGenerator" */ = {
    2612725918                        isa = XCConfigurationList;
  • trunk/Source/WebCore/bindings/js/JSDOMWrapper.cpp

    r87926 r87931  
    3333namespace WebCore {
    3434
    35 void JSDOMWrapper::virtualFunctionToPreventWeakVtable()
     35#ifndef NDEBUG
     36
     37JSDOMWrapper::~JSDOMWrapper()
    3638{
    37     ASSERT_NOT_REACHED();
    3839}
    3940
     41#endif
     42
    4043} // namespace WebCore
  • trunk/Source/WebCore/bindings/js/JSDOMWrapper.h

    r87926 r87931  
    4949
    5050protected:
    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 
    5551    explicit JSDOMWrapper(JSC::Structure* structure, JSC::JSGlobalObject* globalObject)
    5652        : JSObjectWithGlobalObject(globalObject, structure)
     
    6157        // ASSERT(globalObject->scriptExecutionContext());
    6258    }
     59
     60#ifndef NDEBUG
     61    virtual ~JSDOMWrapper();
     62#endif
    6363};
    6464
  • trunk/Source/WebKit/chromium/ChangeLog

    r87927 r87931  
     12011-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
    1132011-06-02  Aaron Colwell  <acolwell@chromium.org>
    214
  • trunk/Source/WebKit/chromium/WebKit.gyp

    r87926 r87931  
    604604                            'dependencies': [
    605605                                '../../WebCore/WebCore.gyp/WebCore.gyp:webcore_bindings',
    606                                 '../../WebCore/WebCore.gyp/WebCore.gyp:webcore_test_support',
    607606                                '<(chromium_src_dir)/base/base.gyp:test_support_base',
    608607                                '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
     
    629628                                '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
    630629                            ],
    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                             ],
    636630                            'sources': [
    637631                                '<@(webkit_unittest_files)',
    638                                 'src/WebTestingSupport.cpp',
    639                                 'public/WebTestingSupport.h',
    640632                                'tests/WebUnitTests.cpp',   # Components test runner support.
    641633                            ],
     
    11051097                        '<(chromium_src_dir)/webkit/support/setup_third_party.gyp:third_party_headers',
    11061098                    ]
    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                     ],
    11211099                }],
    11221100            ],
  • trunk/Tools/ChangeLog

    r87926 r87931  
     12011-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
    1152011-05-21  Dimitri Glazkov  <dglazkov@chromium.org>
    216
  • trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj

    r87926 r87931  
    5757                3A5626CB131CA02A002BE6D9 /* StorageTrackerDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A5626C1131C8B17002BE6D9 /* StorageTrackerDelegate.mm */; };
    5858                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 */; };
    6159                440590711268453800CFD48D /* WebArchiveDumpSupportMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 440590701268453800CFD48D /* WebArchiveDumpSupportMac.mm */; };
    6260                4437730E125CBC3600AAE02C /* WebArchiveDumpSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44A997830FCDE86400580F10 /* WebArchiveDumpSupport.cpp */; };
     
    248246                3A5626C0131C8B17002BE6D9 /* StorageTrackerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageTrackerDelegate.h; sourceTree = "<group>"; };
    249247                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; };
    253248                440590701268453800CFD48D /* WebArchiveDumpSupportMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebArchiveDumpSupportMac.mm; path = mac/WebArchiveDumpSupportMac.mm; sourceTree = "<group>"; };
    254249                44A997820FCDE86400580F10 /* WebArchiveDumpSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebArchiveDumpSupport.h; path = cf/WebArchiveDumpSupport.h; sourceTree = "<group>"; };
     
    365360                                23BCB8900EA57623003C6289 /* OpenGL.framework in Frameworks */,
    366361                                9340995108540CAE007F3BC8 /* WebKit.framework in Frameworks */,
    367                                 41230BAD138C47AE00BCCFCA /* WebCoreTestSupport.dylib in Frameworks */,
    368362                        );
    369363                        runOnlyForDeploymentPostprocessing = 0;
     
    410404                                141BF1F5096A439800E0753C /* TestNetscapePlugIn */,
    411405                                9345229B0BD12B2C0086EDA0 /* Resources */,
    412                                 417DA9181373674D007C57FB /* WebCoreTestSupport */,
    413406                                A803FF6409CAACC1009B2A37 /* Frameworks */,
    414407                                9340995508540CAF007F3BC8 /* Products */,
    415408                                BCB281ED0CFA711D007E533E /* Configurations */,
    416                                 41230DF5138C759E00BCCFCA /* WebCoreTestSupport.dylib */,
    417409                        );
    418410                        name = DumpRenderTree;
     
    521513                        );
    522514                        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;
    532515                        sourceTree = "<group>";
    533516                };
     
    677660                                29CFBA10122736E600BC30C0 /* AccessibilityTextMarker.h in Headers */,
    678661                                3A5626CC131CA036002BE6D9 /* StorageTrackerDelegate.h in Headers */,
    679                                 417DAA1D137B3E24007C57FB /* WebCoreTestSupport.h in Headers */,
    680662                        );
    681663                        runOnlyForDeploymentPostprocessing = 0;
  • trunk/Tools/DumpRenderTree/chromium/TestShell.cpp

    r87926 r87931  
    4040#include "WebFrame.h"
    4141#include "WebHistoryItem.h"
    42 #include "WebTestingSupport.h"
    4342#include "WebKit.h"
    4443#include "WebPermissions.h"
     
    585584void TestShell::bindJSObjectsToWindow(WebFrame* frame)
    586585{
    587     WebTestingSupport::injectInternalsObject(frame);
    588586    m_accessibilityController->bindToJavascript(frame, WebString::fromUTF8("accessibilityController"));
    589587    m_layoutTestController->bindToJavascript(frame, WebString::fromUTF8("layoutTestController"));
  • trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm

    r87926 r87931  
    4242#import "PlainTextController.h"
    4343#import "TextInputController.h"
    44 #import "WebCoreTestSupport.h"
    4544#import "WorkQueue.h"
    4645#import "WorkQueueItem.h"
     
    268267    ASSERT(!exception);
    269268
    270     WebCoreTestSupport::injectInternalsObject(context);
    271 
    272269    // Make Old-Style controllers
    273270
Note: See TracChangeset for help on using the changeset viewer.