Changeset 74282 in webkit

Timestamp:

Dec 17, 2010 11:35:46 AM (13 years ago)

Author:

weinig@apple.com

Message:

WebKit2: Implement a title attribute per frame
​https://bugs.webkit.org/show_bug.cgi?id=51266

Reviewed by Darin Adler.

Cache the title of each frame on the WebFrameProxy. Removes
the WebPageProxy's cache of the main frame title to just
access the main frame.

We clear the cached title on new committed loads and on failures
to load.

• UIProcess/API/C/WKFrame.cpp:

(WKFrameCopyTitle):

• UIProcess/API/C/WKFrame.h:
• UIProcess/WebFrameProxy.cpp:

(WebKit::WebFrameProxy::didCommitLoad):
(WebKit::WebFrameProxy::didFailLoad):
(WebKit::WebFrameProxy::didChangeTitle):

• UIProcess/WebFrameProxy.h:

(WebKit::WebFrameProxy::title):

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::close):
(WebKit::WebPageProxy::pageTitle):
(WebKit::WebPageProxy::didReceiveTitleForFrame):
(WebKit::WebPageProxy::processDidCrash):

• UIProcess/WebPageProxy.h:

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/WKFrame.cpp (modified) (1 diff)
• UIProcess/API/C/WKFrame.h (modified) (1 diff)
• UIProcess/WebFrameProxy.cpp (modified) (3 diffs)
• UIProcess/WebFrameProxy.h (modified) (3 diffs)
• UIProcess/WebPageProxy.cpp (modified) (4 diffs)
• UIProcess/WebPageProxy.h (modified) (2 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-12-17  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        WebKit2: Implement a title attribute per frame
+        https://bugs.webkit.org/show_bug.cgi?id=51266
+
+        Cache the title of each frame on the WebFrameProxy. Removes
+        the WebPageProxy's cache of the main frame title to just
+        access the main frame.
+
+        We clear the cached title on new committed loads and on failures
+        to load.
+
+        * UIProcess/API/C/WKFrame.cpp:
+        (WKFrameCopyTitle):
+        * UIProcess/API/C/WKFrame.h:
+        * UIProcess/WebFrameProxy.cpp:
+        (WebKit::WebFrameProxy::didCommitLoad):
+        (WebKit::WebFrameProxy::didFailLoad):
+        (WebKit::WebFrameProxy::didChangeTitle):
+        * UIProcess/WebFrameProxy.h:
+        (WebKit::WebFrameProxy::title):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::close):
+        (WebKit::WebPageProxy::pageTitle):
+        (WebKit::WebPageProxy::didReceiveTitleForFrame):
+        (WebKit::WebPageProxy::processDidCrash):
+        * UIProcess/WebPageProxy.h:
+
 2010-12-16  Darin Adler  <darin@apple.com>
 

trunk/WebKit2/UIProcess/API/C/WKFrame.cpp

@@ -77 +77 @@
 }
 
+WKStringRef WKFrameCopyTitle(WKFrameRef frameRef)
+{
+    return toCopiedAPI(toImpl(frameRef)->title());
+}
+
 WKPageRef WKFrameGetPage(WKFrameRef frameRef)
 {

trunk/WebKit2/UIProcess/API/C/WKFrame.h

@@ -50 +50 @@
 WK_EXPORT WKURLRef WKFrameCopyProvisionalURL(WKFrameRef frame);
 WK_EXPORT WKURLRef WKFrameCopyURL(WKFrameRef frame);
-
 WK_EXPORT WKURLRef WKFrameCopyUnreachableURL(WKFrameRef frame);
 
 WK_EXPORT WKStringRef WKFrameCopyMIMEType(WKFrameRef frame);
+WK_EXPORT WKStringRef WKFrameCopyTitle(WKFrameRef frame);
 
 WK_EXPORT WKPageRef WKFrameGetPage(WKFrameRef frame);

trunk/WebKit2/UIProcess/WebFrameProxy.cpp

@@ -128 +128 @@
 void WebFrameProxy::didCommitLoad()
 {
-    // FIXME: Add assertions.
     m_loadState = LoadStateCommitted;
     m_url = m_provisionalURL;
     m_provisionalURL = String();
+    m_title = String();
 }
 
@@ -143 +143 @@
 {
     m_loadState = LoadStateFinished;
+    m_title = String();
 }
 
@@ -150 +151 @@
 }
 
-void WebFrameProxy::didReceiveTitle(const String&)
+void WebFrameProxy::didChangeTitle(const String& title)
 {
+    m_title = title;
 }
 

trunk/WebKit2/UIProcess/WebFrameProxy.h

@@ -85 +85 @@
     const String& mimeType() const { return m_MIMEType; }
 
+    const String& title() const { return m_title; }
+
     void setCertificateInfo(PassRefPtr<WebCertificateInfo>);
     WebCertificateInfo* certificateInfo() const { return m_certificateInfo.get(); }
@@ -101 +103 @@
     void didFailLoad();
     void didSameDocumentNavigation(const String&); // eg. anchor navigation, session state change.
-    void didReceiveTitle(const String&);
+    void didChangeTitle(const String&);
 
     void receivedPolicyDecision(WebCore::PolicyAction, uint64_t listenerID);
@@ -118 +120 @@
     String m_unreachableURL;
     String m_MIMEType;
+    String m_title;
     bool m_isFrameSet;
     RefPtr<WebCertificateInfo> m_certificateInfo;

trunk/WebKit2/UIProcess/WebPageProxy.cpp

@@ -239 +239 @@
     }
 
-    m_pageTitle = String();
     m_toolTip = String();
 
@@ -624 +623 @@
 }
 
+String WebPageProxy::pageTitle() const
+{
+    // Return the null string if there is no main frame (e.g. nothing has been loaded in the page yet, WebProcess has
+    // crashed, page has been closed).
+    if (!m_mainFrame)
+        return String();
+
+    return m_mainFrame->title();
+}
+
 void WebPageProxy::setUserAgent(const String& userAgent)
 {
@@ -1015 +1024 @@
 
     WebFrameProxy* frame = process()->webFrame(frameID);
-
-    frame->didReceiveTitle(title);
-
-    // Cache the title for the main frame in the page.
-    if (frame == m_mainFrame)
-        m_pageTitle = title;
-
+    frame->didChangeTitle(title);
+    
     m_loaderClient.didReceiveTitleForFrame(this, title, frame, userData.get());
 }
@@ -1715 +1719 @@
     }
 
-    m_pageTitle = String();
     m_toolTip = String();
 

trunk/WebKit2/UIProcess/WebPageProxy.h

@@ -202 +202 @@
 #endif
 
-    const String& pageTitle() const { return m_pageTitle; }
+    String pageTitle() const;
     const String& toolTip() const { return m_toolTip; }
 
@@ -436 +436 @@
     RefPtr<WebFrameProxy> m_mainFrame;
     RefPtr<WebFrameProxy> m_focusedFrame;
-    String m_pageTitle;
 
     String m_userAgent;