[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 abc07dbbe57ba39c64cc6f92d411fa269ca1c576
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 25 09:28:50 2010 +0000

    2010-08-25  Balazs Kelemen  <kb at inf.u-szeged.hu>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Implement WebKit::Module for qt
            https://bugs.webkit.org/show_bug.cgi?id=44527
    
            * Platform/Module.h:
            * Platform/qt/ModuleQt.cpp:
            (WebKit::Module::load):
            (WebKit::Module::unload):
            (WebKit::Module::platformFunctionPointer):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65998 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index f0d5181..88b1735 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-25  Balazs Kelemen  <kb at inf.u-szeged.hu>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Implement WebKit::Module for qt
+        https://bugs.webkit.org/show_bug.cgi?id=44527
+
+        * Platform/Module.h:
+        * Platform/qt/ModuleQt.cpp:
+        (WebKit::Module::load):
+        (WebKit::Module::unload):
+        (WebKit::Module::platformFunctionPointer):
+
 2010-08-24  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Mark Rowe.
diff --git a/WebKit2/Platform/Module.h b/WebKit2/Platform/Module.h
index e9f0cd1..fe86b07 100644
--- a/WebKit2/Platform/Module.h
+++ b/WebKit2/Platform/Module.h
@@ -33,6 +33,10 @@
 #include <wtf/RetainPtr.h>
 #endif
 
+#if PLATFORM(QT)
+#include <QLibrary>
+#endif
+
 namespace WebKit {
 
 class Module : public Noncopyable {
@@ -55,6 +59,8 @@ private:
     RetainPtr<CFBundleRef> m_bundle;
 #elif PLATFORM(WIN)
     HMODULE m_module;
+#elif PLATFORM(QT)
+    QLibrary m_lib;
 #endif
 };
 
diff --git a/WebKit2/Platform/qt/ModuleQt.cpp b/WebKit2/Platform/qt/ModuleQt.cpp
index 53bee1b..8a68cf4 100644
--- a/WebKit2/Platform/qt/ModuleQt.cpp
+++ b/WebKit2/Platform/qt/ModuleQt.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
@@ -25,25 +26,23 @@
 
 #include "Module.h"
 
-#include "NotImplemented.h"
-
 namespace WebKit {
 
 bool Module::load()
 {
-    notImplemented();
-    return false;
+    m_lib.setFileName(static_cast<QString>(m_path));
+    return m_lib.load();
 }
 
 void Module::unload()
 {
-    notImplemented();
+    m_lib.unload();
 }
 
 void* Module::platformFunctionPointer(const char* functionName) const
 {
-    notImplemented();
-    return 0;
+    // Unfortunately QLibrary::resolve is not const.
+    return const_cast<QLibrary*>(&m_lib)->resolve(functionName);
 }
 
 }

-- 
WebKit Debian packaging