[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 71f9486c4ee08a28cf07a9df5c306ebd7dbc99eb
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 5 15:11:11 2009 +0000

    ErrorPageExtension: Add a pointer to the QWebFrame that had
    an error.
    
    Patch by Kenneth Rohde Christiansen <kenneth at webkit.org> on 2009-10-05
    Reviewed by Simon Hausmann.
    
    * Api/qwebpage.h:
    * WebCoreSupport/FrameLoaderClientQt.cpp:
    (WebCore::FrameLoaderClientQt::callErrorPageExtension):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49096 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebpage.h b/WebKit/qt/Api/qwebpage.h
index 29d5aec..ce245b9 100644
--- a/WebKit/qt/Api/qwebpage.h
+++ b/WebKit/qt/Api/qwebpage.h
@@ -289,6 +289,7 @@ public:
     class ErrorPageExtensionOption : public ExtensionOption {
     public:
         QUrl url;
+        QWebFrame* frame;
         ErrorDomain domain;
         int error;
         QString errorString;
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 82720b9..c694e6a 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,5 +1,16 @@
 2009-10-05  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
+        Reviewed by Simon Hausmann.
+
+        ErrorPageExtension: Add a pointer to the QWebFrame that had
+        an error.
+
+        * Api/qwebpage.h:
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::callErrorPageExtension):
+
+2009-10-05  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
         Reviewed by Tor Arne Vestbø.
 
         Do not empty the offline web appcache when clearing
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 16afd0e..c2b35ff 100644
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -880,6 +880,7 @@ void FrameLoaderClientQt::callErrorPageExtension(const WebCore::ResourceError& e
             return;
 
         option.url = QUrl(error.failingURL());
+        option.frame = m_webFrame;
         option.error = error.errorCode();
         option.errorString = error.localizedDescription();
 

-- 
WebKit Debian packaging