Commit 3e1c33ce authored by dominicc@chromium.org's avatar dominicc@chromium.org

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

        Reviewed by Hajime Morita.

        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-12  Dominic Cooney  <dominicc@chromium.org>

        Reviewed by Hajime Morita.

        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-12  Dominic Cooney  <dominicc@chromium.org>

        Reviewed by Hajime Morita.

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

        Test: fast/harness/internals-object.html

        * WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops:
        * WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops:
        * WebKitTestRunner/Configurations/InjectedBundleCoreFoundation.vsprops:
        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
        (WTR::InjectedBundlePage::didClearWindowForFrame): initialize window.internals
        * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@88625 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent cf101757
2011-06-12 Dominic Cooney <dominicc@chromium.org>
Reviewed by Hajime Morita.
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-12 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r88616.
......
......@@ -1522,9 +1522,6 @@ plugins/private-browsing-mode-2.html
# http://webkit.org/b/58990
editing/undo/undo-iframe-location-change.html
# https://bugs.webkit.org/show_bug.cgi?id=61073
fast/harness/internals-object.html
### END OF (1) Classified failures with bug reports
########################################
......
2011-06-12 Dominic Cooney <dominicc@chromium.org>
Reviewed by Hajime Morita.
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-12 Adam Barth <abarth@webkit.org>
Reviewed by Alexey Proskuryakov.
......
......@@ -122,6 +122,7 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InjectedBundle", "..\..\..\..\Tools\WebKitTestRunner\win\InjectedBundle.vcproj", "{CBC3391C-F060-4BF5-A66E-81404168816B}"
ProjectSection(ProjectDependencies) = postProject
{4343BC0B-A2E0-4B48-8277-F33CFBFA83CD} = {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}
{83414B15-1C0D-490B-990E-03F4D49170E4} = {83414B15-1C0D-490B-990E-03F4D49170E4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InjectedBundleGenerated", "..\..\..\..\Tools\WebKitTestRunner\win\InjectedBundleGenerated.vcproj", "{4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}"
......
2011-06-12 Dominic Cooney <dominicc@chromium.org>
Reviewed by Hajime Morita.
Add window.internals to WebKit2's WebKitTestRunner.
https://bugs.webkit.org/show_bug.cgi?id=61073
Test: fast/harness/internals-object.html
* WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops:
* WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops:
* WebKitTestRunner/Configurations/InjectedBundleCoreFoundation.vsprops:
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::didClearWindowForFrame): initialize window.internals
* WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
2011-06-12 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r88616.
......
......@@ -6,7 +6,7 @@
>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CFLite$(LibraryConfigSuffix).lib"
AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebCoreTestSupport$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CFLite$(LibraryConfigSuffix).lib"
OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"
/>
</VisualStudioPropertySheet>
......@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
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;"
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;"
ForcedIncludeFiles="WebKitTestRunnerPrefix.h"
/>
</VisualStudioPropertySheet>
......@@ -6,7 +6,7 @@
>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib"
AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebCoreTestSupport$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib"
OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"
/>
</VisualStudioPropertySheet>
......@@ -28,6 +28,7 @@
#include "InjectedBundle.h"
#include "StringFunctions.h"
#include "WebCoreTestSupport.h"
#include <cmath>
#include <JavaScriptCore/JSRetainPtr.h>
#include <WebKit2/WKArray.h>
......@@ -616,6 +617,7 @@ void InjectedBundlePage::didClearWindowForFrame(WKBundleFrameRef frame, WKBundle
InjectedBundle::shared().layoutTestController()->makeWindowObject(context, window, &exception);
InjectedBundle::shared().gcController()->makeWindowObject(context, window, &exception);
InjectedBundle::shared().eventSendingController()->makeWindowObject(context, window, &exception);
WebCoreTestSupport::injectInternalsObject(context);
}
void InjectedBundlePage::didCancelClientRedirectForFrame(WKBundleFrameRef frame)
......
......@@ -21,6 +21,7 @@
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
41230F0A138C78DF00BCCFCA /* WebCoreTestSupport.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 41230E16138C78BF00BCCFCA /* WebCoreTestSupport.dylib */; };
6510A78211EC643800410867 /* AHEM____.TTF in Resources */ = {isa = PBXBuildFile; fileRef = 6510A77711EC643800410867 /* AHEM____.TTF */; };
6510A78311EC643800410867 /* ColorBits.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6510A77811EC643800410867 /* ColorBits.ttf */; };
6510A78411EC643800410867 /* WebKitWeightWatcher100.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6510A77911EC643800410867 /* WebKitWeightWatcher100.ttf */; };
......@@ -78,6 +79,8 @@
/* Begin PBXFileReference section */
378D442213346D00006A777B /* config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
41230E16138C78BF00BCCFCA /* WebCoreTestSupport.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = WebCoreTestSupport.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
4181731B138AD39D0057AAA4 /* WebCoreTestSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebCoreTestSupport.h; path = ../../Source/WebCore/testing/js/WebCoreTestSupport.h; sourceTree = SOURCE_ROOT; };
6510A77711EC643800410867 /* AHEM____.TTF */ = {isa = PBXFileReference; lastKnownFileType = file; name = "AHEM____.TTF"; path = "fonts/AHEM____.TTF"; sourceTree = "<group>"; };
6510A77811EC643800410867 /* ColorBits.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = ColorBits.ttf; path = fonts/ColorBits.ttf; sourceTree = "<group>"; };
6510A77911EC643800410867 /* WebKitWeightWatcher100.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = WebKitWeightWatcher100.ttf; path = fonts/WebKitWeightWatcher100.ttf; sourceTree = "<group>"; };
......@@ -158,6 +161,7 @@
files = (
BC25193E11D15D8B002EBC01 /* Cocoa.framework in Frameworks */,
BC25193F11D15D8B002EBC01 /* WebKit2.framework in Frameworks */,
41230F0A138C78DF00BCCFCA /* WebCoreTestSupport.dylib in Frameworks */,
BC25194011D15D8B002EBC01 /* JavaScriptCore.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -201,6 +205,8 @@
BC7934A411906584005EA8E2 /* Cocoa.framework */,
BC7934AB1190658C005EA8E2 /* WebKit2.framework */,
BCDA2B991191051F00C3BC47 /* JavaScriptCore.framework */,
4181731B138AD39D0057AAA4 /* WebCoreTestSupport.h */,
41230E16138C78BF00BCCFCA /* WebCoreTestSupport.dylib */,
);
name = "External Frameworks and Libraries";
sourceTree = "<group>";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment