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

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit ed874f08f8d6ea93cd30a541fca3b6ac607cac53
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 12 20:14:18 2010 +0000

    Need a way that WKBundlePageOverlayRef clients can make sure they only uninstall the overlay they installed
    https://bugs.webkit.org/show_bug.cgi?id=49461
    <rdar://problem/8662760>
    
    Reviewed by John Sullivan.
    
    * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
    (WKBundlePageUninstallPageOverlay):
    * WebProcess/InjectedBundle/API/c/WKBundlePage.h:
    * WebProcess/WebPage/FindController.cpp:
    (WebKit::FindController::findString):
    (WebKit::FindController::hideFindUI):
    * WebProcess/WebPage/WebPage.cpp:
    (WebKit::WebPage::uninstallPageOverlay):
    * WebProcess/WebPage/WebPage.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71935 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index ff62b29..d23f371 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,23 @@
 2010-11-12  Anders Carlsson  <andersca at apple.com>
 
+        Reviewed by John Sullivan.
+
+        Need a way that WKBundlePageOverlayRef clients can make sure they only uninstall the overlay they installed
+        https://bugs.webkit.org/show_bug.cgi?id=49461
+        <rdar://problem/8662760>
+
+        * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+        (WKBundlePageUninstallPageOverlay):
+        * WebProcess/InjectedBundle/API/c/WKBundlePage.h:
+        * WebProcess/WebPage/FindController.cpp:
+        (WebKit::FindController::findString):
+        (WebKit::FindController::hideFindUI):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::uninstallPageOverlay):
+        * WebProcess/WebPage/WebPage.h:
+
+2010-11-12  Anders Carlsson  <andersca at apple.com>
+
         Reviewed by Sam Weinig.
 
         Allow MessageSender to override sendMessage
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
index ccf3131..13fb09f 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
@@ -138,7 +138,7 @@ void WKBundlePageInstallPageOverlay(WKBundlePageRef pageRef, WKBundlePageOverlay
     toImpl(pageRef)->installPageOverlay(toImpl(pageOverlayRef));
 }
 
-void WKBundlePageUninstallPageOverlay(WKBundlePageRef pageRef)
+void WKBundlePageUninstallPageOverlay(WKBundlePageRef pageRef, WKBundlePageOverlayRef pageOverlayRef)
 {
-    toImpl(pageRef)->uninstallPageOverlay();
+    toImpl(pageRef)->uninstallPageOverlay(toImpl(pageOverlayRef));
 }
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h
index 8dcb257..fd1bcb5 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h
@@ -204,7 +204,7 @@ WK_EXPORT WKBundleFrameRef WKBundlePageGetMainFrame(WKBundlePageRef page);
 WK_EXPORT WKBundleBackForwardListRef WKBundlePageGetBackForwardList(WKBundlePageRef page);
 
 WK_EXPORT void WKBundlePageInstallPageOverlay(WKBundlePageRef page, WKBundlePageOverlayRef pageOverlay);
-WK_EXPORT void WKBundlePageUninstallPageOverlay(WKBundlePageRef page);
+WK_EXPORT void WKBundlePageUninstallPageOverlay(WKBundlePageRef page, WKBundlePageOverlayRef pageOverlay);
 
 #ifdef __cplusplus
 }
diff --git a/WebKit2/WebProcess/WebPage/FindController.cpp b/WebKit2/WebProcess/WebPage/FindController.cpp
index 31cf526..7fdcb0f 100644
--- a/WebKit2/WebProcess/WebPage/FindController.cpp
+++ b/WebKit2/WebProcess/WebPage/FindController.cpp
@@ -114,7 +114,7 @@ void FindController::findString(const String& string, FindDirection findDirectio
     if (!shouldShowOverlay) {
         if (m_findPageOverlay) {
             // Get rid of the overlay.
-            m_webPage->uninstallPageOverlay();
+            m_webPage->uninstallPageOverlay(m_findPageOverlay);
         }
         
         ASSERT(!m_findPageOverlay);
@@ -134,7 +134,7 @@ void FindController::findString(const String& string, FindDirection findDirectio
 void FindController::hideFindUI()
 {
     if (m_findPageOverlay)
-        m_webPage->uninstallPageOverlay();
+        m_webPage->uninstallPageOverlay(m_findPageOverlay);
 
     hideFindIndicator();
 }
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 2004cc9..688cc6e 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -493,8 +493,11 @@ void WebPage::installPageOverlay(PassRefPtr<PageOverlay> pageOverlay)
     m_pageOverlay->setNeedsDisplay();
 }
 
-void WebPage::uninstallPageOverlay()
+void WebPage::uninstallPageOverlay(PageOverlay* pageOverlay)
 {
+    if (pageOverlay != m_pageOverlay)
+        return;
+
     m_pageOverlay->setPage(0);
     m_pageOverlay = nullptr;
     m_drawingArea->setNeedsDisplay(IntRect(IntPoint(0, 0), m_viewSize));
diff --git a/WebKit2/WebProcess/WebPage/WebPage.h b/WebKit2/WebProcess/WebPage/WebPage.h
index 4c3a9c2..4b0e8e6 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.h
+++ b/WebKit2/WebProcess/WebPage/WebPage.h
@@ -184,7 +184,7 @@ public:
 #endif
 
     void installPageOverlay(PassRefPtr<PageOverlay>);
-    void uninstallPageOverlay();
+    void uninstallPageOverlay(PageOverlay*);
 
     static const WebEvent* currentEvent();
 

-- 
WebKit Debian packaging