Changeset 142405 in webkit


Ignore:
Timestamp:
Feb 10, 2013 8:39:16 AM (11 years ago)
Author:
tkent@chromium.org
Message:

Unreviewed, rolling out r142347.
​http://trac.webkit.org/changeset/142347
​https://bugs.webkit.org/show_bug.cgi?id=108273

Because a depending change r142343 was rolled out.

Source/WebKit2:

  • WebProcess/InjectedBundle/API/c/WKBundlePage.h:
  • WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:

(WebKit::InjectedBundlePageUIClient::plugInStartLabelTitle):
(WebKit::InjectedBundlePageUIClient::plugInStartLabelSubtitle):

Tools:

  • WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:

(WTR::InjectedBundlePage::InjectedBundlePage):

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r142400 r142405  
     12013-02-10  Kent Tamura  <tkent@chromium.org>
     2
     3        Unreviewed, rolling out r142347.
     4        http://trac.webkit.org/changeset/142347
     5        https://bugs.webkit.org/show_bug.cgi?id=108273
     6
     7        Because a depending change r142343 was rolled out.
     8
     9        * WebProcess/InjectedBundle/API/c/WKBundlePage.h:
     10        * WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:
     11        (WebKit::InjectedBundlePageUIClient::plugInStartLabelTitle):
     12        (WebKit::InjectedBundlePageUIClient::plugInStartLabelSubtitle):
     13
    1142013-02-10  Kent Tamura  <tkent@chromium.org>
    215

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h

    r142347 r142405  
    247247typedef void (*WKBundlePageReachedAppCacheOriginQuotaCallback)(WKBundlePageRef page, WKSecurityOriginRef origin, int64_t totalBytesNeeded, const void *clientInfo);
    248248typedef uint64_t (*WKBundlePageExceededDatabaseQuotaCallback)(WKBundlePageRef page, WKSecurityOriginRef origin, WKStringRef databaseName, WKStringRef databaseDisplayName, uint64_t currentQuotaBytes, uint64_t currentOriginUsageBytes, uint64_t currentDatabaseUsageBytes, uint64_t expectedUsageBytes, const void *clientInfo);
     249typedef WKImageRef (*WKBundlePagePlugInStartLabelImageCallback)(WKBundlePageLabelSize size, const void *clientInfo);
    249250typedef WKStringRef (*WKBundlePagePlugInCreateStartLabelTitleCallback)(const void *clientInfo);
    250251typedef WKStringRef (*WKBundlePagePlugInCreateStartLabelSubtitleCallback)(const void *clientInfo);
    … …  
    274275    // Version 2.
    275276    WKBundlePageExceededDatabaseQuotaCallback                           didExceedDatabaseQuota;
     277    WKBundlePagePlugInStartLabelImageCallback                           plugInStartLabelImage;
    276278    WKBundlePagePlugInCreateStartLabelTitleCallback                     createPlugInStartLabelTitle;
    277279    WKBundlePagePlugInCreateStartLabelSubtitleCallback                  createPlugInStartLabelSubtitle;

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

    r142400 r142405  
    186186String InjectedBundlePageUIClient::plugInStartLabelTitle() const
    187187{
    188     if (!m_client.createPlugInStartLabelTitle)
    189         return String();
    190 
    191     RefPtr<WebString> title = adoptRef(toImpl(m_client.createPlugInStartLabelTitle(m_client.clientInfo)));
    192     return title ? title->string() : String();
     188    return String();
    193189}
    194190
    195191String InjectedBundlePageUIClient::plugInStartLabelSubtitle() const
    196192{
    197     if (!m_client.createPlugInStartLabelSubtitle)
    198         return String();
    199 
    200     RefPtr<WebString> subtitle = adoptRef(toImpl(m_client.createPlugInStartLabelSubtitle(m_client.clientInfo)));
    201     return subtitle ? subtitle->string() : String();
     193    return String();
    202194}
    203195

  • trunk/Tools/ChangeLog

    r142403 r142405  
     12013-02-10  Kent Tamura  <tkent@chromium.org>
     2
     3        Unreviewed, rolling out r142347.
     4        http://trac.webkit.org/changeset/142347
     5        https://bugs.webkit.org/show_bug.cgi?id=108273
     6
     7        Because a depending change r142343 was rolled out.
     8
     9        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
     10        (WTR::InjectedBundlePage::InjectedBundlePage):
     11
    1122013-02-10  Kent Tamura  <tkent@chromium.org>
    213

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

    r142347 r142405  
    369369        didReachApplicationCacheOriginQuota,
    370370        didExceedDatabaseQuota,
     371        0, /*plugInStartLabelImage*/
    371372        0, /*plugInStartLabelTitle*/
    372373        0, /*plugInStartLabelSubtitle*/
Note: See TracChangeset for help on using the changeset viewer.