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

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f605f496243fba9568103f699969f735bcdb6ece
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 24 05:43:03 2010 +0000

    Unreviewed buildfix after r68220 on WebKit2.
    
    WebKit2 API: Need way to know when a frame is removed from the hierarchy
    https://bugs.webkit.org/show_bug.cgi?id=46432
    
    [Qt] qt_wk_didRemoveFrameFromHierarchy needs to be implemented
    
    * UIProcess/API/qt/ClientImpl.cpp:
    (qt_wk_didRemoveFrameFromHierarchy):
    * UIProcess/API/qt/ClientImpl.h:
    * UIProcess/API/qt/qwkpage.cpp:
    (QWKPage::QWKPage):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68235 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 354efb9..f890a6c 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-23  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Unreviewed buildfix after r68220 on WebKit2.
+
+        WebKit2 API: Need way to know when a frame is removed from the hierarchy
+        https://bugs.webkit.org/show_bug.cgi?id=46432
+
+        [Qt] qt_wk_didRemoveFrameFromHierarchy needs to be implemented
+
+        * UIProcess/API/qt/ClientImpl.cpp:
+        (qt_wk_didRemoveFrameFromHierarchy):
+        * UIProcess/API/qt/ClientImpl.h:
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPage::QWKPage):
+
 2010-09-23  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKit2/UIProcess/API/qt/ClientImpl.cpp b/WebKit2/UIProcess/API/qt/ClientImpl.cpp
index 282982e..c29ced9 100644
--- a/WebKit2/UIProcess/API/qt/ClientImpl.cpp
+++ b/WebKit2/UIProcess/API/qt/ClientImpl.cpp
@@ -99,6 +99,11 @@ void qt_wk_didFirstLayoutForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef us
     emit toQWKPage(clientInfo)->initialLayoutCompleted();
 }
 
+void qt_wk_didRemoveFrameFromHierarchy(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
+{
+    // FIXME: Implement (bug #46432)
+}
+
 void qt_wk_didFirstVisuallyNonEmptyLayoutForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
 {
     if (!WKFrameIsMainFrame(frame))
diff --git a/WebKit2/UIProcess/API/qt/ClientImpl.h b/WebKit2/UIProcess/API/qt/ClientImpl.h
index cfa5a41..6a4dbf2 100644
--- a/WebKit2/UIProcess/API/qt/ClientImpl.h
+++ b/WebKit2/UIProcess/API/qt/ClientImpl.h
@@ -37,6 +37,7 @@ void qt_wk_didFailLoadWithErrorForFrame(WKPageRef, WKFrameRef, WKTypeRef, const
 void qt_wk_didReceiveTitleForFrame(WKPageRef, WKStringRef title, WKFrameRef, WKTypeRef, const void* clientInfo);
 void qt_wk_didFirstLayoutForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void* clientInfo);
 void qt_wk_didFirstVisuallyNonEmptyLayoutForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void* clientInfo);
+void qt_wk_didRemoveFrameFromHierarchy(WKPageRef, WKFrameRef, WKTypeRef, const void* clientInfo);
 void qt_wk_didStartProgress(WKPageRef, const void* clientInfo);
 void qt_wk_didChangeProgress(WKPageRef, const void* clientInfo);
 void qt_wk_didFinishProgress(WKPageRef, const void* clientInfo);
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index 8f36b13..843f395 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -247,6 +247,7 @@ QWKPage::QWKPage(WKPageNamespaceRef namespaceRef)
         qt_wk_didReceiveTitleForFrame,
         qt_wk_didFirstLayoutForFrame,
         qt_wk_didFirstVisuallyNonEmptyLayoutForFrame,
+        qt_wk_didRemoveFrameFromHierarchy,
         qt_wk_didStartProgress,
         qt_wk_didChangeProgress,
         qt_wk_didFinishProgress,

-- 
WebKit Debian packaging