Changeset 61358 in webkit


Ignore:
Timestamp:
Jun 17, 2010 4:28:41 PM (14 years ago)
Author:
adachan@apple.com
Message:

WebKit2:

Rolling out ​http://trac.webkit.org/changeset/61297 due to build errors.

  • WebKit2.xcodeproj/project.pbxproj:
  • WebProcess/InjectedBundle/API/c/WKBundlePage.cpp: Removed.
  • WebProcess/InjectedBundle/API/c/WKBundlePage.h: Removed.
  • WebProcess/InjectedBundle/InjectedBundlePageClient.cpp: Removed.
  • WebProcess/InjectedBundle/InjectedBundlePageClient.h: Removed.
  • WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: (WebKit::WebFrameLoaderClient::dispatchDidClearWindowObjectInWorld):
  • WebProcess/WebPage/WebPage.cpp:
  • WebProcess/WebPage/WebPage.h:
  • mac/WebKit2.exp:
  • win/WebKit2.vcproj:

WebKitTools:

Rolling out ​http://trac.webkit.org/changeset/61297 due to build errors.

  • MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj:
  • MiniBrowser/mac/WebBundle/WebBundleMain.c: Copied from MiniBrowser/mac/WebBundle/WebBundleMain.c.
  • MiniBrowser/mac/WebBundle/WebBundleMain.m: Removed.
Location:
trunk
Files:
5 deleted
9 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/WebKit2/ChangeLog

    r61297 r61358  
    1 2010-06-16  Sam Weinig  <sam@webkit.org>
    2 
    3         Reviewed by Geoffrey Garen.
    4 
    5         Fix for https://bugs.webkit.org/show_bug.cgi?id=40732
    6         WebKit2: Implement didClearWindowForFrame for InjectedBundles
    7 
    8         More InjectedBundle work.
    9         - Add really basic page level APIs for the WebProcess side:
    10             - Basic client interface with just didClearWindowForFrame (more will be added later)
    11             - Simple main frame url getter.
    12 
    13         These APIs are experimental and are intended to allow me to get a DRT implementation
    14         up and running. They will be changing.
     12010-06-17  Ada Chan  <adachan@apple.com>
     2
     3        Rolling out http://trac.webkit.org/changeset/61297 due to build errors.
    154
    165        * WebKit2.xcodeproj/project.pbxproj:
    17         * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp: Added.
    18         (WKBundlePageSetClient):
    19         (WKBundlePageGetMainFrameURL):
    20         * WebProcess/InjectedBundle/API/c/WKBundlePage.h: Added.
    21         * WebProcess/InjectedBundle/InjectedBundlePageClient.cpp: Added.
    22         (WebKit::InjectedBundlePageClient::InjectedBundlePageClient):
    23         (WebKit::InjectedBundlePageClient::initialize):
    24         (WebKit::InjectedBundlePageClient::didClearWindowObjectForFrame):
    25         * WebProcess/InjectedBundle/InjectedBundlePageClient.h: Added.
     6        * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp: Removed.
     7        * WebProcess/InjectedBundle/API/c/WKBundlePage.h: Removed.
     8        * WebProcess/InjectedBundle/InjectedBundlePageClient.cpp: Removed.
     9        * WebProcess/InjectedBundle/InjectedBundlePageClient.h: Removed.
    2610        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
    2711        (WebKit::WebFrameLoaderClient::dispatchDidClearWindowObjectInWorld):
    2812        * WebProcess/WebPage/WebPage.cpp:
    29         (WebKit::WebPage::initializeInjectedBundleClient):
    30         (WebKit::WebPage::mainFrameURL):
    3113        * WebProcess/WebPage/WebPage.h:
    32         (WebKit::WebPage::injectedBundleClient):
    3314        * mac/WebKit2.exp:
    3415        * win/WebKit2.vcproj:

  • trunk/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r61297 r61358  
    102102                BC204EF111C83EC8008F3375 /* WKBundleBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BC204EEC11C83EC8008F3375 /* WKBundleBase.h */; settings = {ATTRIBUTES = (Public, ); }; };
    103103                BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */ = {isa = PBXBuildFile; fileRef = BC204EED11C83EC8008F3375 /* WKBundleInitialize.h */; settings = {ATTRIBUTES = (Public, ); }; };
    104                 BC20528111C94284008F3375 /* WKBundlePage.h in Headers */ = {isa = PBXBuildFile; fileRef = BC20527F11C94284008F3375 /* WKBundlePage.h */; settings = {ATTRIBUTES = (Public, ); }; };
    105                 BC20528211C94284008F3375 /* WKBundlePage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC20528011C94284008F3375 /* WKBundlePage.cpp */; };
    106                 BC20528811C943A5008F3375 /* InjectedBundlePageClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BC20528611C943A5008F3375 /* InjectedBundlePageClient.h */; };
    107                 BC20528911C943A5008F3375 /* InjectedBundlePageClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC20528711C943A5008F3375 /* InjectedBundlePageClient.cpp */; };
    108104                BC20EBB0116EEB0800094A50 /* WKString.h in Headers */ = {isa = PBXBuildFile; fileRef = BC20EBAE116EEB0800094A50 /* WKString.h */; settings = {ATTRIBUTES = (Public, ); }; };
    109105                BC20EBB1116EEB0800094A50 /* WKString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC20EBAF116EEB0800094A50 /* WKString.cpp */; };
    … …  
    315311                BC204EEC11C83EC8008F3375 /* WKBundleBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleBase.h; sourceTree = "<group>"; };
    316312                BC204EED11C83EC8008F3375 /* WKBundleInitialize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleInitialize.h; sourceTree = "<group>"; };
    317                 BC20527F11C94284008F3375 /* WKBundlePage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundlePage.h; sourceTree = "<group>"; };
    318                 BC20528011C94284008F3375 /* WKBundlePage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKBundlePage.cpp; sourceTree = "<group>"; };
    319                 BC20528611C943A5008F3375 /* InjectedBundlePageClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageClient.h; sourceTree = "<group>"; };
    320                 BC20528711C943A5008F3375 /* InjectedBundlePageClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageClient.cpp; sourceTree = "<group>"; };
    321313                BC20EBAE116EEB0800094A50 /* WKString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKString.h; sourceTree = "<group>"; };
    322314                BC20EBAF116EEB0800094A50 /* WKString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKString.cpp; sourceTree = "<group>"; };
    … …  
    791783                                BC204EE011C83E98008F3375 /* InjectedBundle.cpp */,
    792784                                BC204EE111C83E98008F3375 /* InjectedBundle.h */,
    793                                 BC20528711C943A5008F3375 /* InjectedBundlePageClient.cpp */,
    794                                 BC20528611C943A5008F3375 /* InjectedBundlePageClient.h */,
    795785                        );
    796786                        path = InjectedBundle;
    … …  
    821811                                BC204EEC11C83EC8008F3375 /* WKBundleBase.h */,
    822812                                BC204EED11C83EC8008F3375 /* WKBundleInitialize.h */,
    823                                 BC20528011C94284008F3375 /* WKBundlePage.cpp */,
    824                                 BC20527F11C94284008F3375 /* WKBundlePage.h */,
    825813                        );
    826814                        path = c;
    … …  
    993981                                BC204EF111C83EC8008F3375 /* WKBundleBase.h in Headers */,
    994982                                BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */,
    995                                 BC20528111C94284008F3375 /* WKBundlePage.h in Headers */,
    996                                 BC20528811C943A5008F3375 /* InjectedBundlePageClient.h in Headers */,
    997983                        );
    998984                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    11511137                                BC204EE611C83EA9008F3375 /* InjectedBundleMac.cpp in Sources */,
    11521138                                BC204EEE11C83EC8008F3375 /* WKBundle.cpp in Sources */,
    1153                                 BC20528211C94284008F3375 /* WKBundlePage.cpp in Sources */,
    1154                                 BC20528911C943A5008F3375 /* InjectedBundlePageClient.cpp in Sources */,
    11551139                        );
    11561140                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

    r61297 r61358  
    3434#include "WebPageProxyMessageKinds.h"
    3535#include "WebProcess.h"
    36 #include <JavaScriptCore/APICast.h>
    37 #include <JavaScriptCore/JSObject.h>
    3836#include <WebCore/Chrome.h>
    39 #include <WebCore/DOMWrapperWorld.h>
    4037#include <WebCore/DocumentLoader.h>
    4138#include <WebCore/FormState.h>
    … …  
    762759}
    763760
    764 void WebFrameLoaderClient::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld* world)
    765 {
    766     WebPage* webPage = m_frame->page();
    767     if (!webPage)
    768         return;
    769 
    770     if (world != mainThreadNormalWorld())
    771         return;
    772 
    773     JSContextRef context = toRef(m_frame->coreFrame()->script()->globalObject(world)->globalExec());
    774     JSObjectRef windowObject = toRef(m_frame->coreFrame()->script()->globalObject(world));
    775 
    776     webPage->injectedBundleClient().didClearWindowObjectForFrame(webPage, m_frame, context, windowObject);
     761void WebFrameLoaderClient::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld*)
     762{
     763    notImplemented();
    777764}
    778765

  • trunk/WebKit2/WebProcess/WebPage/WebPage.cpp

    r61297 r61358  
    120120}
    121121
    122 void WebPage::initializeInjectedBundleClient(WKBundlePageClient* client)
    123 {
    124     m_client.initialize(client);
    125 }
    126 
    127 String WebPage::mainFrameURL() const
    128 {
    129     return m_mainFrame->coreFrame()->loader()->url().string();
    130 }
    131 
    132122WebFrame* WebPage::webFrame(uint64_t frameID) const
    133123{

  • trunk/WebKit2/WebProcess/WebPage/WebPage.h

    r61297 r61358  
    2828
    2929#include "DrawingArea.h"
    30 #include "InjectedBundlePageClient.h"
    3130#include <WebCore/FrameLoaderTypes.h>
    3231#include <WebCore/IntRect.h>
    … …  
    9190    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder&);
    9291
    93     // -- InjectedBundle methods
    94     void initializeInjectedBundleClient(WKBundlePageClient*);
    95     InjectedBundlePageClient& injectedBundleClient() { return m_client; }
    96 
    97     WebCore::String mainFrameURL() const;
    98 
    9992private:
    10093    WebPage(uint64_t pageID, const WebCore::IntSize& viewSize, const WebPreferencesStore&, DrawingArea::Type);
    … …  
    131124    bool m_canGoForward;
    132125
    133     InjectedBundlePageClient m_client;
    134 
    135126    uint64_t m_pageID;
    136127};

  • trunk/WebKit2/mac/WebKit2.exp

    r61297 r61358  
    11.objc_class_name_WKView
    22_InitWebCoreSystemInterface
    3 _WKBundlePageGetMainFrameURL
    4 _WKBundlePageSetClient
    53_WKBundleSetClient
    64_WKContextCreate

  • trunk/WebKit2/win/WebKit2.vcproj

    r61297 r61358  
    711711                                        >
    712712                                </File>
    713                                 <File
    714                                         RelativePath="..\WebProcess\InjectedBundle\InjectedBundlePageClient.cpp"
    715                                         >
    716                                 </File>
    717                                 <File
    718                                         RelativePath="..\WebProcess\InjectedBundle\InjectedBundlePageClient.h"
    719                                         >
    720                                 </File>
    721713                                <Filter
    722714                                        Name="API"
    … …  
    745737                                                        >
    746738                                                </File>
    747                                                 <File
    748                                                         RelativePath="..\WebProcess\InjectedBundle\API\c\WKBundlePage.cpp"
    749                                                         >
    750                                                 </File>
    751                                                 <File
    752                                                         RelativePath="..\WebProcess\InjectedBundle\API\c\WKBundlePage.h"
    753                                                         >
    754                                                 </File>
    755739                                        </Filter>
    756740                                </Filter>

  • trunk/WebKitTools/ChangeLog

    r61329 r61358  
     12010-06-17  Ada Chan  <adachan@apple.com>
     2
     3        Rolling out http://trac.webkit.org/changeset/61297 due to build errors.
     4
     5        * MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj:
     6        * MiniBrowser/mac/WebBundle/WebBundleMain.c: Copied from MiniBrowser/mac/WebBundle/WebBundleMain.c.
     7        * MiniBrowser/mac/WebBundle/WebBundleMain.m: Removed.
     8
    192010-06-17  Darin Adler  <darin@apple.com>
    210
    … …  
    100108        * DumpRenderTree/chromium/DumpRenderTree.cpp:
    101109        (runTest):
    102 
    103 2010-06-16  Sam Weinig  <sam@webkit.org>
    104 
    105         Reviewed by Geoffrey Garen.
    106 
    107         Fix for https://bugs.webkit.org/show_bug.cgi?id=40732
    108         WebKit2: Implement didClearWindowForFrame for InjectedBundles
    109 
    110         - Stub out use of bundlified didClearWindowForFrame with logging.
    111 
    112         * MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj:
    113         * MiniBrowser/mac/WebBundle/WebBundleMain.c: Removed.
    114         * MiniBrowser/mac/WebBundle/WebBundleMain.m: Added.
    115         (_didClearWindow):
    116         (_didCreatePage):
    117         (WKBundleInitialize):
    118110
    1191112010-06-16  Martin Robinson  <mrobinson@igalia.com>

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

    r61297 r61358  
    1212                8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
    1313                8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
    14                 BC20545E11C96C92008F3375 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
    1514                BC329487116A92E2008635D0 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = BC329486116A92E2008635D0 /* main.m */; };
    1615                BC329498116A941B008635D0 /* BrowserWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = BC329497116A941B008635D0 /* BrowserWindowController.m */; };
    1716                BC3294A3116A9852008635D0 /* BrowserWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC3294A1116A9852008635D0 /* BrowserWindow.xib */; };
    1817                BC8FB5A8116AA1FE0080D413 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC8FB5A7116AA1FE0080D413 /* WebKit2.framework */; };
    19                 BCBD384011B08A6800E01E54 /* WebBundleMain.m in Sources */ = {isa = PBXBuildFile; fileRef = BCBD383D11B08A3100E01E54 /* WebBundleMain.m */; };
     18                BCBD384011B08A6800E01E54 /* WebBundleMain.c in Sources */ = {isa = PBXBuildFile; fileRef = BCBD383D11B08A3100E01E54 /* WebBundleMain.c */; };
    2019                BCBD384411B08AAD00E01E54 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC8FB5A7116AA1FE0080D413 /* WebKit2.framework */; };
    2120                BCBD38D011B08C0200E01E54 /* WebBundle.bundle in Copy WebBundle */ = {isa = PBXBuildFile; fileRef = BCBD381D11B0898200E01E54 /* WebBundle.bundle */; };
    … …  
    2928                        containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
    3029                        proxyType = 1;
    31                         remoteGlobalIDString = BCBD381C11B0898200E01E54;
     30                        remoteGlobalIDString = BCBD381C11B0898200E01E54 /* WebBundle */;
    3231                        remoteInfo = WebBundle;
    3332                };
    … …  
    6867                BCBD381D11B0898200E01E54 /* WebBundle.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WebBundle.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
    6968                BCBD381E11B0898200E01E54 /* WebBundle-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "WebBundle-Info.plist"; sourceTree = "<group>"; };
    70                 BCBD383D11B08A3100E01E54 /* WebBundleMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebBundleMain.m; sourceTree = "<group>"; };
     69                BCBD383D11B08A3100E01E54 /* WebBundleMain.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = WebBundleMain.c; sourceTree = "<group>"; };
    7170                BCE625ED117FC80E00572433 /* BrowserStatisticsWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = BrowserStatisticsWindow.xib; path = mac/BrowserStatisticsWindow.xib; sourceTree = "<group>"; };
    7271                BCE625EF117FC82700572433 /* BrowserStatisticsWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BrowserStatisticsWindowController.h; path = mac/BrowserStatisticsWindowController.h; sourceTree = "<group>"; };
    … …  
    8887                        buildActionMask = 2147483647;
    8988                        files = (
    90                                 BC20545E11C96C92008F3375 /* Cocoa.framework in Frameworks */,
    9189                                BCBD384411B08AAD00E01E54 /* WebKit2.framework in Frameworks */,
    9290                        );
    … …  
    193191                        isa = PBXGroup;
    194192                        children = (
    195                                 BCBD383D11B08A3100E01E54 /* WebBundleMain.m */,
     193                                BCBD383D11B08A3100E01E54 /* WebBundleMain.c */,
    196194                        );
    197195                        name = WebBundle;
    … …  
    312310                        buildActionMask = 2147483647;
    313311                        files = (
    314                                 BCBD384011B08A6800E01E54 /* WebBundleMain.m in Sources */,
     312                                BCBD384011B08A6800E01E54 /* WebBundleMain.c in Sources */,
    315313                        );
    316314                        runOnlyForDeploymentPostprocessing = 0;
Note: See TracChangeset for help on using the changeset viewer.