[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 199b3b36ccd1244fb5e09430d07c37fe381cdc83
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 11 03:59:32 2010 +0000

    2010-09-10  Balazs Kelemen  <kb at inf.u-szeged.hu>
    
            Reviewed by Andreas Kling.
    
            [Qt] Implement port specific part of WebKit::InjectedBundle
            https://bugs.webkit.org/show_bug.cgi?id=45541
    
            * WebProcess/InjectedBundle/InjectedBundle.h: Typedef PlatformBundle as QLibrary for qt.
            * WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp:
            (WebKit::InjectedBundle::load): Implemented.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67273 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b53b30d..fd9ca44 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -2,6 +2,17 @@
 
         Reviewed by Andreas Kling.
 
+        [Qt] Implement port specific part of WebKit::InjectedBundle
+        https://bugs.webkit.org/show_bug.cgi?id=45541
+
+        * WebProcess/InjectedBundle/InjectedBundle.h: Typedef PlatformBundle as QLibrary for qt.
+        * WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp:
+        (WebKit::InjectedBundle::load): Implemented.
+
+2010-09-10  Balazs Kelemen  <kb at inf.u-szeged.hu>
+
+        Reviewed by Andreas Kling.
+
         [Qt] MiniBrowser crashes with multiply windows when closing one of them
         https://bugs.webkit.org/show_bug.cgi?id=45536
 
diff --git a/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h b/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
index 6bd4e30..5f403fd 100644
--- a/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
+++ b/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
@@ -33,6 +33,10 @@
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>
 
+#if PLATFORM(QT)
+#include <QLibrary>
+#endif
+
 namespace CoreIPC {
     class ArgumentDecoder;
     class Connection;
@@ -46,7 +50,7 @@ typedef CFBundleRef PlatformBundle;
 #elif PLATFORM(WIN)
 typedef HMODULE PlatformBundle;
 #elif PLATFORM(QT)
-typedef void* PlatformBundle;
+typedef QLibrary PlatformBundle;
 #endif
 
 class ImmutableArray;
diff --git a/WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp b/WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp
index d514564..10a267a 100644
--- a/WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2010 University of Szeged.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,11 +33,20 @@ using namespace WebCore;
 
 namespace WebKit {
 
-// FIXME: This should try and use <WebCore/FileSystem.h>.
-
 bool InjectedBundle::load()
 {
-    return false;
+    m_platformBundle.setFileName(static_cast<QString>(m_path));
+    if (!m_platformBundle.load())
+        return false;
+
+    WKBundleInitializeFunctionPtr initializeFunction =
+            reinterpret_cast<WKBundleInitializeFunctionPtr>(m_platformBundle.resolve("WKBundleInitialize"));
+
+    if (!initializeFunction)
+        return false;
+
+    initializeFunction(toRef(this));
+    return true;
 }
 
 void InjectedBundle::activateMacFontAscentHack()

-- 
WebKit Debian packaging