Changeset 142762 in webkit


Ignore:
Timestamp:
Feb 13, 2013 10:51:56 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r142736.
http://trac.webkit.org/changeset/142736
https://bugs.webkit.org/show_bug.cgi?id=109716

Broke ABI, nightly builds crash on launch (Requested by ap on
#webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2013-02-13

Source/WebKit2:

  • Shared/APIClientTraits.cpp:

(WebKit):

  • Shared/APIClientTraits.h:
  • UIProcess/API/C/WKPage.h:
  • UIProcess/API/gtk/WebKitLoaderClient.cpp:

(attachLoaderClientToView):

  • WebProcess/InjectedBundle/API/c/WKBundlePage.h:
  • WebProcess/qt/QtBuiltinBundlePage.cpp:

(WebKit::QtBuiltinBundlePage::QtBuiltinBundlePage):

Tools:

  • MiniBrowser/mac/WK2BrowserWindowController.m:

(-[WK2BrowserWindowController awakeFromNib]):

  • WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:

(WTR::InjectedBundlePage::InjectedBundlePage):

  • WebKitTestRunner/TestController.cpp:

(WTR::TestController::createWebViewWithOptions):

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r142758 r142762  
     12013-02-13  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r142736.
     4        http://trac.webkit.org/changeset/142736
     5        https://bugs.webkit.org/show_bug.cgi?id=109716
     6
     7        Broke ABI, nightly builds crash on launch (Requested by ap on
     8        #webkit).
     9
     10        * Shared/APIClientTraits.cpp:
     11        (WebKit):
     12        * Shared/APIClientTraits.h:
     13        * UIProcess/API/C/WKPage.h:
     14        * UIProcess/API/gtk/WebKitLoaderClient.cpp:
     15        (attachLoaderClientToView):
     16        * WebProcess/InjectedBundle/API/c/WKBundlePage.h:
     17        * WebProcess/qt/QtBuiltinBundlePage.cpp:
     18        (WebKit::QtBuiltinBundlePage::QtBuiltinBundlePage):
     19
    1202013-02-13  Kenneth Rohde Christiansen  <kenneth@webkit.org>
    221
  • trunk/Source/WebKit2/Shared/APIClientTraits.cpp

    r142736 r142762  
    4040    offsetof(WKBundlePageLoaderClient, didLayoutForFrame),
    4141    offsetof(WKBundlePageLoaderClient, didFinishProgress),
     42    offsetof(WKBundlePageLoaderClient, didReceiveIntentForFrame_unavailable),
     43    offsetof(WKBundlePageLoaderClient, registerIntentServiceForFrame_unavailable),
    4244    sizeof(WKBundlePageLoaderClient)
    4345};
     
    6163const size_t APIClientTraits<WKPageLoaderClient>::interfaceSizesByVersion[] = {
    6264    offsetof(WKPageLoaderClient, didDetectXSSForFrame),
     65    offsetof(WKPageLoaderClient, didReceiveIntentForFrame_unavailable),
    6366    sizeof(WKPageLoaderClient)
    6467};
  • trunk/Source/WebKit2/Shared/APIClientTraits.h

    r142736 r142762  
    4545
    4646template<> struct APIClientTraits<WKBundlePageLoaderClient> {
    47     static const size_t interfaceSizesByVersion[3];
     47    static const size_t interfaceSizesByVersion[5];
    4848};
    4949
     
    6565
    6666template<> struct APIClientTraits<WKPageLoaderClient> {
    67     static const size_t interfaceSizesByVersion[2];
     67    static const size_t interfaceSizesByVersion[3];
    6868};
    6969
  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.h

    r142736 r142762  
    125125    WKPagePluginDidFailCallback                                         pluginDidFail;
    126126
     127    // Version 2
     128    void                                                                (*didReceiveIntentForFrame_unavailable)(void);
     129    void                                                                (*registerIntentServiceForFrame_unavailable)(void);
     130
    127131    WKPageDidLayoutCallback                                             didLayout;
    128132};
    129133typedef struct WKPageLoaderClient WKPageLoaderClient;
    130134
    131 enum { kWKPageLoaderClientCurrentVersion = 1 };
     135enum { kWKPageLoaderClientCurrentVersion = 2 };
    132136
    133137// Policy Client.
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp

    r142736 r142762  
    170170        0, // interactionOccurredWhileProcessUnresponsive
    171171        0, // pluginDidFail
     172        0, // didReceiveIntentForFrame
     173        0, // registerIntentServiceForFrame
    172174        0, // didLayout
    173175    };
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h

    r142736 r142762  
    150150    WKBundlePageShouldForceUniversalAccessFromLocalURLCallback              shouldForceUniversalAccessFromLocalURL;
    151151
     152    // Version 3
     153    void *                                                                  didReceiveIntentForFrame_unavailable;
     154    void *                                                                  registerIntentServiceForFrame_unavailable;
     155
     156    // Version 4
    152157    WKBundlePageDidLayoutCallback                                           didLayout;
    153158};
    154159typedef struct WKBundlePageLoaderClient WKBundlePageLoaderClient;
    155160
    156 enum { kWKBundlePageLoaderClientCurrentVersion = 2 };
     161enum { kWKBundlePageLoaderClientCurrentVersion = 4 };
    157162
    158163enum {
  • trunk/Source/WebKit2/WebProcess/qt/QtBuiltinBundlePage.cpp

    r142736 r142762  
    7777        0, // didFinishProgress
    7878        0, // shouldForceUniversalAccessFromLocalURL
     79        0, // didReceiveIntentForFrame
     80        0, // registerIntentServiceForFrame
    7981        0, // didLayout
    8082    };
  • trunk/Tools/ChangeLog

    r142748 r142762  
     12013-02-13  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r142736.
     4        http://trac.webkit.org/changeset/142736
     5        https://bugs.webkit.org/show_bug.cgi?id=109716
     6
     7        Broke ABI, nightly builds crash on launch (Requested by ap on
     8        #webkit).
     9
     10        * MiniBrowser/mac/WK2BrowserWindowController.m:
     11        (-[WK2BrowserWindowController awakeFromNib]):
     12        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
     13        (WTR::InjectedBundlePage::InjectedBundlePage):
     14        * WebKitTestRunner/TestController.cpp:
     15        (WTR::TestController::createWebViewWithOptions):
     16
    1172013-02-13  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
    218
  • trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m

    r142736 r142762  
    640640        0, // interactionOccurredWhileProcessUnresponsive
    641641        0, // pluginDidFail
     642        0, // didReceiveIntentForFrame
     643        0, // registerIntentServiceForFrame
    642644        0, // didLayout
    643645    };
  • trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

    r142736 r142762  
    320320        didFinishProgress, // didFinishProgress
    321321        0, // shouldForceUniversalAccessFromLocalURL
     322        0, // didReceiveIntentForFrame
     323        0, // registerIntentServiceForFrame
    322324        0, // didLayout
    323325    };
  • trunk/Tools/WebKitTestRunner/TestController.cpp

    r142736 r142762  
    466466        0, // interactionOccurredWhileProcessUnresponsive
    467467        0, // pluginDidFail
     468        0, // didReceiveIntentForFrame
     469        0, // registerIntentServiceForFrame
    468470        0, // didLayout
    469471    };
Note: See TracChangeset for help on using the changeset viewer.