Title: [103755] trunk/Source/WebKit2
- Revision
- 103755
- Author
- [email protected]
- Date
- 2011-12-27 20:08:42 -0800 (Tue, 27 Dec 2011)
Log Message
[mac] Stop using bootstrap_look_up2
https://bugs.webkit.org/show_bug.cgi?id=75280
Reviewed by Mark Rowe.
* PluginProcess/mac/PluginProcessMainMac.mm:
(WebKit::PluginProcessMain): Changed to use bootstrap_look_up() instead of
bootstrap_look_up2().
* WebProcess/mac/WebProcessMainMac.mm:
(WebKit::WebProcessMain): Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (103754 => 103755)
--- trunk/Source/WebKit2/ChangeLog 2011-12-28 03:27:33 UTC (rev 103754)
+++ trunk/Source/WebKit2/ChangeLog 2011-12-28 04:08:42 UTC (rev 103755)
@@ -1,3 +1,16 @@
+2011-12-27 Dan Bernstein <[email protected]>
+
+ [mac] Stop using bootstrap_look_up2
+ https://bugs.webkit.org/show_bug.cgi?id=75280
+
+ Reviewed by Mark Rowe.
+
+ * PluginProcess/mac/PluginProcessMainMac.mm:
+ (WebKit::PluginProcessMain): Changed to use bootstrap_look_up() instead of
+ bootstrap_look_up2().
+ * WebProcess/mac/WebProcessMainMac.mm:
+ (WebKit::WebProcessMain): Ditto.
+
2011-12-27 Kenneth Rohde Christiansen <[email protected]>
[Qt] Make the inputMethodEvent set or confirm the composition
Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm (103754 => 103755)
--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm 2011-12-28 03:27:33 UTC (rev 103754)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm 2011-12-28 04:08:42 UTC (rev 103755)
@@ -42,9 +42,6 @@
#import <wtf/text/WTFString.h>
#include <stdio.h>
-// FIXME: We should be doing this another way.
-extern "C" kern_return_t bootstrap_look_up2(mach_port_t, const name_t, mach_port_t*, pid_t, uint64_t);
-
#define SHOW_CRASH_REPORTER 1
namespace WebKit {
@@ -76,9 +73,9 @@
// Get the server port.
mach_port_t serverPort;
- kern_return_t kr = bootstrap_look_up2(bootstrap_port, serviceName.utf8().data(), &serverPort, 0, 0);
+ kern_return_t kr = bootstrap_look_up(bootstrap_port, serviceName.utf8().data(), &serverPort);
if (kr) {
- printf("bootstrap_look_up2 result: %x", kr);
+ printf("bootstrap_look_up result: %x", kr);
return EXIT_FAILURE;
}
Modified: trunk/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm (103754 => 103755)
--- trunk/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm 2011-12-28 03:27:33 UTC (rev 103754)
+++ trunk/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm 2011-12-28 04:08:42 UTC (rev 103755)
@@ -45,9 +45,6 @@
#import <wtf/text/CString.h>
#import <wtf/text/StringBuilder.h>
-// FIXME: We should be doing this another way.
-extern "C" kern_return_t bootstrap_look_up2(mach_port_t, const name_t, mach_port_t*, pid_t, uint64_t);
-
@interface NSApplication (WebNSApplicationDetails)
-(void)_installAutoreleasePoolsOnCurrentThreadIfNecessary;
@end
@@ -74,9 +71,9 @@
// Get the server port.
mach_port_t serverPort;
- kern_return_t kr = bootstrap_look_up2(bootstrap_port, serviceName.utf8().data(), &serverPort, 0, 0);
+ kern_return_t kr = bootstrap_look_up(bootstrap_port, serviceName.utf8().data(), &serverPort);
if (kr) {
- printf("bootstrap_look_up2 result: %x", kr);
+ printf("bootstrap_look_up result: %x", kr);
return 2;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
