Changeset 89530 in webkit


Ignore:
Timestamp:
Jun 22, 2011 10:09:24 PM (13 years ago)
Author:
dominicc@chromium.org
Message:

2011-06-22 Dominic Cooney <​dominicc@chromium.org>

Reviewed by Mark Rowe.

Add window.internals to WebKit2's WebKitTestRunner.
​https://bugs.webkit.org/show_bug.cgi?id=61073

  • platform/mac-wk2/Skipped: unskip fast/harness/internals-object.html

2011-06-22 Dominic Cooney <​dominicc@chromium.org>

Reviewed by Mark Rowe.

Add window.internals to WebKit2's WebKitTestRunner.
​https://bugs.webkit.org/show_bug.cgi?id=61073

  • Configurations/WebCoreTestSupport.xcconfig:
  • WebCore.xcodeproj/project.pbxproj:

2011-06-22 Dominic Cooney <​dominicc@chromium.org>

Reviewed by Mark Rowe.

Add window.internals to WebKit2's WebKitTestRunner.
​https://bugs.webkit.org/show_bug.cgi?id=61073

  • WebKit.vcproj/WebKit.sln: InjectedBundle depends on WebCoreTestSupport

2011-06-22 Dominic Cooney <​dominicc@chromium.org>

Reviewed by Mark Rowe.

Add window.internals to WebKit2's WebKitTestRunner.
​https://bugs.webkit.org/show_bug.cgi?id=61073

  • DumpRenderTree/DumpRenderTree.xcodeproj/project.pxbproj:
  • WebKitTestRunner/Configurations/Base.xcconfig:
  • WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops:
  • WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops:
  • WebKitTestRunner/Configurations/InjectedBundleCoreFoundation.vsprops:
  • WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp: (WTR::InjectedBundlePage::didClearWindowForFrame):
  • WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
  • WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
Location:
trunk
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r89522 r89530  
     12011-06-22  Dominic Cooney  <dominicc@chromium.org>
     2
     3        Reviewed by Mark Rowe.
     4
     5        Add window.internals to WebKit2's WebKitTestRunner.
     6        https://bugs.webkit.org/show_bug.cgi?id=61073
     7
     8        * platform/mac-wk2/Skipped: unskip fast/harness/internals-object.html
     9
    1102011-06-22  Sam Weinig  <sam@webkit.org>
    211

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

    r89491 r89530  
    15561556editing/undo/undo-iframe-location-change.html
    15571557
    1558 # https://bugs.webkit.org/show_bug.cgi?id=61073
    1559 fast/harness/internals-object.html
    1560 
    15611558### END OF (1) Classified failures with bug reports
    15621559########################################

  • trunk/Source/WebCore/ChangeLog

    r89526 r89530  
     12011-06-22  Dominic Cooney  <dominicc@chromium.org>
     2
     3        Reviewed by Mark Rowe.
     4
     5        Add window.internals to WebKit2's WebKitTestRunner.
     6        https://bugs.webkit.org/show_bug.cgi?id=61073
     7
     8        * Configurations/WebCoreTestSupport.xcconfig:
     9        * WebCore.xcodeproj/project.pbxproj:
     10
    1112011-06-22  Dimitri Glazkov  <dglazkov@chromium.org>
    212

  • trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig

    r88571 r89530  
    3030
    3131INSTALL_PATH = $(INSTALL_PATH_$(CONFIGURATION));
    32 INSTALL_PATH_Debug = @executable_path;
    33 INSTALL_PATH_Release = $(INSTALL_PATH_Debug);
    3432INSTALL_PATH_Production = /usr/local/lib;
     33
     34LD_DYLIB_INSTALL_NAME = $(LD_DYLIB_INSTALL_NAME_$(CONFIGURATION));
     35LD_DYLIB_INSTALL_NAME_Debug = @rpath/$(EXECUTABLE_PATH);
     36LD_DYLIB_INSTALL_NAME_Release = $(LD_DYLIB_INSTALL_NAME_Debug);
    3537
    3638PRODUCT_NAME = WebCoreTestSupport;

  • trunk/Source/WebKit/win/ChangeLog

    r89430 r89530  
     12011-06-22  Dominic Cooney  <dominicc@chromium.org>
     2
     3        Reviewed by Mark Rowe.
     4
     5        Add window.internals to WebKit2's WebKitTestRunner.
     6        https://bugs.webkit.org/show_bug.cgi?id=61073
     7
     8        * WebKit.vcproj/WebKit.sln: InjectedBundle depends on WebCoreTestSupport
     9
    1102011-06-20  Dimitri Glazkov  <dglazkov@chromium.org>
    211

  • trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln

    r88630 r89530  
    123123        ProjectSection(ProjectDependencies) = postProject
    124124                {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD} = {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}
     125                {83414B15-1C0D-490B-990E-03F4D49170E4} = {83414B15-1C0D-490B-990E-03F4D49170E4}
    125126        EndProjectSection
    126127EndProject

  • trunk/Tools/ChangeLog

    r89520 r89530  
     12011-06-22  Dominic Cooney  <dominicc@chromium.org>
     2
     3        Reviewed by Mark Rowe.
     4
     5        Add window.internals to WebKit2's WebKitTestRunner.
     6        https://bugs.webkit.org/show_bug.cgi?id=61073
     7
     8        * DumpRenderTree/DumpRenderTree.xcodeproj/project.pxbproj:
     9        * WebKitTestRunner/Configurations/Base.xcconfig:
     10        * WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops:
     11        * WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops:
     12        * WebKitTestRunner/Configurations/InjectedBundleCoreFoundation.vsprops:
     13        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
     14        (WTR::InjectedBundlePage::didClearWindowForFrame):
     15        * WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
     16        * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
     17
    1182011-06-22  Eric Seidel  <eric@webkit.org>
    219

  • trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig

    r42674 r89530  
    2323
    2424OTHER_LDFLAGS = -sectcreate __DATA Ahem qt/fonts/AHEM____.TTF -sectcreate __DATA WeightWatcher100 fonts/WebKitWeightWatcher100.ttf -sectcreate __DATA WeightWatcher200 fonts/WebKitWeightWatcher200.ttf -sectcreate __DATA WeightWatcher300 fonts/WebKitWeightWatcher300.ttf -sectcreate __DATA WeightWatcher400 fonts/WebKitWeightWatcher400.ttf -sectcreate __DATA WeightWatcher500 fonts/WebKitWeightWatcher500.ttf -sectcreate __DATA WeightWatcher600 fonts/WebKitWeightWatcher600.ttf -sectcreate __DATA WeightWatcher700 fonts/WebKitWeightWatcher700.ttf -sectcreate __DATA WeightWatcher800 fonts/WebKitWeightWatcher800.ttf -sectcreate __DATA WeightWatcher900 fonts/WebKitWeightWatcher900.ttf
     25LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";
    2526PRODUCT_NAME = DumpRenderTree
    2627GCC_ENABLE_OBJC_EXCEPTIONS = YES

  • trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig

    r86598 r89530  
    2424#include "CompilerVersion.xcconfig"
    2525
    26 HEADER_SEARCH_PATHS = $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders ${SRCROOT}/../../Source/JavaScriptCore/icu;
     26HEADER_SEARCH_PATHS = $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders ${SRCROOT}/../../Source/JavaScriptCore/icu $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport;
    2727FRAMEWORK_SEARCH_PATHS = $(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks;
    2828GCC_PREPROCESSOR_DEFINITIONS = ENABLE_DASHBOARD_SUPPORT WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST;

  • trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig

    r85274 r89530  
    2222// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2323
     24LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../..";
    2425PRODUCT_NAME = WebKitTestRunnerInjectedBundle;
    2526

  • trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops

    r88630 r89530  
    77        <Tool
    88                Name="VCLinkerTool"
    9                 AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CFLite$(LibraryConfigSuffix).lib"
     9                AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebCoreTestSupport$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CFLite$(LibraryConfigSuffix).lib"
    1010                OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"
    1111        />

  • trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops

    r88630 r89530  
    77        <Tool
    88                Name="VCCLCompilerTool"
    9                 AdditionalIncludeDirectories="&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)\..\InjectedBundle\&quot;;&quot;$(ProjectDir)\..\InjectedBundle\Bindings&quot;;&quot;$(ConfigurationBuildDir)\Include&quot;;&quot;$(ConfigurationBuildDir)\Include\private&quot;;&quot;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(ConfigurationBuildDir)\obj\InjectedBundle\DerivedSources\&quot;"
     9                AdditionalIncludeDirectories="&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)\..\InjectedBundle\&quot;;&quot;$(ProjectDir)\..\InjectedBundle\Bindings&quot;;&quot;$(ConfigurationBuildDir)\Include&quot;;&quot;$(ConfigurationBuildDir)\Include\private&quot;;&quot;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\WebCoreTestSupport&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(ConfigurationBuildDir)\obj\InjectedBundle\DerivedSources\&quot;"
    1010                ForcedIncludeFiles="WebKitTestRunnerPrefix.h"
    1111        />

  • trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCoreFoundation.vsprops

    r88630 r89530  
    77        <Tool
    88                Name="VCLinkerTool"
    9                 AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib"
     9                AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebCoreTestSupport$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib"
    1010                OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"
    1111        />

  • trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

    r88630 r89530  
    2929#include "InjectedBundle.h"
    3030#include "StringFunctions.h"
     31#include "WebCoreTestSupport.h"
    3132#include <cmath>
    3233#include <JavaScriptCore/JSRetainPtr.h>
    … …  
    617618    InjectedBundle::shared().gcController()->makeWindowObject(context, window, &exception);
    618619    InjectedBundle::shared().eventSendingController()->makeWindowObject(context, window, &exception);
     620    WebCoreTestSupport::injectInternalsObject(context);
    619621}
    620622

  • trunk/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro

    r83416 r89530  
    6262    $$PWD/../../../../Source/WebCore \
    6363    $$PWD/../../../../Source/WebCore/platform/text \
     64    $$PWD/../../../../Source/WebCore/testing/js \
    6465    $$PWD/../../../../Source/WebKit2 \
    6566    $$PWD/../../../../Source/WebKit2/Shared \

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

    r88630 r89530  
    3434                6510A78C11EC643800410867 /* WebKitWeightWatcher900.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6510A78111EC643800410867 /* WebKitWeightWatcher900.ttf */; };
    3535                65EB85A011EC67CC0034D300 /* ActivateFonts.mm in Sources */ = {isa = PBXBuildFile; fileRef = 65EB859F11EC67CC0034D300 /* ActivateFonts.mm */; };
     36                A664BC7613A5F3A9009A7B25 /* libWebCoreTestSupport.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 41230E16138C78BF00BCCFCA /* libWebCoreTestSupport.dylib */; };
    3637                BC14E4DB120E02D000826C0C /* GCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC14E4D9120E02D000826C0C /* GCController.cpp */; };
    3738                BC14E4EA120E03D800826C0C /* JSGCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC14E4E8120E03D800826C0C /* JSGCController.cpp */; };
    … …  
    7980/* Begin PBXFileReference section */
    8081                378D442213346D00006A777B /* config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
     82                41230E16138C78BF00BCCFCA /* libWebCoreTestSupport.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libWebCoreTestSupport.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
     83                4181731B138AD39D0057AAA4 /* WebCoreTestSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebCoreTestSupport.h; path = WebCoreTestSupport/WebCoreTestSupport.h; sourceTree = BUILT_PRODUCTS_DIR; };
    8184                6510A77711EC643800410867 /* AHEM____.TTF */ = {isa = PBXFileReference; lastKnownFileType = file; name = "AHEM____.TTF"; path = "fonts/AHEM____.TTF"; sourceTree = "<group>"; };
    8285                6510A77811EC643800410867 /* ColorBits.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = ColorBits.ttf; path = fonts/ColorBits.ttf; sourceTree = "<group>"; };
    … …  
    160163                                BC25193F11D15D8B002EBC01 /* WebKit2.framework in Frameworks */,
    161164                                BC25194011D15D8B002EBC01 /* JavaScriptCore.framework in Frameworks */,
     165                                A664BC7613A5F3A9009A7B25 /* libWebCoreTestSupport.dylib in Frameworks */,
    162166                        );
    163167                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    202206                                BC7934AB1190658C005EA8E2 /* WebKit2.framework */,
    203207                                BCDA2B991191051F00C3BC47 /* JavaScriptCore.framework */,
     208                                4181731B138AD39D0057AAA4 /* WebCoreTestSupport.h */,
     209                                41230E16138C78BF00BCCFCA /* libWebCoreTestSupport.dylib */,
    204210                        );
    205211                        name = "External Frameworks and Libraries";
Note: See TracChangeset for help on using the changeset viewer.