Changeset 140903 in webkit

Timestamp:

Jan 25, 2013 9:42:07 PM (11 years ago)

Author:

akling@apple.com

Message:

[Mac] Defer loading the Web Inspector bundle until it's necessary.
<​http://webkit.org/b/107999>
<rdar://problem/13091861>

Reviewed by Anders Carlsson.

Don't instantiate an NSBundle for the Web Inspector before it's needed.
1.51MB progression on Membuster3.

• WebProcess/WebPage/WebInspector.cpp:

(WebKit::WebInspector::WebInspector):

• WebProcess/WebPage/WebInspector.h:

(WebInspector):

• WebProcess/WebPage/mac/WebInspectorMac.mm:

(WebKit::WebInspector::setInspectorUsesWebKitUserInterface):
(WebKit::WebInspector::localizedStringsURL):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebInspector.cpp (modified) (1 diff)
• WebProcess/WebPage/WebInspector.h (modified) (1 diff)
• WebProcess/WebPage/mac/WebInspectorMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-25  Andreas Kling  <akling@apple.com>
+
+        [Mac] Defer loading the Web Inspector bundle until it's necessary.
+        <http://webkit.org/b/107999>
+        <rdar://problem/13091861>
+
+        Reviewed by Anders Carlsson.
+
+        Don't instantiate an NSBundle for the Web Inspector before it's needed.
+        1.51MB progression on Membuster3.
+
+        * WebProcess/WebPage/WebInspector.cpp:
+        (WebKit::WebInspector::WebInspector):
+        * WebProcess/WebPage/WebInspector.h:
+        (WebInspector):
+        * WebProcess/WebPage/mac/WebInspectorMac.mm:
+        (WebKit::WebInspector::setInspectorUsesWebKitUserInterface):
+        (WebKit::WebInspector::localizedStringsURL):
+
 2013-01-25  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp

@@ -52 +52 @@
     , m_frontendClient(0)
     , m_frontendChannel(frontendChannel)
+#if PLATFORM(MAC)
+    , m_hasLocalizedStringsURL(false)
+    , m_usesWebKitUserInterface(false)
+#endif
 #if ENABLE(INSPECTOR_SERVER)
     , m_remoteFrontendConnected(false)

trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h

@@ -125 +125 @@
     WebCore::InspectorFrontendChannel* m_frontendChannel;
 #if PLATFORM(MAC)
-    String m_localizedStringsURL;
+    mutable String m_localizedStringsURL;
+    mutable bool m_hasLocalizedStringsURL;
+    bool m_usesWebKitUserInterface;
 #endif
 #if ENABLE(INSPECTOR_SERVER)

trunk/Source/WebKit2/WebProcess/WebPage/mac/WebInspectorMac.mm

@@ -51 +51 @@
 void WebInspector::setInspectorUsesWebKitUserInterface(bool flag)
 {
-    NSString *bundleIdentifier = inspectorReallyUsesWebKitUserInterface(flag) ? @"com.apple.WebCore" : @"com.apple.WebInspector";
-    NSString *path = [[NSBundle bundleWithIdentifier:bundleIdentifier] pathForResource:@"localizedStrings" ofType:@"js"];
-    if ([path length])
-        m_localizedStringsURL = [[NSURL fileURLWithPath:path] absoluteString];
-    else
-        m_localizedStringsURL = String();
+    if (m_usesWebKitUserInterface == flag)
+        return;
+
+    m_usesWebKitUserInterface = flag;
+    m_hasLocalizedStringsURL = false;
 }
 
 String WebInspector::localizedStringsURL() const
 {
+    if (!m_hasLocalizedStringsURL) {
+        NSString *bundleIdentifier = inspectorReallyUsesWebKitUserInterface(m_usesWebKitUserInterface) ? @"com.apple.WebCore" : @"com.apple.WebInspector";
+        NSString *path = [[NSBundle bundleWithIdentifier:bundleIdentifier] pathForResource:@"localizedStrings" ofType:@"js"];
+        if ([path length])
+            m_localizedStringsURL = [[NSURL fileURLWithPath:path] absoluteString];
+        else
+            m_localizedStringsURL = String();
+        m_hasLocalizedStringsURL = true;
+    }
     return m_localizedStringsURL;
 }