Changeset 232159 in webkit

Timestamp:

May 24, 2018, 12:23:15 PM (8 years ago)

Author:

Chris Dumez

Message:

Cache navigator.userAgent for performance
​https://bugs.webkit.org/show_bug.cgi?id=185952

Reviewed by Geoffrey Garen.

Cache navigator.userAgent for performance. Previously, we would ask the client 5 times
while loading apple.com.

• page/Navigator.cpp:

(WebCore::Navigator::userAgent const):

• page/Navigator.h:
• page/NavigatorBase.h:
• page/NavigatorID.idl:
• page/WorkerNavigator.cpp:

(WebCore::WorkerNavigator::userAgent const):

• page/WorkerNavigator.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Navigator.cpp (modified) (1 diff)
• page/Navigator.h (modified) (2 diffs)
• page/NavigatorBase.h (modified) (1 diff)
• page/NavigatorID.idl (modified) (1 diff)
• page/WorkerNavigator.cpp (modified) (1 diff)
• page/WorkerNavigator.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-05-24  Chris Dumez  <cdumez@apple.com>
+
+        Cache navigator.userAgent for performance
+        https://bugs.webkit.org/show_bug.cgi?id=185952
+
+        Reviewed by Geoffrey Garen.
+
+        Cache navigator.userAgent for performance. Previously, we would ask the client 5 times
+        while loading apple.com.
+
+        * page/Navigator.cpp:
+        (WebCore::Navigator::userAgent const):
+        * page/Navigator.h:
+        * page/NavigatorBase.h:
+        * page/NavigatorID.idl:
+        * page/WorkerNavigator.cpp:
+        (WebCore::WorkerNavigator::userAgent const):
+        * page/WorkerNavigator.h:
+
 2018-05-24  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/page/Navigator.cpp

@@ -78 +78 @@
 }
 
-String Navigator::userAgent() const
+const String& Navigator::userAgent() const
 {
-    if (!m_frame)
-        return String();
-
-    // If the frame is already detached, FrameLoader::userAgent may malfunction, because it calls a client method
-    // that uses frame's WebView (at least, in Mac WebKit).
-    if (!m_frame->page())
-        return String();
-
-    return m_frame->loader().userAgent(m_frame->document()->url());
+    if (m_userAgent.isNull() && m_frame && m_frame->page())
+        m_userAgent = m_frame->loader().userAgent(m_frame->document()->url());
+    return m_userAgent;
 }
 

trunk/Source/WebCore/page/Navigator.h

@@ -40 +40 @@
     bool cookieEnabled() const;
     bool javaEnabled() const;
-    String userAgent() const final;
+    const String& userAgent() const final;
     bool onLine() const final;
     
@@ -54 +54 @@
     mutable RefPtr<DOMPluginArray> m_plugins;
     mutable RefPtr<DOMMimeTypeArray> m_mimeTypes;
+    mutable String m_userAgent;
 };
 

trunk/Source/WebCore/page/NavigatorBase.h

@@ -43 +43 @@
     static String appName();
     String appVersion() const;
-    virtual String userAgent() const = 0;
+    virtual const String& userAgent() const = 0;
     static String platform();
 

trunk/Source/WebCore/page/NavigatorID.idl

@@ -36 +36 @@
     readonly attribute DOMString product;
     [Exposed=Window] readonly attribute DOMString productSub;
-    readonly attribute DOMString userAgent;
+    [CachedAttribute] readonly attribute DOMString userAgent;
     [Exposed=Window] readonly attribute DOMString vendor;
     [Exposed=Window] readonly attribute DOMString vendorSub;

trunk/Source/WebCore/page/WorkerNavigator.cpp

@@ -37 +37 @@
 }
 
-String WorkerNavigator::userAgent() const
+const String& WorkerNavigator::userAgent() const
 {
     return m_userAgent;

trunk/Source/WebCore/page/WorkerNavigator.h

@@ -36 +36 @@
     static Ref<WorkerNavigator> create(ScriptExecutionContext& context, const String& userAgent, bool isOnline) { return adoptRef(*new WorkerNavigator(context, userAgent, isOnline)); }
 
-    String userAgent() const final;
+    const String& userAgent() const final;
     bool onLine() const final;
     void setIsOnline(bool isOnline) { m_isOnline = isOnline; }