Changeset 64921 in webkit


Ignore:
Timestamp:
Aug 7, 2010 2:42:06 PM (14 years ago)
Author:
weinig@apple.com
Message:

WebKitTestRunner needs GCController
<rdar://problem/8213834>
​https://bugs.webkit.org/show_bug.cgi?id=42701

Reviewed by Anders Carlsson.

WebKit2:

  • WebProcess/InjectedBundle/API/c/WKBundle.cpp:

(WKBundleGarbageCollectJavaScriptObjects):
(WKBundleGarbageCollectJavaScriptObjectsOnAlternateThreadForDebugging):
(WKBundleGetJavaScriptObjectsCount):

  • WebProcess/InjectedBundle/API/c/WKBundlePrivate.h:
  • WebProcess/InjectedBundle/InjectedBundle.cpp:

(WebKit::InjectedBundle::garbageCollectJavaScriptObjects):
(WebKit::InjectedBundle::garbageCollectJavaScriptObjectsOnAlternateThreadForDebugging):
(WebKit::InjectedBundle::javaScriptObjectsCount):

  • WebProcess/InjectedBundle/InjectedBundle.h:

WebKitTools:

  • WebKitTestRunner/DerivedSources.make:
  • WebKitTestRunner/InjectedBundle/Bindings/GCController.idl: Added.
  • WebKitTestRunner/InjectedBundle/Bindings/JSWrapper.h:

(WTR::setProperty):

  • WebKitTestRunner/InjectedBundle/GCController.cpp: Added.

(WTR::GCController::create):
(WTR::GCController::GCController):
(WTR::GCController::~GCController):
(WTR::GCController::wrapperClass):
(WTR::GCController::collect):
(WTR::GCController::collectOnAlternateThread):
(WTR::GCController::getJSObjectCount):
(WTR::GCController::makeWindowObject):

  • WebKitTestRunner/InjectedBundle/GCController.h: Added.
  • WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:

(WTR::InjectedBundle::reset):

  • WebKitTestRunner/InjectedBundle/InjectedBundle.h:

(WTR::InjectedBundle::bundle):
(WTR::InjectedBundle::gcController):

  • WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:

(WTR::InjectedBundlePage::didClearWindowForFrame):

  • WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:

(WTR::LayoutTestController::keepWebHistory):

  • WebKitTestRunner/InjectedBundle/LayoutTestController.h:
  • WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
  • WebKitTestRunner/win/InjectedBundle.vcproj:

LayoutTests:

  • platform/mac-wk2/Skipped: Remove now passing tests and add some failing tests.
Location:
trunk
Files:
3 added
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r64920 r64921  
     12010-08-07  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Anders Carlsson.
     4
     5        WebKitTestRunner needs GCController
     6        <rdar://problem/8213834>
     7        https://bugs.webkit.org/show_bug.cgi?id=42701
     8
     9        * platform/mac-wk2/Skipped: Remove now passing tests and add some failing tests.
     10
    1112010-08-07  Dan Bernstein  <mitz@apple.com>
    212

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

    r64631 r64921  
    15911591fast/dom/Geolocation/callback-to-remote-context.html
    15921592fast/dom/Geolocation/callback-to-remote-context2.html
     1593fast/dom/Geolocation/delayed-permission-allowed.html
     1594fast/dom/Geolocation/delayed-permission-denied.html
    15931595fast/dom/Geolocation/error.html
    15941596fast/dom/Geolocation/multiple-requests.html
     1597fast/dom/Geolocation/notimer-after-unload.html
    15951598fast/dom/Geolocation/permission-denied-already-clear-watch.html
    15961599fast/dom/Geolocation/permission-denied-already-error.html
    15971600fast/dom/Geolocation/permission-denied-already-success.html
     1601fast/dom/Geolocation/permission-denied-stops-watches.html
    15981602fast/dom/Geolocation/permission-denied.html
    1599 fast/dom/Geolocation/permission-denied-stops-watches.html
    16001603fast/dom/Geolocation/position-string.html
    16011604fast/dom/Geolocation/reentrant-error.html
    … …  
    16051608fast/dom/Geolocation/timeout.html
    16061609fast/dom/Geolocation/watch.html
    1607 fast/dom/Geolocation/notimer-after-unload.html
    16081610
    16091611# WebKitTestRunner needs layoutTestController.setMockGeolocationPosition
    … …  
    17911793http/tests/cookies/third-party-cookie-relaxing.html
    17921794http/tests/plugins/third-party-cookie-accept-policy.html
    1793 
    1794 # WebKitTestRunner needs GCController
    1795 # <https://bugs.webkit.org/show_bug.cgi?id=42701>
    1796 fast/dom/gc-10.html
    1797 fast/dom/StyleSheet/ownerNode-lifetime-2.html
    1798 fast/frames/removal-before-attach-crash.html
    17991795
    18001796# WebKitTestRunner needs to print onunload handler information
    … …  
    21202116fast/loader/frame-creation-removal.html
    21212117fast/overflow/scroll-vertical-not-horizontal.html
     2118fast/parser/entities-in-xhtml.xhtml
    21222119http/tests/history/back-to-post.php
    21232120http/tests/media/video-load-twice.html
    … …  
    21402137platform/mac/fast/loader/non-html-load-event.html
    21412138
    2142 
    21432139########################################
    21442140

  • trunk/WebKit2/ChangeLog

    r64919 r64921  
     12010-08-07  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Anders Carlsson.
     4
     5        WebKitTestRunner needs GCController
     6        <rdar://problem/8213834>
     7        https://bugs.webkit.org/show_bug.cgi?id=42701
     8
     9        * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
     10        (WKBundleGarbageCollectJavaScriptObjects):
     11        (WKBundleGarbageCollectJavaScriptObjectsOnAlternateThreadForDebugging):
     12        (WKBundleGetJavaScriptObjectsCount):
     13        * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h:
     14        * WebProcess/InjectedBundle/InjectedBundle.cpp:
     15        (WebKit::InjectedBundle::garbageCollectJavaScriptObjects):
     16        (WebKit::InjectedBundle::garbageCollectJavaScriptObjectsOnAlternateThreadForDebugging):
     17        (WebKit::InjectedBundle::javaScriptObjectsCount):
     18        * WebProcess/InjectedBundle/InjectedBundle.h:
     19
    1202010-08-07  Anders Carlsson  <andersca@apple.com>
    221

  • trunk/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp

    r64603 r64921  
    6363    toWK(bundleRef)->activateMacFontAscentHack();
    6464}
     65
     66void WKBundleGarbageCollectJavaScriptObjects(WKBundleRef bundleRef)
     67{
     68    toWK(bundleRef)->garbageCollectJavaScriptObjects();
     69}
     70
     71void WKBundleGarbageCollectJavaScriptObjectsOnAlternateThreadForDebugging(WKBundleRef bundleRef, bool waitUntilDone)
     72{
     73    toWK(bundleRef)->garbageCollectJavaScriptObjectsOnAlternateThreadForDebugging(waitUntilDone);
     74}
     75
     76size_t WKBundleGetJavaScriptObjectsCount(WKBundleRef bundleRef)
     77{
     78    return toWK(bundleRef)->javaScriptObjectsCount();
     79}

  • trunk/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h

    r64603 r64921  
    3030#include <WebKit2/WKBundleBase.h>
    3131
     32#ifndef __cplusplus
     33#include <stdbool.h>
     34#endif
     35
    3236#ifdef __cplusplus
    3337extern "C" {
    … …  
    3741WK_EXPORT void WKBundleRemoveAllVisitedLinks(WKBundleRef bundle);
    3842WK_EXPORT void WKBundleActivateMacFontAscentHack(WKBundleRef bundle);
     43WK_EXPORT void WKBundleGarbageCollectJavaScriptObjects(WKBundleRef bundle);
     44WK_EXPORT void WKBundleGarbageCollectJavaScriptObjectsOnAlternateThreadForDebugging(WKBundleRef bundle, bool waitUntilDone);
     45WK_EXPORT size_t WKBundleGetJavaScriptObjectsCount(WKBundleRef bundle);
    3946
    4047#ifdef __cplusplus

  • trunk/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

    r64877 r64921  
    2828#include "Arguments.h"
    2929#include "ImmutableArray.h"
    30 #include "WebContextMessageKinds.h"
    3130#include "InjectedBundleMessageKinds.h"
    3231#include "WKAPICast.h"
    3332#include "WKBundleAPICast.h"
     33#include "WebContextMessageKinds.h"
    3434#include "WebCoreArgumentCoders.h"
    3535#include "WebPage.h"
    3636#include "WebProcess.h"
     37#include <JavaScriptCore/JSLock.h>
     38#include <WebCore/GCController.h>
     39#include <WebCore/JSDOMWindow.h>
    3740#include <WebCore/PageGroup.h>
    3841#include <wtf/OwnArrayPtr.h>
    3942
    4043using namespace WebCore;
     44using namespace JSC;
    4145
    4246namespace WebKit {
    … …  
    194198}
    195199
     200void InjectedBundle::garbageCollectJavaScriptObjects()
     201{
     202    gcController().garbageCollectNow();
     203}
     204
     205void InjectedBundle::garbageCollectJavaScriptObjectsOnAlternateThreadForDebugging(bool waitUntilDone)
     206{
     207    gcController().garbageCollectOnAlternateThreadForDebugging(waitUntilDone);
     208}
     209
     210size_t InjectedBundle::javaScriptObjectsCount()
     211{
     212    JSLock lock(SilenceAssertionsOnly);
     213    return JSDOMWindow::commonJSGlobalData()->heap.objectCount();
     214}
     215
    196216void InjectedBundle::didCreatePage(WebPage* page)
    197217{

  • trunk/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h

    r64877 r64921  
    7373    void activateMacFontAscentHack();
    7474
     75    // Garbage collection API
     76    void garbageCollectJavaScriptObjects();
     77    void garbageCollectJavaScriptObjectsOnAlternateThreadForDebugging(bool waitUntilDone);
     78    size_t javaScriptObjectsCount();
     79
    7580    // Callback hooks
    7681    void didCreatePage(WebPage*);

  • trunk/WebKitTools/ChangeLog

    r64888 r64921  
     12010-08-07  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Anders Carlsson.
     4
     5        WebKitTestRunner needs GCController
     6        <rdar://problem/8213834>
     7        https://bugs.webkit.org/show_bug.cgi?id=42701
     8
     9        * WebKitTestRunner/DerivedSources.make:
     10        * WebKitTestRunner/InjectedBundle/Bindings/GCController.idl: Added.
     11        * WebKitTestRunner/InjectedBundle/Bindings/JSWrapper.h:
     12        (WTR::setProperty):
     13        * WebKitTestRunner/InjectedBundle/GCController.cpp: Added.
     14        (WTR::GCController::create):
     15        (WTR::GCController::GCController):
     16        (WTR::GCController::~GCController):
     17        (WTR::GCController::wrapperClass):
     18        (WTR::GCController::collect):
     19        (WTR::GCController::collectOnAlternateThread):
     20        (WTR::GCController::getJSObjectCount):
     21        (WTR::GCController::makeWindowObject):
     22        * WebKitTestRunner/InjectedBundle/GCController.h: Added.
     23        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
     24        (WTR::InjectedBundle::reset):
     25        * WebKitTestRunner/InjectedBundle/InjectedBundle.h:
     26        (WTR::InjectedBundle::bundle):
     27        (WTR::InjectedBundle::gcController):
     28        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
     29        (WTR::InjectedBundlePage::didClearWindowForFrame):
     30        * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
     31        (WTR::LayoutTestController::keepWebHistory):
     32        * WebKitTestRunner/InjectedBundle/LayoutTestController.h:
     33        * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
     34        * WebKitTestRunner/win/InjectedBundle.vcproj:
     35
    1362010-08-05  Jon Honeycutt  <jhoneycutt@apple.com>
    237

  • trunk/WebKitTools/WebKitTestRunner/DerivedSources.make

    r63693 r64921  
    2828INTERFACES = \
    2929    LayoutTestController \
     30    GCController \
    3031#
    3132

  • trunk/WebKitTools/WebKitTestRunner/InjectedBundle/Bindings/JSWrapper.h

    r63693 r64921  
    2828
    2929#include "JSWrappable.h"
     30#include <JavaScriptCore/JSRetainPtr.h>
    3031
    3132namespace WTR {
    … …  
    4647}
    4748
     49inline void setProperty(JSContextRef context, JSObjectRef object, const char* propertyName, JSWrappable* value, JSPropertyAttributes attributes, JSValueRef* exception)
     50{
     51    JSRetainPtr<JSStringRef> propertyNameString(Adopt, JSStringCreateWithUTF8CString(propertyName));
     52    JSObjectSetProperty(context, object, propertyNameString.get(), JSWrapper::wrap(context, value), attributes, exception);
     53}
     54
    4855} // namespace WTR
    4956

  • trunk/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp

    r64603 r64921  
    135135    m_outputStream.str("");
    136136    m_layoutTestController = LayoutTestController::create();
     137    m_gcController = GCController::create();
    137138    WKBundleSetShouldTrackVisitedLinks(m_bundle, false);
    138139    WKBundleRemoveAllVisitedLinks(m_bundle);
    139140    m_mainPage->reset();
    140 }
    141 
    142 void InjectedBundle::setShouldTrackVisitedLinks()
    143 {
    144     WKBundleSetShouldTrackVisitedLinks(m_bundle, true);
    145141}
    146142

  • trunk/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h

    r64485 r64921  
    2727#define InjectedBundle_h
    2828
     29#include "GCController.h"
    2930#include "LayoutTestController.h"
    3031#include <WebKit2/WKBase.h>
    … …  
    4748    void initialize(WKBundleRef);
    4849
    49     void done();
     50    WKBundleRef bundle() const { return m_bundle; }
    5051
    5152    LayoutTestController* layoutTestController() { return m_layoutTestController.get(); }
     53    GCController* gcController() { return m_gcController.get(); }
     54
    5255    InjectedBundlePage* page() { return m_mainPage.get(); }
    5356    size_t pageCount() { return !!m_mainPage + m_otherPages.size(); }
    5457    void closeOtherPages();
    5558
     59    void done();
    5660    std::ostringstream& os() { return m_outputStream; }
    57 
    58     void setShouldTrackVisitedLinks();
    5961
    6062private:
    … …  
    7779
    7880    RefPtr<LayoutTestController> m_layoutTestController;
     81    RefPtr<GCController> m_gcController;
    7982
    8083    std::ostringstream m_outputStream;

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

    r64576 r64921  
    329329    JSValueRef exception = 0;
    330330    InjectedBundle::shared().layoutTestController()->makeWindowObject(context, window, &exception);
     331    InjectedBundle::shared().gcController()->makeWindowObject(context, window, &exception);
    331332}
    332333

  • trunk/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp

    r64576 r64921  
    3333#include <WebKit2/WKBundleFramePrivate.h>
    3434#include <WebKit2/WKBundlePagePrivate.h>
     35#include <WebKit2/WKBundlePrivate.h>
    3536#include <WebKit2/WKRetainPtr.h>
    3637#include <WebKit2/WebKit2.h>
    … …  
    4142// Eventually it should be changed to match.
    4243static const CFTimeInterval waitToDumpWatchdogInterval = 6.0;
    43 
    44 static void setProperty(JSContextRef context, JSObjectRef object, const char* propertyName, JSWrappable* value, JSPropertyAttributes attributes, JSValueRef* exception)
    45 {
    46     JSRetainPtr<JSStringRef> propertyNameString(Adopt, JSStringCreateWithUTF8CString(propertyName));
    47     JSObjectSetProperty(context, object, propertyNameString.get(), JSWrapper::wrap(context, value), attributes, exception);
    48 }
    4944
    5045static JSValueRef propertyValue(JSContextRef context, JSObjectRef object, const char* propertyName)
    … …  
    170165void LayoutTestController::keepWebHistory()
    171166{
    172     InjectedBundle::shared().setShouldTrackVisitedLinks();
     167    WKBundleSetShouldTrackVisitedLinks(InjectedBundle::shared().bundle(), true);
    173168}
    174169

  • trunk/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.h

    r64485 r64921  
    2828
    2929#include "JSWrappable.h"
    30 #include <JavaScriptCore/JavaScriptCore.h>
    3130#include <JavaScriptCore/JSRetainPtr.h>
    3231#include <wtf/PassRefPtr.h>

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

    r64576 r64921  
    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                BC14E4DB120E02D000826C0C /* GCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC14E4D9120E02D000826C0C /* GCController.cpp */; };
     37                BC14E4EA120E03D800826C0C /* JSGCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC14E4E8120E03D800826C0C /* JSGCController.cpp */; };
    3638                BC25193E11D15D8B002EBC01 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC7934A411906584005EA8E2 /* Cocoa.framework */; };
    3739                BC25193F11D15D8B002EBC01 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC7934AB1190658C005EA8E2 /* WebKit2.framework */; };
    … …  
    8688                65EB859F11EC67CC0034D300 /* ActivateFonts.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ActivateFonts.mm; sourceTree = "<group>"; };
    8789                8DD76FA10486AA7600D96B5E /* WebKitTestRunner */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = WebKitTestRunner; sourceTree = BUILT_PRODUCTS_DIR; };
     90                BC14E4D8120E02D000826C0C /* GCController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCController.h; sourceTree = "<group>"; };
     91                BC14E4D9120E02D000826C0C /* GCController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GCController.cpp; sourceTree = "<group>"; };
     92                BC14E4E1120E032000826C0C /* GCController.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GCController.idl; sourceTree = "<group>"; };
     93                BC14E4E8120E03D800826C0C /* JSGCController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSGCController.cpp; path = ../../WebKitBuild/Debug/DerivedSources/WebKitTestRunner/JSGCController.cpp; sourceTree = SOURCE_ROOT; };
     94                BC14E4E9120E03D800826C0C /* JSGCController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSGCController.h; path = ../../WebKitBuild/Debug/DerivedSources/WebKitTestRunner/JSGCController.h; sourceTree = SOURCE_ROOT; };
    8895                BC25184611D15767002EBC01 /* InjectedBundleMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleMain.cpp; sourceTree = "<group>"; };
    8996                BC25186211D15D54002EBC01 /* InjectedBundle.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = InjectedBundle.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
    … …  
    203210                        sourceTree = "<group>";
    204211                };
     212                BC14E4E0120E02F900826C0C /* Controllers */ = {
     213                        isa = PBXGroup;
     214                        children = (
     215                                BC14E4D9120E02D000826C0C /* GCController.cpp */,
     216                                BC14E4D8120E02D000826C0C /* GCController.h */,
     217                                BCC9981711D3F51E0017BCA2 /* LayoutTestController.cpp */,
     218                                BCC9981611D3F51E0017BCA2 /* LayoutTestController.h */,
     219                        );
     220                        name = Controllers;
     221                        sourceTree = "<group>";
     222                };
    205223                BC25183511D1571D002EBC01 /* InjectedBundle */ = {
    206224                        isa = PBXGroup;
    … …  
    208226                                BC952D3A11F3BF1F003398B4 /* Derived Sources */,
    209227                                BC952C0A11F3B939003398B4 /* Bindings */,
     228                                BC14E4E0120E02F900826C0C /* Controllers */,
    210229                                65EB859E11EC67CC0034D300 /* mac */,
    211230                                65EB859D11EC67CC0034D300 /* ActivateFonts.h */,
    … …  
    215234                                BCC997A211D3C8F60017BCA2 /* InjectedBundlePage.cpp */,
    216235                                BCC997A311D3C8F60017BCA2 /* InjectedBundlePage.h */,
    217                                 BCC9981711D3F51E0017BCA2 /* LayoutTestController.cpp */,
    218                                 BCC9981611D3F51E0017BCA2 /* LayoutTestController.h */,
    219236                        );
    220237                        path = InjectedBundle;
    … …  
    269286                                BC952C0C11F3B965003398B4 /* JSWrapper.cpp */,
    270287                                BC952C0B11F3B965003398B4 /* JSWrapper.h */,
     288                                BC14E4E1120E032000826C0C /* GCController.idl */,
    271289                                BC952ED211F3C29F003398B4 /* LayoutTestController.idl */,
    272290                        );
    … …  
    277295                        isa = PBXGroup;
    278296                        children = (
     297                                BC14E4E8120E03D800826C0C /* JSGCController.cpp */,
     298                                BC14E4E9120E03D800826C0C /* JSGCController.h */,
    279299                                BC952F1D11F3C652003398B4 /* JSLayoutTestController.cpp */,
    280300                                BC952F1E11F3C652003398B4 /* JSLayoutTestController.h */,
    … …  
    412432                                BC952C0D11F3B965003398B4 /* JSWrapper.cpp in Sources */,
    413433                                BC952F1F11F3C652003398B4 /* JSLayoutTestController.cpp in Sources */,
     434                                BC14E4DB120E02D000826C0C /* GCController.cpp in Sources */,
     435                                BC14E4EA120E03D800826C0C /* JSGCController.cpp in Sources */,
    414436                        );
    415437                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/WebKitTools/WebKitTestRunner/win/InjectedBundle.vcproj

    r64500 r64921  
    289289                        >
    290290                        <File
     291                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSGCController.cpp"
     292                                >
     293                        </File>
     294                        <File
     295                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSGCController.h"
     296                                >
     297                        </File>
     298                        <File
    291299                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSLayoutTestController.cpp"
    292300                                >
    … …  
    319327                <File
    320328                        RelativePath="..\InjectedBundle\InjectedBundlePage.h"
     329                        >
     330                </File>
     331                <File
     332                        RelativePath="..\InjectedBundle\GCController.cpp"
     333                        >
     334                </File>
     335                <File
     336                        RelativePath="..\InjectedBundle\GCController.h"
    321337                        >
    322338                </File>
Note: See TracChangeset for help on using the changeset viewer.