Title: [125197] trunk
- Revision
- 125197
- Author
- [email protected]
- Date
- 2012-08-09 13:31:17 -0700 (Thu, 09 Aug 2012)
Log Message
[WK2] Add a process model constant for multiple processes
https://bugs.webkit.org/show_bug.cgi?id=93642
Reviewed by Anders Carlsson.
* UIProcess/ProcessModel.h: Added ProcessModelMultipleSecondaryProcesses.
Deleted ProcessModelSecondaryProcess in favor of more descriptive ProcessModelSharedSecondaryProcess -
these used to behave the same.
* UIProcess/WebContext.cpp: (WebKit::WebContext::create): Changed to use ProcessModelSharedSecondaryProcess.
* UIProcess/WebProcessProxy.h: Removed an unncessary include of ProcessModel.h.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (125196 => 125197)
--- trunk/Source/WebKit2/ChangeLog 2012-08-09 20:15:03 UTC (rev 125196)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-09 20:31:17 UTC (rev 125197)
@@ -1,3 +1,18 @@
+2012-08-09 Alexey Proskuryakov <[email protected]>
+
+ [WK2] Add a process model constant for multiple processes
+ https://bugs.webkit.org/show_bug.cgi?id=93642
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/ProcessModel.h: Added ProcessModelMultipleSecondaryProcesses.
+ Deleted ProcessModelSecondaryProcess in favor of more descriptive ProcessModelSharedSecondaryProcess -
+ these used to behave the same.
+
+ * UIProcess/WebContext.cpp: (WebKit::WebContext::create): Changed to use ProcessModelSharedSecondaryProcess.
+
+ * UIProcess/WebProcessProxy.h: Removed an unncessary include of ProcessModel.h.
+
2012-08-09 Dan Bernstein <[email protected]>
<rdar://problem/12035637> 32-bit PluginProcess launches without appropriate DYLD environment variables if UI process is 64-bit only
Modified: trunk/Source/WebKit2/UIProcess/ProcessModel.h (125196 => 125197)
--- trunk/Source/WebKit2/UIProcess/ProcessModel.h 2012-08-09 20:15:03 UTC (rev 125196)
+++ trunk/Source/WebKit2/UIProcess/ProcessModel.h 2012-08-09 20:31:17 UTC (rev 125197)
@@ -31,7 +31,7 @@
enum ProcessModel {
ProcessModelSharedSecondaryProcess,
ProcessModelSharedSecondaryThread,
- ProcessModelSecondaryProcess
+ ProcessModelMultipleSecondaryProcesses
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (125196 => 125197)
--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2012-08-09 20:15:03 UTC (rev 125196)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2012-08-09 20:31:17 UTC (rev 125197)
@@ -106,7 +106,7 @@
JSC::initializeThreading();
WTF::initializeMainThread();
RunLoop::initializeMainRunLoop();
- return adoptRef(new WebContext(ProcessModelSecondaryProcess, injectedBundlePath));
+ return adoptRef(new WebContext(ProcessModelSharedSecondaryProcess, injectedBundlePath));
}
static Vector<WebContext*>& contexts()
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (125196 => 125197)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2012-08-09 20:15:03 UTC (rev 125196)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2012-08-09 20:31:17 UTC (rev 125197)
@@ -29,7 +29,6 @@
#include "PlatformProcessIdentifier.h"
#include "PluginInfoStore.h"
#include "ProcessLauncher.h"
-#include "ProcessModel.h"
#include "ResponsivenessTimer.h"
#include "ThreadLauncher.h"
#include "WebConnectionToWebProcess.h"
Modified: trunk/Tools/ChangeLog (125196 => 125197)
--- trunk/Tools/ChangeLog 2012-08-09 20:15:03 UTC (rev 125196)
+++ trunk/Tools/ChangeLog 2012-08-09 20:31:17 UTC (rev 125197)
@@ -1,3 +1,12 @@
+2012-08-09 Alexey Proskuryakov <[email protected]>
+
+ [WK2] Add a process model constant for multiple processes
+ https://bugs.webkit.org/show_bug.cgi?id=93642
+
+ Reviewed by Anders Carlsson.
+
+ * MiniBrowser/mac/AppDelegate.h: Updated process model enum to match WebKit.
+
2012-08-09 Ryosuke Niwa <[email protected]>
Build fix after r125178.
Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.h (125196 => 125197)
--- trunk/Tools/MiniBrowser/mac/AppDelegate.h 2012-08-09 20:15:03 UTC (rev 125196)
+++ trunk/Tools/MiniBrowser/mac/AppDelegate.h 2012-08-09 20:31:17 UTC (rev 125197)
@@ -23,9 +23,11 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+// FIXME: We should expose process model via an API header.
enum ProcessModel {
+ kProcessModelSharedSecondaryProcess,
kProcessModelSharedSecondaryThread,
- kProcessModelSharedSecondaryProcess
+ kProcessModelMultipleSecondaryProcesses
};
typedef unsigned long ProcessModel;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
