Changeset 70109 in webkit

Timestamp:

Oct 19, 2010 4:40:58 PM (14 years ago)

Author:

andersca@apple.com

Message:

Fix MiniBrowser crashes during startup and shutdown
​https://bugs.webkit.org/show_bug.cgi?id=47954

Reviewed by Sam Weinig.

• UIProcess/WebContext.cpp:

(WebKit::WebContext::sharedProcessContext):
Initialize the main thread.

(WebKit::WebContext::create):
Ditto.

(WebKit::WebContext::WebContext):
Add the language observer here so we know that it will always be set up.

(WebKit::WebContext::ensureWebProcess):
Remove code.

• UIProcess/WebContext.h:

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebContext.cpp (modified) (5 diffs)
• UIProcess/WebContext.h (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-19  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Fix MiniBrowser crashes during startup and shutdown
+        https://bugs.webkit.org/show_bug.cgi?id=47954
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::sharedProcessContext):
+        Initialize the main thread.
+        
+        (WebKit::WebContext::create):
+        Ditto.
+
+        (WebKit::WebContext::WebContext):
+        Add the language observer here so we know that it will always be set up.
+
+        (WebKit::WebContext::ensureWebProcess):
+        Remove code.
+
+        * UIProcess/WebContext.h:
+
 2010-10-19  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/UIProcess/WebContext.cpp

@@ -62 +62 @@
 WebContext* WebContext::sharedProcessContext()
 {
+    WTF::initializeMainThread();
     RunLoop::initializeMainRunLoop();
     static WebContext* context = adoptRef(new WebContext(ProcessModelSharedSecondaryProcess, String())).leakRef();
@@ -76 +77 @@
 PassRefPtr<WebContext> WebContext::create(const String& injectedBundlePath)
 {
+    WTF::initializeMainThread();
     RunLoop::initializeMainRunLoop();
     return adoptRef(new WebContext(ProcessModelSecondaryProcess, injectedBundlePath));
@@ -89 +91 @@
 #endif
 {
-    RunLoop::initializeMainRunLoop();
+    addLanguageChangeObserver(this, languageChanged);
 
     m_preferences = WebPreferences::shared();
@@ -125 +127 @@
 }
 
-static void languageChanged(void* context)
-{
-    WebProcessProxy* process = static_cast<WebContext*>(context)->process();
-    if (process)
-        process->send(Messages::WebProcess::LanguageChanged(defaultLanguage()), 0);
+void WebContext::languageChanged(void* context)
+{
+    static_cast<WebContext*>(context)->languageChanged();
+}
+
+void WebContext::languageChanged()
+{
+    if (!hasValidProcess())
+        return;
+
+    m_process->send(Messages::WebProcess::LanguageChanged(defaultLanguage()), 0);
 }
 
@@ -160 +168 @@
     parameters.shouldTrackVisitedLinks = m_historyClient.shouldTrackVisitedLinks();
     parameters.cacheModel = m_cacheModel;
-
     parameters.languageCode = defaultLanguage();
-    addLanguageChangeObserver(this, languageChanged);
-
     parameters.applicationCacheDirectory = applicationCacheDirectory();
 

trunk/WebKit2/UIProcess/WebContext.h

@@ -128 +128 @@
     void platformInitializeWebProcess(WebProcessCreationParameters&);
 
+    static void languageChanged(void* context);
+    void languageChanged();
+
     ProcessModel m_processModel;