Changeset 85120 in webkit


Ignore:
Timestamp:
Apr 27, 2011 4:45:37 PM (13 years ago)
Author:
weinig@apple.com
Message:

2011-04-27 Sam Weinig <​sam@webkit.org>

Reviewed by Adam Roben.

WebKit2 needs to notify the client when a plugin fails to initialize
​https://bugs.webkit.org/show_bug.cgi?id=59657

Add didFailToInitializePlugin client function and call it when a plugin
fails to initialize.

  • UIProcess/API/C/WKPage.h:
  • UIProcess/API/qt/qwkpage.cpp: (QWKPage::QWKPage):
  • UIProcess/WebLoaderClient.cpp: (WebKit::WebLoaderClient::didFailToInitializePlugin):
  • UIProcess/WebLoaderClient.h:
  • UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::didFailToInitializePlugin):
  • UIProcess/WebPageProxy.h:
  • UIProcess/WebPageProxy.messages.in:
  • WebProcess/Plugins/PluginView.cpp: (WebKit::PluginView::initializePlugin):

2011-04-27 Sam Weinig <​sam@webkit.org>

Reviewed by Adam Roben.

WebKit2 needs to notify the client when a plugin fails to initialize
​https://bugs.webkit.org/show_bug.cgi?id=59657

  • MiniBrowser/mac/BrowserWindowController.m: (-[BrowserWindowController awakeFromNib]):
  • WebKitTestRunner/TestController.cpp: (WTR::TestController::initialize): Add stubs.
Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r85109 r85120  
     12011-04-27  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Adam Roben.
     4
     5        WebKit2 needs to notify the client when a plugin fails to initialize
     6        https://bugs.webkit.org/show_bug.cgi?id=59657
     7
     8        Add didFailToInitializePlugin client function and call it when a plugin
     9        fails to initialize.
     10
     11        * UIProcess/API/C/WKPage.h:
     12        * UIProcess/API/qt/qwkpage.cpp:
     13        (QWKPage::QWKPage):
     14        * UIProcess/WebLoaderClient.cpp:
     15        (WebKit::WebLoaderClient::didFailToInitializePlugin):
     16        * UIProcess/WebLoaderClient.h:
     17        * UIProcess/WebPageProxy.cpp:
     18        (WebKit::WebPageProxy::didFailToInitializePlugin):
     19        * UIProcess/WebPageProxy.h:
     20        * UIProcess/WebPageProxy.messages.in:
     21        * WebProcess/Plugins/PluginView.cpp:
     22        (WebKit::PluginView::initializePlugin):
     23
    1242011-04-27  Pratik Solanki  <psolanki@apple.com>
    225

  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.h

    r84702 r85120  
    6969typedef void (*WKPageDidChangeBackForwardListCallback)(WKPageRef page, WKBackForwardListItemRef addedItem, WKArrayRef removedItems, const void *clientInfo);
    7070typedef bool (*WKPageShouldGoToBackForwardListItemCallback)(WKPageRef page, WKBackForwardListItemRef item, const void *clientInfo);
     71typedef void (*WKPageDidFailToInitializePluginCallback)(WKPageRef page, WKStringRef mimeType, const void* clientInfo);
    7172
    7273struct WKPageLoaderClient {
    … …  
    99100    WKPageCallback                                                      processDidBecomeResponsive;
    100101    WKPageCallback                                                      processDidCrash;
    101 
    102102    WKPageDidChangeBackForwardListCallback                              didChangeBackForwardList;
    103103    WKPageShouldGoToBackForwardListItemCallback                         shouldGoToBackForwardListItem;
     104    WKPageDidFailToInitializePluginCallback                             didFailToInitializePlugin;
    104105};
    105106typedef struct WKPageLoaderClient WKPageLoaderClient;

  • trunk/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp

    r84702 r85120  
    458458        0,  /* processDidCrash */
    459459        0,  /* didChangeBackForwardList */
    460         0   /* shouldGoToBackForwardListItem */
     460        0,  /* shouldGoToBackForwardListItem */
     461        0   /* didFailToInitializePlugin */
    461462    };
    462463    WKPageSetPageLoaderClient(pageRef(), &loadClient);

  • trunk/Source/WebKit2/UIProcess/WebLoaderClient.cpp

    r78588 r85120  
    232232}
    233233
     234void WebLoaderClient::didFailToInitializePlugin(WebPageProxy* page, const String& mimeType)
     235{
     236    if (!m_client.didFailToInitializePlugin)
     237        return;
     238
     239    m_client.didFailToInitializePlugin(toAPI(page), toAPI(mimeType.impl()), m_client.clientInfo);
     240}
     241
    234242} // namespace WebKit

  • trunk/Source/WebKit2/UIProcess/WebLoaderClient.h

    r78588 r85120  
    7979    void didChangeBackForwardList(WebPageProxy*, WebBackForwardListItem* addedItem, Vector<RefPtr<APIObject> >* removedItems);
    8080    bool shouldGoToBackForwardListItem(WebPageProxy*, WebBackForwardListItem*);
     81
     82    void didFailToInitializePlugin(WebPageProxy*, const String& mimeType);
    8183};
    8284

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r84723 r85120  
    29592959}
    29602960
     2961void WebPageProxy::didFailToInitializePlugin(const String& mimeType)
     2962{
     2963    m_loaderClient.didFailToInitializePlugin(this, mimeType);
     2964}
     2965
    29612966void WebPageProxy::didFinishLoadingDataForCustomRepresentation(const String& suggestedFilename, const CoreIPC::DataReference& dataReference)
    29622967{

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r84785 r85120  
    588588    void didChangeScrollbarsForMainFrame(bool hasHorizontalScrollbar, bool hasVerticalScrollbar);
    589589    void didChangeScrollOffsetPinningForMainFrame(bool pinnedToLeftSide, bool pinnedToRightSide);
     590    void didFailToInitializePlugin(const String& mimeType);
    590591
    591592    void reattachToWebProcess();

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

    r84702 r85120  
    6161    DidChangeScrollbarsForMainFrame(bool hasHorizontalScrollbar, bool hasVerticalScrollbar)
    6262    DidChangeScrollOffsetPinningForMainFrame(bool hasHorizontalScrollbar, bool hasVerticalScrollbar)
     63    DidFailToInitializePlugin(WTF::String mimeType)
    6364
    6465#if ENABLE(TILED_BACKING_STORE)

  • trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

    r84523 r85120  
    442442        m_plugin = 0;
    443443
     444        m_webPage->send(Messages::WebPageProxy::DidFailToInitializePlugin(m_parameters.mimeType));
    444445        return;
    445446    }

  • trunk/Tools/ChangeLog

    r85119 r85120  
     12011-04-27  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Adam Roben.
     4
     5        WebKit2 needs to notify the client when a plugin fails to initialize
     6        https://bugs.webkit.org/show_bug.cgi?id=59657
     7
     8        * MiniBrowser/mac/BrowserWindowController.m:
     9        (-[BrowserWindowController awakeFromNib]):
     10        * WebKitTestRunner/TestController.cpp:
     11        (WTR::TestController::initialize):
     12        Add stubs.
     13
    1142011-04-26  Sam Weinig  <sam@webkit.org>
    215

  • trunk/Tools/MiniBrowser/mac/BrowserWindowController.m

    r84702 r85120  
    599599        processDidExit,
    600600        didChangeBackForwardList,
    601         0 // shouldGoToBackForwardItem
     601        0, // shouldGoToBackForwardItem
     602        0  // didFailToInitializePlugin
    602603    };
    603604    WKPageSetPageLoaderClient(_webView.pageRef, &loadClient);

  • trunk/Tools/WebKitTestRunner/TestController.cpp

    r85115 r85120  
    346346        0, // didBecomeUnresponsive
    347347        0, // didBecomeResponsive
    348         processDidCrash, // processDidCrash
     348        processDidCrash,
    349349        0, // didChangeBackForwardList
    350         0 // shouldGoToBackForwardListItem
     350        0, // shouldGoToBackForwardListItem
     351        0  // didFailToInitializePlugin
    351352    };
    352353    WKPageSetPageLoaderClient(m_mainWebView->page(), &pageLoaderClient);
Note: See TracChangeset for help on using the changeset viewer.