Changeset 86869 in webkit


Ignore:
Timestamp:
May 19, 2011 11:54:23 AM (13 years ago)
Author:
Dimitri Glazkov
Message:

2011-05-18 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Darin Adler.

Add build logistics and plumbing for window.internals object.
​https://bugs.webkit.org/show_bug.cgi?id=60313

  • fast/dom/Window/script-tests/window-property-descriptors.js: Added internals object to list of properties to skip.
  • fast/dom/Window/window-properties.html: Ditto.
  • fast/dom/script-tests/prototype-inheritance-2.js: Ditto.
  • fast/dom/script-tests/prototype-inheritance.js: Ditto.
  • fast/harness/internals-object-expected.txt: Added.
  • fast/harness/internals-object.html: Added.
  • platform/gtk/Skipped: Skipped the newly added test until platform supports window.internals.
  • platform/mac-wk2/Skipped: Ditto.
  • platform/qt/Skipped: Ditto.
  • platform/win/Skipped: Ditto.

2011-05-18 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Darin Adler.

Add build logistics and plumbing for window.internals object.
​https://bugs.webkit.org/show_bug.cgi?id=60313

Test: fast/harness/internals-object.html

  • DerivedSources.make: Added support for generating from Internals.idl.
  • WebCore.gyp/WebCore.gyp: Added new webcore_test_support library.
  • WebCore.gypi: Ditto.
  • WebCore.xcodeproj/project.pbxproj: Added WebCoreTestSupport library.
  • testing/Internals.cpp: Added.
  • testing/Internals.h: Added.
  • testing/Internals.idl: Added.
  • testing/js/WebCoreTestSupport.cpp: Added.
  • testing/js/WebCoreTestSupport.h: Added.
  • testing/v8/WebCoreTestSupport.cpp: Added.
  • testing/v8/WebCoreTestSupport.h: Added.

2011-05-18 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Darin Adler.

Add build logistics and plumbing for window.internals object.
​https://bugs.webkit.org/show_bug.cgi?id=60313

  • WebKit.gyp: Added linking new webkit_test_support library.
  • public/WebTestingSupport.h: Added.
  • src/WebTestingSupport.cpp: Added.

2011-05-18 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Darin Adler.

Add build logistics and plumbing for window.internals object.
​https://bugs.webkit.org/show_bug.cgi?id=60313

  • DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: Added linking new WebCoreTestSupport library.
  • DumpRenderTree/chromium/TestShell.cpp: (TestShell::bindJSObjectsToWindow): Added injection code.
  • DumpRenderTree/mac/FrameLoadDelegate.mm: (-[FrameLoadDelegate didClearWindowObjectInStandardWorldForFrame:]): Ditto.
Location:
trunk
Files:
14 added
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r86853 r86869  
     12011-05-18  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
    1192011-05-19  Ryosuke Niwa  <rniwa@webkit.org>
    220

  • trunk/LayoutTests/fast/dom/Window/script-tests/window-property-descriptors.js

    r83884 r86869  
    1919    "plainText" : 1,
    2020    "textInputController" : 1,
     21    "internals" : 1,
    2122    // Ignore these properties because they do not exist in all implementations. They will be tested separately
    2223    "WebGLRenderingContext" : 1,

  • trunk/LayoutTests/fast/dom/Window/window-properties.html

    r83884 r86869  
    6161    "window.plainText" : 1,
    6262    "window.textInputController" : 1,
     63    "window.internals" : 1,
    6364    // Ignore these properties because they do not exist in all implementations. They will be tested separately
    6465    "window.WebGLRenderingContext" : 1,

  • trunk/LayoutTests/fast/dom/script-tests/prototype-inheritance-2.js

    r84670 r86869  
    1313    "eventSender", "objCPlugin", "objCPluginFunction",
    1414    "appleScriptController", "plainText", "accessibilityController",
     15    "internals",
    1516    // Skip our test property
    1617    "isInner",

  • trunk/LayoutTests/fast/dom/script-tests/prototype-inheritance.js

    r84224 r86869  
    1313    "eventSender", "objCPlugin", "objCPluginFunction",
    1414    "appleScriptController", "plainText", "accessibilityController",
     15    "internals",
    1516    // Ignore these properties because they do not exist in all implementations. They will be tested separately
    1617    "webkitNotifications",

  • trunk/LayoutTests/platform/gtk/Skipped

    r86843 r86869  
    14441444# https://bugs.webkit.org/show_bug.cgi?id=61122
    14451445http/tests/navigation/post-307-response.html
     1446
     1447# https://bugs.webkit.org/show_bug.cgi?id=61071
     1448fast/harness/internals-object.html

  • trunk/LayoutTests/platform/mac-wk2/Skipped

    r86770 r86869  
    15341534transitions/transition-timing-function.html
    15351535
     1536# https://bugs.webkit.org/show_bug.cgi?id=61073
     1537fast/harness/internals-object.html
     1538
    15361539### END OF (1) Classified failures with bug reports
    15371540########################################

  • trunk/LayoutTests/platform/qt/Skipped

    r86841 r86869  
    25342534# https://bugs.webkit.org/show_bug.cgi?id=60834
    25352535plugins/get-url-with-javascript-url.html
     2536
     2537# https://bugs.webkit.org/show_bug.cgi?id=61074
     2538fast/harness/internals-object.html

  • trunk/LayoutTests/platform/win/Skipped

    r86764 r86869  
    13001300# Unskip after implementing LayoutTestController::setDefersLoading and ::goBack.
    13011301loader/navigation-while-deferring-loads.html
     1302
     1303# https://bugs.webkit.org/show_bug.cgi?id=61076
     1304fast/harness/internals-object.html

  • trunk/Source/WebCore/ChangeLog

    r86863 r86869  
     12011-05-18  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        * DerivedSources.make: Added support for generating from Internals.idl.
     11        * WebCore.gyp/WebCore.gyp: Added new webcore_test_support library.
     12        * WebCore.gypi: Ditto.
     13        * WebCore.xcodeproj/project.pbxproj: Added WebCoreTestSupport library.
     14        * testing/Internals.cpp: Added.
     15        * testing/Internals.h: Added.
     16        * testing/Internals.idl: Added.
     17        * testing/js/WebCoreTestSupport.cpp: Added.
     18        * testing/js/WebCoreTestSupport.h: Added.
     19        * testing/v8/WebCoreTestSupport.cpp: Added.
     20        * testing/v8/WebCoreTestSupport.h: Added.
     21
    1222011-05-19  Dimitri Glazkov  <dglazkov@chromium.org>
    223

  • trunk/Source/WebCore/DerivedSources.make

    r86764 r86869  
    4747    $(WebCore)/workers \
    4848    $(WebCore)/svg \
     49    $(WebCore)/testing \
    4950    $(WebCore)/websockets \
    5051#
    … …  
    289290    InjectedScriptHost \
    290291    InspectorFrontendHost \
     292    Internals \
    291293    KeyboardEvent \
    292294    Location \

  • trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

    r86631 r86869  
    456456        # idl rules
    457457        '<@(bindings_idl_files)',
     458        '<@(webcore_test_support_idl_files)',
    458459      ],
    459460      'actions': [
    … …  
    832833              '--include', '../storage',
    833834              '--include', '../svg',
     835              '--include', '../testing',
    834836              '--include', '../webaudio',
    835837              '--include', '../websockets',
    … …  
    17141716      ],
    17151717    },
     1718    {
     1719      'target_name': 'webcore_test_support',
     1720      'type': 'static_library',
     1721      'dependencies': [
     1722        'webcore',
     1723      ],
     1724      'include_dirs': [
     1725        '<(INTERMEDIATE_DIR)',
     1726        '<(SHARED_INTERMEDIATE_DIR)/webcore',
     1727        '<(SHARED_INTERMEDIATE_DIR)/webkit',
     1728        '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings',
     1729        '<@(webcore_include_dirs)',
     1730        '../testing',
     1731        '../testing/v8',
     1732      ],
     1733      'sources': [
     1734        '<@(webcore_test_support_files)',
     1735        '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/V8Internals.cpp',
     1736        '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8Internals.h',
     1737      ],
     1738      'sources/': [
     1739        ['exclude', 'testing/js'],
     1740      ],
     1741    },
    17161742  ],  # targets
    17171743}

  • trunk/Source/WebCore/WebCore.gypi

    r86854 r86869  
    60906090            'xml/XSLTUnicodeSort.h',
    60916091        ],
     6092        'webcore_test_support_idl_files': [
     6093          'testing/Internals.idl',
     6094        ],
     6095        'webcore_test_support_files': [
     6096            'testing/v8/WebCoreTestSupport.cpp',
     6097            'testing/v8/WebCoreTestSupport.h',
     6098            'testing/js/WebCoreTestSupport.cpp',
     6099            'testing/js/WebCoreTestSupport.h',
     6100            'testing/Internals.cpp',
     6101            'testing/Internals.h',
     6102        ],
    60926103        'webcore_resource_files': [
    60936104            'English.lproj/Localizable.strings',

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r86863 r86869  
    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                };
    1022                5D87BB6411E3EBC100702B6F /* WebCoreExportFileGenerator Generator */ = {
    1123                        isa = PBXAggregateTarget;
    … …  
    853865                417253AA1354BBBC00360F2A /* MediaControlElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 417253A81354BBBC00360F2A /* MediaControlElements.cpp */; };
    854866                417253AB1354BBBC00360F2A /* MediaControlElements.h in Headers */ = {isa = PBXBuildFile; fileRef = 417253A91354BBBC00360F2A /* MediaControlElements.h */; };
     867                417DA6D913734E6E007C57FB /* Internals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 417DA4CF13734326007C57FB /* Internals.cpp */; };
     868                417DA6DA13734E6E007C57FB /* Internals.h in Headers */ = {isa = PBXBuildFile; fileRef = 417DA4CE13734326007C57FB /* Internals.h */; };
     869                417DA71D13735DFA007C57FB /* JSInternals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 417DA71B13735DFA007C57FB /* JSInternals.cpp */; };
     870                417DA71E13735DFA007C57FB /* JSInternals.h in Headers */ = {isa = PBXBuildFile; fileRef = 417DA71C13735DFA007C57FB /* JSInternals.h */; };
     871                41815C1E138319830057AAA4 /* WebCoreTestSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41815C1C138319830057AAA4 /* WebCoreTestSupport.cpp */; };
     872                41815C1F138319830057AAA4 /* WebCoreTestSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 41815C1D138319830057AAA4 /* WebCoreTestSupport.h */; settings = {ATTRIBUTES = (Private, ); }; };
    855873                41885B9311B6FDA6003383BB /* FormSubmission.h in Headers */ = {isa = PBXBuildFile; fileRef = 41885B9111B6FDA6003383BB /* FormSubmission.h */; settings = {ATTRIBUTES = (Private, ); }; };
    856874                41885B9411B6FDA6003383BB /* FormSubmission.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41885B9211B6FDA6003383BB /* FormSubmission.cpp */; };
    … …  
    59545972
    59555973/* Begin PBXContainerItemProxy section */
     5974                417DA6D413734E0D007C57FB /* PBXContainerItemProxy */ = {
     5975                        isa = PBXContainerItemProxy;
     5976                        containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
     5977                        proxyType = 1;
     5978                        remoteGlobalIDString = 93F198A508245E59001E9ABC;
     5979                        remoteInfo = WebCore;
     5980                };
     5981                41816F8213859C7A0057AAA4 /* PBXContainerItemProxy */ = {
     5982                        isa = PBXContainerItemProxy;
     5983                        containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
     5984                        proxyType = 1;
     5985                        remoteGlobalIDString = 93F198A508245E59001E9ABC /* WebCore */;
     5986                        remoteInfo = WebCore;
     5987                };
     5988                41816F8413859C7D0057AAA4 /* PBXContainerItemProxy */ = {
     5989                        isa = PBXContainerItemProxy;
     5990                        containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
     5991                        proxyType = 1;
     5992                        remoteGlobalIDString = 417DA6CF13734E02007C57FB /* WebCoreTestSupport */;
     5993                        remoteInfo = WebCoreTestSupport;
     5994                };
    59565995                5D87BB6A11E3EBD200702B6F /* PBXContainerItemProxy */ = {
    59575996                        isa = PBXContainerItemProxy;
    … …  
    73207359                417253A81354BBBC00360F2A /* MediaControlElements.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaControlElements.cpp; sourceTree = "<group>"; };
    73217360                417253A91354BBBC00360F2A /* MediaControlElements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaControlElements.h; sourceTree = "<group>"; };
     7361                417DA4CE13734326007C57FB /* Internals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Internals.h; sourceTree = "<group>"; };
     7362                417DA4CF13734326007C57FB /* Internals.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Internals.cpp; sourceTree = "<group>"; };
     7363                417DA6D013734E02007C57FB /* libWebCoreTestSupport.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libWebCoreTestSupport.a; sourceTree = BUILT_PRODUCTS_DIR; };
     7364                417DA71B13735DFA007C57FB /* JSInternals.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInternals.cpp; sourceTree = "<group>"; };
     7365                417DA71C13735DFA007C57FB /* JSInternals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSInternals.h; sourceTree = "<group>"; };
     7366                41813F9113818AD60057AAA4 /* Internals.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Internals.idl; sourceTree = "<group>"; };
     7367                41815C1C138319830057AAA4 /* WebCoreTestSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCoreTestSupport.cpp; sourceTree = "<group>"; };
     7368                41815C1D138319830057AAA4 /* WebCoreTestSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreTestSupport.h; sourceTree = "<group>"; };
    73227369                41885B9111B6FDA6003383BB /* FormSubmission.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormSubmission.h; sourceTree = "<group>"; };
    73237370                41885B9211B6FDA6003383BB /* FormSubmission.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormSubmission.cpp; sourceTree = "<group>"; };
    … …  
    1250112548
    1250212549/* Begin PBXFrameworksBuildPhase section */
     12550                417DA6CE13734E02007C57FB /* Frameworks */ = {
     12551                        isa = PBXFrameworksBuildPhase;
     12552                        buildActionMask = 2147483647;
     12553                        files = (
     12554                        );
     12555                        runOnlyForDeploymentPostprocessing = 0;
     12556                };
    1250312557                5D87BB4D11E3EAEB00702B6F /* Frameworks */ = {
    1250412558                        isa = PBXFrameworksBuildPhase;
    … …  
    1253812592                        children = (
    1253912593                                5D87BB4F11E3EAEB00702B6F /* WebCoreExportFileGenerator */,
     12594                                417DA6D013734E02007C57FB /* libWebCoreTestSupport.a */,
    1254012595                                93F19B1A08245E5A001E9ABC /* WebCore.framework */,
    1254112596                        );
    … …  
    1261012665                                1AE82EC90CAAE177002237AE /* storage */,
    1261112666                                B22277CA0D00BF1E0071B782 /* svg */,
     12667                                417DA4CD13734204007C57FB /* testing */,
    1261212668                                FD315FA212B025B100C1A359 /* webaudio */,
    1261312669                                518A34BD1026C831001B6896 /* websockets */,
    … …  
    1281512871                                A83B79150CCB0078000B0825 /* Storage */,
    1281612872                                A83B790A0CCAFF47000B0825 /* SVG */,
     12873                                417DA71213735D90007C57FB /* Testing */,
    1281712874                                E1C8BE4B0E8BD0D10064CB7D /* Threads */,
    1281812875                                BC9854530CD3DA8F00069BC1 /* Traversal */,
    … …  
    1346813525                        );
    1346913526                        path = shadow;
     13527                        sourceTree = "<group>";
     13528                };
     13529                417DA4CD13734204007C57FB /* testing */ = {
     13530                        isa = PBXGroup;
     13531                        children = (
     13532                                41815C1B138319630057AAA4 /* js */,
     13533                                417DA4CF13734326007C57FB /* Internals.cpp */,
     13534                                417DA4CE13734326007C57FB /* Internals.h */,
     13535                                41813F9113818AD60057AAA4 /* Internals.idl */,
     13536                        );
     13537                        path = testing;
     13538                        sourceTree = "<group>";
     13539                };
     13540                417DA71213735D90007C57FB /* Testing */ = {
     13541                        isa = PBXGroup;
     13542                        children = (
     13543                                417DA71B13735DFA007C57FB /* JSInternals.cpp */,
     13544                                417DA71C13735DFA007C57FB /* JSInternals.h */,
     13545                        );
     13546                        name = Testing;
     13547                        sourceTree = "<group>";
     13548                };
     13549                41815C1B138319630057AAA4 /* js */ = {
     13550                        isa = PBXGroup;
     13551                        children = (
     13552                                41815C1C138319830057AAA4 /* WebCoreTestSupport.cpp */,
     13553                                41815C1D138319830057AAA4 /* WebCoreTestSupport.h */,
     13554                        );
     13555                        path = js;
    1347013556                        sourceTree = "<group>";
    1347113557                };
    … …  
    1973219818
    1973319819/* Begin PBXHeadersBuildPhase section */
     19820                417DA6CC13734E02007C57FB /* Headers */ = {
     19821                        isa = PBXHeadersBuildPhase;
     19822                        buildActionMask = 2147483647;
     19823                        files = (
     19824                                417DA6DA13734E6E007C57FB /* Internals.h in Headers */,
     19825                                417DA71E13735DFA007C57FB /* JSInternals.h in Headers */,
     19826                                41815C1F138319830057AAA4 /* WebCoreTestSupport.h in Headers */,
     19827                        );
     19828                        runOnlyForDeploymentPostprocessing = 0;
     19829                };
    1973419830                93F198A608245E59001E9ABC /* Headers */ = {
    1973519831                        isa = PBXHeadersBuildPhase;
    … …  
    2283122927
    2283222928/* Begin PBXNativeTarget section */
     22929                417DA6CF13734E02007C57FB /* WebCoreTestSupport */ = {
     22930                        isa = PBXNativeTarget;
     22931                        buildConfigurationList = 417DA6D813734E47007C57FB /* Build configuration list for PBXNativeTarget "WebCoreTestSupport" */;
     22932                        buildPhases = (
     22933                                417DA6CC13734E02007C57FB /* Headers */,
     22934                                417DA6CD13734E02007C57FB /* Sources */,
     22935                                417DA6CE13734E02007C57FB /* Frameworks */,
     22936                        );
     22937                        buildRules = (
     22938                        );
     22939                        dependencies = (
     22940                                417DA6D513734E0D007C57FB /* PBXTargetDependency */,
     22941                        );
     22942                        name = WebCoreTestSupport;
     22943                        productName = WebCoreTestSupport;
     22944                        productReference = 417DA6D013734E02007C57FB /* libWebCoreTestSupport.a */;
     22945                        productType = "com.apple.product-type.library.static";
     22946                };
    2283322947                5D87BB4E11E3EAEB00702B6F /* WebCoreExportFileGenerator */ = {
    2283422948                        isa = PBXNativeTarget;
    … …  
    2290023014                        projectRoot = "";
    2290123015                        targets = (
     23016                                41816F7913859C550057AAA4 /* All */,
    2290223017                                93F198A508245E59001E9ABC /* WebCore */,
    2290323018                                DD041FBE09D9DDBE0010AF2A /* Derived Sources */,
    2290423019                                5D87BB4E11E3EAEB00702B6F /* WebCoreExportFileGenerator */,
    2290523020                                5D87BB6411E3EBC100702B6F /* WebCoreExportFileGenerator Generator */,
     23021                                417DA6CF13734E02007C57FB /* WebCoreTestSupport */,
    2290623022                        );
    2290723023                };
    … …  
    2311423230
    2311523231/* Begin PBXSourcesBuildPhase section */
     23232                417DA6CD13734E02007C57FB /* Sources */ = {
     23233                        isa = PBXSourcesBuildPhase;
     23234                        buildActionMask = 2147483647;
     23235                        files = (
     23236                                417DA6D913734E6E007C57FB /* Internals.cpp in Sources */,
     23237                                417DA71D13735DFA007C57FB /* JSInternals.cpp in Sources */,
     23238                                41815C1E138319830057AAA4 /* WebCoreTestSupport.cpp in Sources */,
     23239                        );
     23240                        runOnlyForDeploymentPostprocessing = 0;
     23241                };
    2311623242                5D87BB4C11E3EAEB00702B6F /* Sources */ = {
    2311723243                        isa = PBXSourcesBuildPhase;
    … …  
    2550525631
    2550625632/* Begin PBXTargetDependency section */
     25633                417DA6D513734E0D007C57FB /* PBXTargetDependency */ = {
     25634                        isa = PBXTargetDependency;
     25635                        target = 93F198A508245E59001E9ABC /* WebCore */;
     25636                        targetProxy = 417DA6D413734E0D007C57FB /* PBXContainerItemProxy */;
     25637                };
     25638                41816F8313859C7A0057AAA4 /* PBXTargetDependency */ = {
     25639                        isa = PBXTargetDependency;
     25640                        target = 93F198A508245E59001E9ABC /* WebCore */;
     25641                        targetProxy = 41816F8213859C7A0057AAA4 /* PBXContainerItemProxy */;
     25642                };
     25643                41816F8513859C7D0057AAA4 /* PBXTargetDependency */ = {
     25644                        isa = PBXTargetDependency;
     25645                        target = 417DA6CF13734E02007C57FB /* WebCoreTestSupport */;
     25646                        targetProxy = 41816F8413859C7D0057AAA4 /* PBXContainerItemProxy */;
     25647                };
    2550725648                5D87BB6B11E3EBD200702B6F /* PBXTargetDependency */ = {
    2550825649                        isa = PBXTargetDependency;
    … …  
    2560525746                        baseConfigurationReference = 1CDD45E60BA9C84600F90147 /* Base.xcconfig */;
    2560625747                        buildSettings = {
     25748                        };
     25749                        name = Production;
     25750                };
     25751                417DA6D113734E02007C57FB /* Debug */ = {
     25752                        isa = XCBuildConfiguration;
     25753                        baseConfigurationReference = 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */;
     25754                        buildSettings = {
     25755                                ALWAYS_SEARCH_USER_PATHS = NO;
     25756                                COPY_PHASE_STRIP = NO;
     25757                                EXPORTED_SYMBOLS_FILE = "";
     25758                                GCC_DYNAMIC_NO_PIC = NO;
     25759                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
     25760                                GCC_MODEL_TUNING = G5;
     25761                                GCC_OPTIMIZATION_LEVEL = 0;
     25762                                INSTALL_PATH = /usr/local/lib;
     25763                                OTHER_LDFLAGS = "";
     25764                                PREBINDING = NO;
     25765                                PRIVATE_HEADERS_FOLDER_PATH = WebCoreTestSupport;
     25766                                PRODUCT_NAME = WebCoreTestSupport;
     25767                        };
     25768                        name = Debug;
     25769                };
     25770                417DA6D213734E02007C57FB /* Release */ = {
     25771                        isa = XCBuildConfiguration;
     25772                        baseConfigurationReference = 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */;
     25773                        buildSettings = {
     25774                                ALWAYS_SEARCH_USER_PATHS = NO;
     25775                                COPY_PHASE_STRIP = YES;
     25776                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
     25777                                EXPORTED_SYMBOLS_FILE = "";
     25778                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
     25779                                GCC_MODEL_TUNING = G5;
     25780                                INSTALL_PATH = /usr/local/lib;
     25781                                OTHER_LDFLAGS = "";
     25782                                PREBINDING = NO;
     25783                                PRIVATE_HEADERS_FOLDER_PATH = WebCoreTestSupport;
     25784                                PRODUCT_NAME = WebCoreTestSupport;
     25785                        };
     25786                        name = Release;
     25787                };
     25788                417DA6D313734E02007C57FB /* Production */ = {
     25789                        isa = XCBuildConfiguration;
     25790                        baseConfigurationReference = 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */;
     25791                        buildSettings = {
     25792                                ALWAYS_SEARCH_USER_PATHS = NO;
     25793                                EXPORTED_SYMBOLS_FILE = "";
     25794                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
     25795                                GCC_MODEL_TUNING = G5;
     25796                                INSTALL_PATH = /usr/local/lib;
     25797                                OTHER_LDFLAGS = "";
     25798                                PREBINDING = NO;
     25799                                PRIVATE_HEADERS_FOLDER_PATH = WebCoreTestSupport;
     25800                                PRODUCT_NAME = WebCoreTestSupport;
     25801                        };
     25802                        name = Production;
     25803                };
     25804                41816F7A13859C560057AAA4 /* Debug */ = {
     25805                        isa = XCBuildConfiguration;
     25806                        buildSettings = {
     25807                                COPY_PHASE_STRIP = NO;
     25808                                GCC_DYNAMIC_NO_PIC = NO;
     25809                                GCC_OPTIMIZATION_LEVEL = 0;
     25810                                PRODUCT_NAME = All;
     25811                        };
     25812                        name = Debug;
     25813                };
     25814                41816F7B13859C560057AAA4 /* Release */ = {
     25815                        isa = XCBuildConfiguration;
     25816                        buildSettings = {
     25817                                COPY_PHASE_STRIP = YES;
     25818                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
     25819                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
     25820                                PRODUCT_NAME = All;
     25821                                ZERO_LINK = NO;
     25822                        };
     25823                        name = Release;
     25824                };
     25825                41816F7C13859C560057AAA4 /* Production */ = {
     25826                        isa = XCBuildConfiguration;
     25827                        buildSettings = {
     25828                                PRODUCT_NAME = All;
    2560725829                        };
    2560825830                        name = Production;
    … …  
    2571325935                        defaultConfigurationName = Production;
    2571425936                };
     25937                417DA6D813734E47007C57FB /* Build configuration list for PBXNativeTarget "WebCoreTestSupport" */ = {
     25938                        isa = XCConfigurationList;
     25939                        buildConfigurations = (
     25940                                417DA6D113734E02007C57FB /* Debug */,
     25941                                417DA6D213734E02007C57FB /* Release */,
     25942                                417DA6D313734E02007C57FB /* Production */,
     25943                        );
     25944                        defaultConfigurationIsVisible = 0;
     25945                        defaultConfigurationName = Production;
     25946                };
     25947                41816F8113859C640057AAA4 /* Build configuration list for PBXAggregateTarget "All" */ = {
     25948                        isa = XCConfigurationList;
     25949                        buildConfigurations = (
     25950                                41816F7A13859C560057AAA4 /* Debug */,
     25951                                41816F7B13859C560057AAA4 /* Release */,
     25952                                41816F7C13859C560057AAA4 /* Production */,
     25953                        );
     25954                        defaultConfigurationIsVisible = 0;
     25955                        defaultConfigurationName = Production;
     25956                };
    2571525957                5D87BB5911E3EB0700702B6F /* Build configuration list for PBXNativeTarget "WebCoreExportFileGenerator" */ = {
    2571625958                        isa = XCConfigurationList;

  • trunk/Source/WebKit/chromium/ChangeLog

    r86828 r86869  
     12011-05-18  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
    1122011-05-19  Kenichi Ishibashi  <bashi@chromium.org>
    213

  • trunk/Source/WebKit/chromium/WebKit.gyp

    r86452 r86869  
    605605                            'dependencies': [
    606606                                '../../WebCore/WebCore.gyp/WebCore.gyp:webcore_bindings',
     607                                '../../WebCore/WebCore.gyp/WebCore.gyp:webcore_test_support',
    607608                                '<(chromium_src_dir)/base/base.gyp:test_support_base',
    608609                                '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
    … …  
    631632                            'sources': [
    632633                                '<@(webkit_unittest_files)',
     634                                'src/WebTestingSupport.cpp',
     635                                'public/WebTestingSupport.h',
    633636                                'tests/WebUnitTests.cpp',   # Components test runner support.
    634637                            ],
    … …  
    10851088                        '<(chromium_src_dir)/webkit/support/setup_third_party.gyp:third_party_headers',
    10861089                    ]
     1090                }],
     1091                ['component!="shared_library"', {
     1092                    'dependencies': [
     1093                        '../../WebCore/WebCore.gyp/WebCore.gyp:webcore_test_support',
     1094                    ],
     1095                    'include_dirs': [
     1096                        # WARNING: Do not view this particular case as a precedent for
     1097                        # including WebCore headers in DumpRenderTree project.
     1098                        '../../WebCore/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code.
     1099                    ],
     1100                    'sources': [
     1101                        'src/WebTestingSupport.cpp',
     1102                        'public/WebTestingSupport.h',
     1103                    ],
    10871104                }],
    10881105            ],

  • trunk/Tools/ChangeLog

    r86841 r86869  
     12011-05-18  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
    1142011-05-19  Zsolt Fehér  <h490267@stud.u-szeged.hu>
    215

  • trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj

    r86487 r86869  
    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                417DAA1D137B3E24007C57FB /* WebCoreTestSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 417DAA1C137B3E24007C57FB /* WebCoreTestSupport.h */; };
     60                417DAAEF137B40EF007C57FB /* libWebCoreTestSupport.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 417DA70013735037007C57FB /* libWebCoreTestSupport.a */; };
    5961                440590711268453800CFD48D /* WebArchiveDumpSupportMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 440590701268453800CFD48D /* WebArchiveDumpSupportMac.mm */; };
    6062                4437730E125CBC3600AAE02C /* WebArchiveDumpSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44A997830FCDE86400580F10 /* WebArchiveDumpSupport.cpp */; };
    … …  
    246248                3A5626C0131C8B17002BE6D9 /* StorageTrackerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageTrackerDelegate.h; sourceTree = "<group>"; };
    247249                3A5626C1131C8B17002BE6D9 /* StorageTrackerDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StorageTrackerDelegate.mm; sourceTree = "<group>"; };
     250                417DA70013735037007C57FB /* libWebCoreTestSupport.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWebCoreTestSupport.a; sourceTree = BUILT_PRODUCTS_DIR; };
     251                417DAA1C137B3E24007C57FB /* WebCoreTestSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebCoreTestSupport.h; path = WebCoreTestSupport/WebCoreTestSupport.h; sourceTree = BUILT_PRODUCTS_DIR; };
    248252                440590701268453800CFD48D /* WebArchiveDumpSupportMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebArchiveDumpSupportMac.mm; path = mac/WebArchiveDumpSupportMac.mm; sourceTree = "<group>"; };
    249253                44A997820FCDE86400580F10 /* WebArchiveDumpSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebArchiveDumpSupport.h; path = cf/WebArchiveDumpSupport.h; sourceTree = "<group>"; };
    … …  
    360364                                23BCB8900EA57623003C6289 /* OpenGL.framework in Frameworks */,
    361365                                9340995108540CAE007F3BC8 /* WebKit.framework in Frameworks */,
     366                                417DAAEF137B40EF007C57FB /* libWebCoreTestSupport.a in Frameworks */,
    362367                        );
    363368                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    404409                                141BF1F5096A439800E0753C /* TestNetscapePlugIn */,
    405410                                9345229B0BD12B2C0086EDA0 /* Resources */,
     411                                417DA9181373674D007C57FB /* WebCoreTestSupport */,
    406412                                A803FF6409CAACC1009B2A37 /* Frameworks */,
    407413                                9340995508540CAF007F3BC8 /* Products */,
    … …  
    513519                        );
    514520                        path = mac;
     521                        sourceTree = "<group>";
     522                };
     523                417DA9181373674D007C57FB /* WebCoreTestSupport */ = {
     524                        isa = PBXGroup;
     525                        children = (
     526                                417DAA1C137B3E24007C57FB /* WebCoreTestSupport.h */,
     527                                417DA70013735037007C57FB /* libWebCoreTestSupport.a */,
     528                        );
     529                        name = WebCoreTestSupport;
    515530                        sourceTree = "<group>";
    516531                };
    … …  
    660675                                29CFBA10122736E600BC30C0 /* AccessibilityTextMarker.h in Headers */,
    661676                                3A5626CC131CA036002BE6D9 /* StorageTrackerDelegate.h in Headers */,
     677                                417DAA1D137B3E24007C57FB /* WebCoreTestSupport.h in Headers */,
    662678                        );
    663679                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/Tools/DumpRenderTree/chromium/TestShell.cpp

    r85777 r86869  
    4040#include "WebFrame.h"
    4141#include "WebHistoryItem.h"
     42#include "WebTestingSupport.h"
    4243#include "WebKit.h"
    4344#include "WebRuntimeFeatures.h"
    … …  
    582583void TestShell::bindJSObjectsToWindow(WebFrame* frame)
    583584{
     585    WebTestingSupport::injectInternalsObject(frame);
    584586    m_accessibilityController->bindToJavascript(frame, WebString::fromUTF8("accessibilityController"));
    585587    m_layoutTestController->bindToJavascript(frame, WebString::fromUTF8("layoutTestController"));

  • trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm

    r86013 r86869  
    4242#import "PlainTextController.h"
    4343#import "TextInputController.h"
     44#import "WebCoreTestSupport.h"
    4445#import "WorkQueue.h"
    4546#import "WorkQueueItem.h"
    … …  
    267268    ASSERT(!exception);
    268269
     270    WebCoreTestSupport::injectInternalsObject(context);
     271
    269272    // Make Old-Style controllers
    270273
Note: See TracChangeset for help on using the changeset viewer.