Changeset 96279 in webkit


Ignore:
Timestamp:
Sep 28, 2011 5:45:26 PM (13 years ago)
Author:
Joseph Pecoraro
Message:

ASSERT if WebView's UIDelegate does not implement webView:runOpenPanel
https://bugs.webkit.org/show_bug.cgi?id=69037

Reviewed by Alexey Proskuryakov.

  • WebCoreSupport/WebChromeClient.mm:

(WebChromeClient::runOpenPanel):
If no delegate is implemented, dismiss the listener
with a cancel. It expects some action.

Location:
trunk/Source/WebKit/mac
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/mac/ChangeLog

    r96255 r96279  
     12011-09-28  Joseph Pecoraro  <joepeck@webkit.org>
     2
     3        ASSERT if WebView's UIDelegate does not implement webView:runOpenPanel
     4        https://bugs.webkit.org/show_bug.cgi?id=69037
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * WebCoreSupport/WebChromeClient.mm:
     9        (WebChromeClient::runOpenPanel):
     10        If no delegate is implemented, dismiss the listener
     11        with a cancel. It expects some action.
     12
    1132011-09-28  Anton D'Auria  <adauria@apple.com>
    214
  • trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm

    r95919 r96279  
    741741    if ([delegate respondsToSelector:@selector(webView:runOpenPanelForFileButtonWithResultListener:allowMultipleFiles:)])
    742742        CallUIDelegate(m_webView, @selector(webView:runOpenPanelForFileButtonWithResultListener:allowMultipleFiles:), listener, allowMultipleFiles);
     743    else if ([delegate respondsToSelector:@selector(webView:runOpenPanelForFileButtonWithResultListener:)])
     744        CallUIDelegate(m_webView, @selector(webView:runOpenPanelForFileButtonWithResultListener:), listener);
    743745    else
    744         CallUIDelegate(m_webView, @selector(webView:runOpenPanelForFileButtonWithResultListener:), listener);
     746        [listener cancel];
    745747    [listener release];
    746748    END_BLOCK_OBJC_EXCEPTIONS;
Note: See TracChangeset for help on using the changeset viewer.