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

[kbalazs at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 86cac122aaaac1ee88f5e6fceab2b6f8a9f6ee55
Author: kbalazs at webkit.org <kbalazs at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 11 18:29:11 2010 +0000

    2010-10-11  Balazs Kelemen  <kbalazs at webkit.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Issue a warning when an InjectedBundle can't be loaded.
            https://bugs.webkit.org/show_bug.cgi?id=47497
    
            The original author of the patch is Jocelyn Turcotte <jocelyn.turcotte at nokia.com>.
    
            * WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp:
            (WebKit::InjectedBundle::load):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69510 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b4822f1..6f963e1 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-11  Balazs Kelemen  <kbalazs at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Issue a warning when an InjectedBundle can't be loaded.
+        https://bugs.webkit.org/show_bug.cgi?id=47497
+
+        The original author of the patch is Jocelyn Turcotte <jocelyn.turcotte at nokia.com>.
+
+        * WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp:
+        (WebKit::InjectedBundle::load):
+
 2010-10-11  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Simon Fraser.
diff --git a/WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp b/WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp
index b1e5b26..fa082d6 100644
--- a/WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp
@@ -36,14 +36,18 @@ namespace WebKit {
 bool InjectedBundle::load()
 {
     m_platformBundle.setFileName(static_cast<QString>(m_path));
-    if (!m_platformBundle.load())
+    if (!m_platformBundle.load()) {
+        qWarning("Error loading the injected bundle: %s", qPrintable(m_platformBundle.errorString()));
         return false;
+    }
 
     WKBundleInitializeFunctionPtr initializeFunction =
             reinterpret_cast<WKBundleInitializeFunctionPtr>(m_platformBundle.resolve("WKBundleInitialize"));
 
-    if (!initializeFunction)
+    if (!initializeFunction) {
+        qWarning("Error resolving WKBundleInitialize: %s", qPrintable(m_platformBundle.errorString()));
         return false;
+    }
 
     initializeFunction(toAPI(this));
     return true;

-- 
WebKit Debian packaging