[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 6d3b81baf4ed37459297d5f54fa8272bc032f420
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 18 22:14:08 2010 +0000

    Fix clang build.
    
    * UIProcess/API/mac/FindIndicatorWindow.mm:
    (-[WebFindIndicatorWindowAnimation _initWithFindIndicatorWindow:WebKit::animationProgressCallback:WebKit::FindIndicatorWindow::animationDidEndCallback:WebKit::FindIndicatorWindow::]):
    (WebKit::FindIndicatorWindow::setFindIndicator):
    * UIProcess/WebPageProxy.h:
    * UIProcess/WebPopupMenuProxy.h:
    * WebProcess/WebCoreSupport/WebPopupMenu.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70001 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 71363ab..0cba862 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-18  Anders Carlsson  <andersca at apple.com>
+
+        Fix clang build.
+
+        * UIProcess/API/mac/FindIndicatorWindow.mm:
+        (-[WebFindIndicatorWindowAnimation _initWithFindIndicatorWindow:WebKit::animationProgressCallback:WebKit::FindIndicatorWindow::animationDidEndCallback:WebKit::FindIndicatorWindow::]):
+        (WebKit::FindIndicatorWindow::setFindIndicator):
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/WebPopupMenuProxy.h:
+        * WebProcess/WebCoreSupport/WebPopupMenu.h:
+
 2010-10-18  Sam Weinig  <sam at webkit.org>
 
         Fix Qt build.
diff --git a/WebKit2/UIProcess/API/mac/FindIndicatorWindow.mm b/WebKit2/UIProcess/API/mac/FindIndicatorWindow.mm
index 23b88ca..85fe9ed 100644
--- a/WebKit2/UIProcess/API/mac/FindIndicatorWindow.mm
+++ b/WebKit2/UIProcess/API/mac/FindIndicatorWindow.mm
@@ -80,7 +80,7 @@ using namespace WebCore;
 
 - (id)_initWithFindIndicatorWindow:(WebKit::FindIndicatorWindow *)findIndicatorWindow 
          animationProgressCallback:(void (WebKit::FindIndicatorWindow::*)(double progress))animationProgressCallback
-           animationDidEndCallback:(void (WebKit::FindIndicatorWindow::*)())animationDidEndCallback;
+           animationDidEndCallback:(void (WebKit::FindIndicatorWindow::*)())animationDidEndCallback
 {
     if ((self = [super initWithDuration:fadeOutAnimationDuration animationCurve:NSAnimationEaseInOut])) {
         _findIndicatorWindow = findIndicatorWindow;
@@ -138,8 +138,6 @@ void FindIndicatorWindow::setFindIndicator(PassRefPtr<FindIndicator> findIndicat
         return;
 
     NSRect contentRect = m_findIndicator->frameRect();
-    NSSize findIndicatorViewSize = contentRect.size;
-    
     NSRect windowFrameRect = NSIntegralRect([m_wkView convertRect:contentRect toView:nil]);
     windowFrameRect.origin = [[m_wkView window] convertBaseToScreen:windowFrameRect.origin];
 
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index c0c5cf0..be86685 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -79,13 +79,13 @@ class WebEditCommandProxy;
 class WebKeyboardEvent;
 class WebMouseEvent;
 class WebPageNamespace;
-class WebPopupItem;
 class WebPopupMenuProxy;
 class WebProcessProxy;
 class WebURLRequest;
 class WebWheelEvent;
 struct WebNavigationDataStore;
 struct WebPageCreationParameters;
+struct WebPopupItem;
 
 typedef GenericCallback<WKStringRef, StringImpl*> FrameSourceCallback;
 typedef GenericCallback<WKStringRef, StringImpl*> RenderTreeExternalRepresentationCallback;
diff --git a/WebKit2/UIProcess/WebPopupMenuProxy.h b/WebKit2/UIProcess/WebPopupMenuProxy.h
index da4ab1f..2f3a82d 100644
--- a/WebKit2/UIProcess/WebPopupMenuProxy.h
+++ b/WebKit2/UIProcess/WebPopupMenuProxy.h
@@ -36,7 +36,7 @@ namespace WebCore {
 
 namespace WebKit {
 
-class WebPopupItem;
+struct WebPopupItem;
 
 class WebPopupMenuProxy : public RefCounted<WebPopupMenuProxy> {
 public:    
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.h b/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.h
index c2d7480..d4ca770 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.h
+++ b/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.h
@@ -35,7 +35,7 @@ class PopupMenuClient;
 namespace WebKit {
 
 class WebPage;
-class WebPopupItem;
+struct WebPopupItem;
 
 class WebPopupMenu : public WebCore::PopupMenu {
 public:

-- 
WebKit Debian packaging