Changeset 70561 in webkit

Timestamp:

Oct 26, 2010 1:16:18 PM (14 years ago)

Author:

bweinstein@apple.com

Message:

Need a way to retrieve custom user agent from a WKPage
​https://bugs.webkit.org/show_bug.cgi?id=48360
<rdar://problem/8466537>

Reviewed by Darin Adler.

Add an exported function on WKPage to get the page's custom user agent.

• UIProcess/API/C/WKPage.cpp:

(WKPageCopyCustomUserAgent): Exported function that returns the custom user

agent.

• UIProcess/API/C/WKPage.h:
• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::close): Clear the custom user agent string.
(WebKit::WebPageProxy::processDidCrash): Ditto.
(WebKit::WebPageProxy::setCustomUserAgent): Add a new early return if we're setting

the custom user agent to what it was before, and set the custom user agent member
variable.

• UIProcess/WebPageProxy.h:

(WebKit::WebPageProxy::customUserAgent): Returns the custom user agent.

Location:

trunk/WebKit2

Files:

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

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-26  Brian Weinstein  <bweinstein@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Need a way to retrieve custom user agent from a WKPage
+        https://bugs.webkit.org/show_bug.cgi?id=48360
+        <rdar://problem/8466537>
+        
+        Add an exported function on WKPage to get the page's custom user agent.
+
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageCopyCustomUserAgent): Exported function that returns the custom user
+            agent.
+        * UIProcess/API/C/WKPage.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::close): Clear the custom user agent string.
+        (WebKit::WebPageProxy::processDidCrash): Ditto.
+        (WebKit::WebPageProxy::setCustomUserAgent): Add a new early return if we're setting
+            the custom user agent to what it was before, and set the custom user agent member
+            variable.
+        * UIProcess/WebPageProxy.h:
+        (WebKit::WebPageProxy::customUserAgent): Returns the custom user agent.
+
 2010-10-26  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -153 +153 @@
 }
 
+WKStringRef WKPageCopyCustomUserAgent(WKPageRef pageRef)
+{
+    return toCopiedAPI(toImpl(pageRef)->customUserAgent());
+}
+
 void WKPageSetCustomUserAgent(WKPageRef pageRef, WKStringRef userAgentRef)
 {

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

@@ -215 +215 @@
 WK_EXPORT WKInspectorRef WKPageGetInspector(WKPageRef page);
 
+WK_EXPORT WKStringRef WKPageCopyCustomUserAgent(WKPageRef page);
 WK_EXPORT void WKPageSetCustomUserAgent(WKPageRef page, WKStringRef userAgent);
 

trunk/WebKit2/UIProcess/WebPageProxy.cpp

@@ -187 +187 @@
     m_mainFrame = 0;
 
+    m_customUserAgent = String();
     m_pageTitle = String();
     m_toolTip = String();
@@ -458 +459 @@
         return;
 
+    if (m_customUserAgent == userAgent || (m_customUserAgent.isEmpty() && userAgent.isEmpty()))
+        return;
+
+    m_customUserAgent = userAgent;
     process()->send(Messages::WebPage::SetCustomUserAgent(userAgent), m_pageID);
 }
@@ -1179 +1184 @@
     }
 
+    m_customUserAgent = String();
     m_pageTitle = String();
     m_toolTip = String();

trunk/WebKit2/UIProcess/WebPageProxy.h

@@ -167 +167 @@
     const String& pageTitle() const { return m_pageTitle; }
     const String& toolTip() const { return m_toolTip; }
+    const String& customUserAgent() const { return m_customUserAgent; }
 
     double estimatedProgress() const { return m_estimatedProgress; }
@@ -328 +329 @@
     String m_pageTitle;
 
+    String m_customUserAgent;
+
     RefPtr<WebInspectorProxy> m_inspector;