diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
commit | 284837daa07b29d6a63a748544a90b1f5842ac5c (patch) | |
tree | ecd258180bde91fe741e0cfd2638beb3c6da7e8e /Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp | |
parent | 2e2ba8ff45915f40ed3e014101269c175f2a89a0 (diff) | |
download | qtwebkit-284837daa07b29d6a63a748544a90b1f5842ac5c.tar.gz |
Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)
New snapshot
Diffstat (limited to 'Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp')
-rw-r--r-- | Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp b/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp index 28b200d13..18f303948 100644 --- a/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp +++ b/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp @@ -54,7 +54,7 @@ #include <QDebug> #endif -#if !USE(UNIX_DOMAIN_SOCKETS) +#if OS(DARWIN) && !USE(UNIX_DOMAIN_SOCKETS) #include <servers/bootstrap.h> extern "C" kern_return_t bootstrap_look_up2(mach_port_t, const name_t, mach_port_t*, pid_t, uint64_t); @@ -146,8 +146,6 @@ Q_DECL_EXPORT int WebProcessMainQt(QGuiApplication* app) { initializeProxy(); - srandom(time(0)); - JSC::initializeThreading(); WTF::initializeMainThread(); RunLoop::initializeMainRunLoop(); @@ -174,11 +172,19 @@ Q_DECL_EXPORT int WebProcessMainQt(QGuiApplication* app) } #else bool wasNumber = false; - int identifier = app->arguments().at(1).toInt(&wasNumber, 10); + qulonglong id = app->arguments().at(1).toULongLong(&wasNumber, 10); if (!wasNumber) { qDebug() << "Error: connection identifier wrong."; return 1; } + CoreIPC::Connection::Identifier identifier; +#if OS(WINDOWS) + // Convert to HANDLE + identifier = reinterpret_cast<CoreIPC::Connection::Identifier>(id); +#else + // Convert to int + identifier = static_cast<CoreIPC::Connection::Identifier>(id); +#endif #endif #if USE(ACCELERATED_COMPOSITING) CoordinatedGraphicsLayer::initFactory(); |