Changeset 58221 in webkit

Timestamp:

Apr 24, 2010, 2:54:08 PM (15 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:

• ChangeLog (modified) (1 diff)
• WebView/WebView.mm (modified) (3 diffs)

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2010-04-24  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/7903728> REGRESSION (r51617): WebView fails to load plug-in MIME types
+        https://bugs.webkit.org/show_bug.cgi?id=38085
+
+        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.
+
 2010-04-23  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebKit/mac/WebView/WebView.mm

@@ -759 +759 @@
         [[self mainFrame] _drawRect:rect contentsOnly:NO];
 
-        WebView *webView = [self _webView];
-        [[webView _UIDelegateForwarder] webView:webView didDrawRect:rect];
-
-        if (WebNodeHighlight *currentHighlight = [webView currentNodeHighlight])
+        [[self _UIDelegateForwarder] webView:self didDrawRect:rect];
+
+        if (WebNodeHighlight *currentHighlight = [self currentNodeHighlight])
             [currentHighlight setNeedsUpdateInTargetViewRect:rect];
 
@@ -899 +898 @@
 - (BOOL)_viewClass:(Class *)vClass andRepresentationClass:(Class *)rClass forMIMEType:(NSString *)MIMEType
 {
-    if ([[self class] _viewClass:vClass andRepresentationClass:rClass forMIMEType:MIMEType allowingPlugins:[[[self _webView] preferences] arePlugInsEnabled]])
+    if ([[self class] _viewClass:vClass andRepresentationClass:rClass forMIMEType:MIMEType allowingPlugins:[_private->preferences arePlugInsEnabled]])
         return YES;
 
@@ -2505 +2504 @@
 - (BOOL)_canShowMIMEType:(NSString *)MIMEType
 {
-    return [[self class] _canShowMIMEType:MIMEType allowingPlugins:[[[self _webView] preferences] arePlugInsEnabled]];
+    return [[self class] _canShowMIMEType:MIMEType allowingPlugins:[_private->preferences arePlugInsEnabled]];
 }