Changeset 83895 in webkit

Timestamp:

Apr 14, 2011 2:39:08 PM (13 years ago)

Author:

weinig@apple.com

Message:

Make creating WebPreferences lazy
​https://bugs.webkit.org/show_bug.cgi?id=58570

Reviewed by Anders Carlsson.

• UIProcess/WebPageGroup.cpp:

(WebKit::WebPageGroup::WebPageGroup):
(WebKit::WebPageGroup::~WebPageGroup):
(WebKit::WebPageGroup::setPreferences):
(WebKit::WebPageGroup::preferences):

• UIProcess/WebPageGroup.h:

Don't create the WebPreference object until it is requested.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageGroup.cpp (modified) (3 diffs)
• UIProcess/WebPageGroup.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-14  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        Make creating WebPreferences lazy
+        https://bugs.webkit.org/show_bug.cgi?id=58570
+
+        * UIProcess/WebPageGroup.cpp:
+        (WebKit::WebPageGroup::WebPageGroup):
+        (WebKit::WebPageGroup::~WebPageGroup):
+        (WebKit::WebPageGroup::setPreferences):
+        (WebKit::WebPageGroup::preferences):
+        * UIProcess/WebPageGroup.h:
+        Don't create the WebPreference object until it is requested.
+
 2011-04-14  Pratik Solanki  <psolanki@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp

@@ -66 +66 @@
     m_data.pageGroupID = generatePageGroupID();
 
-    if (!identifier.isNull()) {
+    if (!identifier.isNull())
         m_data.identifer = identifier;
-        m_preferences = WebPreferences::create(identifier);
-    } else {
+    else
         m_data.identifer = m_data.identifer = makeString("__uniquePageGroupID-", String::number(m_data.pageGroupID));
-        m_preferences = WebPreferences::create();
-    }
-    m_preferences->addPageGroup(this);
 
     m_data.visibleToInjectedBundle = visibleToInjectedBundle;
@@ -81 +77 @@
 WebPageGroup::~WebPageGroup()
 {
-    m_preferences->removePageGroup(this);
+    if (m_preferences)
+        m_preferences->removePageGroup(this);
     webPageGroupMap().remove(pageGroupID());
 }
@@ -100 +97 @@
         return;
 
-    m_preferences->removePageGroup(this);
-    m_preferences = preferences;
-    m_preferences->addPageGroup(this);
+    if (!m_preferences) {
+        m_preferences = preferences;
+        m_preferences->addPageGroup(this);
+    } else {
+        m_preferences->removePageGroup(this);
+        m_preferences = preferences;
+        m_preferences->addPageGroup(this);
 
-    preferencesDidChange();
+        preferencesDidChange();
+    }
 }
 
 WebPreferences* WebPageGroup::preferences() const
 {
+    if (!m_preferences) {
+        if (!m_data.identifer.isNull())
+            m_preferences = WebPreferences::create(m_data.identifer);
+        else
+            m_preferences = WebPreferences::create();
+        m_preferences->addPageGroup(const_cast<WebPageGroup*>(this));
+    }
     return m_preferences.get();
 }

trunk/Source/WebKit2/UIProcess/WebPageGroup.h

@@ -64 +64 @@
 
     WebPageGroupData m_data;
-    RefPtr<WebPreferences> m_preferences;
+    mutable RefPtr<WebPreferences> m_preferences;
     HashSet<WebPageProxy*> m_pages;
 };