Changeset 150205 in webkit

Timestamp:

May 16, 2013, 1:50:06 PM (12 years ago)

Author:

mitz@apple.com

Message:

-webView:updateHistoryTitle:forURL: does not pass a frame to the delegate
​https://bugs.webkit.org/show_bug.cgi?id=116243

Reviewed by Anders Carlsson.

Added a WebFrame parameter to the delegate method.

• WebCoreSupport/WebFrameLoaderClient.mm:

(WebFrameLoaderClient::setTitle): Pass the frame to the delegate. Maintain
compatibility with clients that implement the old delegate method that
doesn’t take a frame.

• WebView/WebDelegateImplementationCaching.h:

(WebHistoryDelegateImplementationCache): Added a field to cache the
implementation of the old delegate method.

• WebView/WebHistoryDelegate.h: Changed the signature of the delegate method.
• WebView/WebView.mm:

(-[WebView _cacheHistoryDelegateImplementations]): Cache the implementation
of the new delegate method, but also check for the old one.

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/WebFrameLoaderClient.mm (modified) (1 diff)
• WebView/WebDelegateImplementationCaching.h (modified) (1 diff)
• WebView/WebHistoryDelegate.h (modified) (1 diff)
• WebView/WebView.mm (modified) (1 diff)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2013-05-16  Dan Bernstein  <mitz@apple.com>
+
+        -webView:updateHistoryTitle:forURL: does not pass a frame to the delegate
+        https://bugs.webkit.org/show_bug.cgi?id=116243
+
+        Reviewed by Anders Carlsson.
+
+        Added a WebFrame parameter to the delegate method.
+
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (WebFrameLoaderClient::setTitle): Pass the frame to the delegate. Maintain
+        compatibility with clients that implement the old delegate method that
+        doesn’t take a frame.
+        * WebView/WebDelegateImplementationCaching.h:
+        (WebHistoryDelegateImplementationCache): Added a field to cache the
+        implementation of the old delegate method.
+        * WebView/WebHistoryDelegate.h: Changed the signature of the delegate method.
+        * WebView/WebView.mm:
+        (-[WebView _cacheHistoryDelegateImplementations]): Cache the implementation
+        of the new delegate method, but also check for the old one.
+
 2013-05-16  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

@@ -1174 +1174 @@
     if ([view historyDelegate]) {
         WebHistoryDelegateImplementationCache* implementations = WebViewGetHistoryDelegateImplementations(view);
-        if (!implementations->setTitleFunc)
-            return;
-            
         // FIXME: use direction of title.
-        CallHistoryDelegate(implementations->setTitleFunc, view, @selector(webView:updateHistoryTitle:forURL:), (NSString *)title.string(), (NSString *)url);
+        if (implementations->setTitleFunc)
+            CallHistoryDelegate(implementations->setTitleFunc, view, @selector(webView:updateHistoryTitle:forURL:inFrame:), (NSString *)title.string(), (NSString *)url, m_webFrame.get());
+        else if (implementations->deprecatedSetTitleFunc)
+            CallHistoryDelegate(implementations->deprecatedSetTitleFunc, view, @selector(webView:updateHistoryTitle:forURL:), (NSString *)title.string(), (NSString *)url);
+
         return;
     }

trunk/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.h

@@ -102 +102 @@
     IMP clientRedirectFunc;
     IMP serverRedirectFunc;
+    IMP deprecatedSetTitleFunc;
     IMP setTitleFunc;
     IMP populateVisitedLinksFunc;

trunk/Source/WebKit/mac/WebView/WebHistoryDelegate.h

@@ -38 +38 @@
 - (void)webView:(WebView *)webView didPerformServerRedirectFromURL:(NSString *)sourceURL toURL:(NSString *)destinationURL inFrame:(WebFrame *)webFrame;
 
-- (void)webView:(WebView *)webView updateHistoryTitle:(NSString *)title forURL:(NSString *)url;
+- (void)webView:(WebView *)webView updateHistoryTitle:(NSString *)title forURL:(NSString *)url inFrame:(WebFrame *)webFrame;
 
 - (void)populateVisitedLinksForWebView:(WebView *)webView;

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -1721 +1721 @@
     cache->clientRedirectFunc = getMethod(delegate, @selector(webView:didPerformClientRedirectFromURL:toURL:inFrame:));
     cache->serverRedirectFunc = getMethod(delegate, @selector(webView:didPerformServerRedirectFromURL:toURL:inFrame:));
-    cache->setTitleFunc = getMethod(delegate, @selector(webView:updateHistoryTitle:forURL:));
+    cache->deprecatedSetTitleFunc = getMethod(delegate, @selector(webView:updateHistoryTitle:forURL:));
+    cache->setTitleFunc = getMethod(delegate, @selector(webView:updateHistoryTitle:forURL:inFrame:));
     cache->populateVisitedLinksFunc = getMethod(delegate, @selector(populateVisitedLinksForWebView:));
 }