Changeset 58221 in webkit


Ignore:
Timestamp:
Apr 24, 2010 2:54:08 PM (14 years ago)
Author:
mitz@apple.com
Message:

<rdar://problem/7903728> REGRESSION (r51617): WebView fails to load plug-in MIME types
https://bugs.webkit.org/show_bug.cgi?id=38085

Reviewed by Darin Adler.

WebView was calling -_webView in a few places where it should have just used itself. It never
makes sense for WebView to call -_webView on itself, and these calls look like they were copied
from similar code in WebHTMLView, WebFrameView and WebDataSource, where -_webView has a different,
useful meaning.

  • WebView/WebView.mm:

(-[WebView drawSingleRect:]): Replaced [self _webView] with self.
(-[WebView _viewClass:andRepresentationClass:forMIMEType:]): Replaced [[self _webView] preferences]
with _private->preferences.
(-[WebView _canShowMIMEType:]): Ditto.

Location:
trunk/WebKit/mac
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/mac/ChangeLog

    r58202 r58221  
     12010-04-24  Dan Bernstein  <mitz@apple.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        <rdar://problem/7903728> REGRESSION (r51617): WebView fails to load plug-in MIME types
     6        https://bugs.webkit.org/show_bug.cgi?id=38085
     7
     8        WebView was calling -_webView in a few places where it should have just used itself. It never
     9        makes sense for WebView to call -_webView on itself, and these calls look like they were copied
     10        from similar code in WebHTMLView, WebFrameView and WebDataSource, where -_webView has a different,
     11        useful meaning.
     12
     13        * WebView/WebView.mm:
     14        (-[WebView drawSingleRect:]): Replaced [self _webView] with self.
     15        (-[WebView _viewClass:andRepresentationClass:forMIMEType:]): Replaced [[self _webView] preferences]
     16        with _private->preferences.
     17        (-[WebView _canShowMIMEType:]): Ditto.
     18
    1192010-04-23  Simon Fraser  <simon.fraser@apple.com>
    220
  • trunk/WebKit/mac/WebView/WebView.mm

    r58072 r58221  
    759759        [[self mainFrame] _drawRect:rect contentsOnly:NO];
    760760
    761         WebView *webView = [self _webView];
    762         [[webView _UIDelegateForwarder] webView:webView didDrawRect:rect];
    763 
    764         if (WebNodeHighlight *currentHighlight = [webView currentNodeHighlight])
     761        [[self _UIDelegateForwarder] webView:self didDrawRect:rect];
     762
     763        if (WebNodeHighlight *currentHighlight = [self currentNodeHighlight])
    765764            [currentHighlight setNeedsUpdateInTargetViewRect:rect];
    766765
     
    899898- (BOOL)_viewClass:(Class *)vClass andRepresentationClass:(Class *)rClass forMIMEType:(NSString *)MIMEType
    900899{
    901     if ([[self class] _viewClass:vClass andRepresentationClass:rClass forMIMEType:MIMEType allowingPlugins:[[[self _webView] preferences] arePlugInsEnabled]])
     900    if ([[self class] _viewClass:vClass andRepresentationClass:rClass forMIMEType:MIMEType allowingPlugins:[_private->preferences arePlugInsEnabled]])
    902901        return YES;
    903902
     
    25052504- (BOOL)_canShowMIMEType:(NSString *)MIMEType
    25062505{
    2507     return [[self class] _canShowMIMEType:MIMEType allowingPlugins:[[[self _webView] preferences] arePlugInsEnabled]];
     2506    return [[self class] _canShowMIMEType:MIMEType allowingPlugins:[_private->preferences arePlugInsEnabled]];
    25082507}
    25092508
Note: See TracChangeset for help on using the changeset viewer.