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

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 9ab41107bd11247f3421816231c18e8ee98b756a
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 29 02:03:44 2010 +0000

    Fix builds.
    
    * UIProcess/API/C/WKAPICast.h:
    (WebKit::ProxyingRefPtr::operator APIType):
    (toURLRef):
    (toCopiedRef):
    (toCopiedURLRef):
    * UIProcess/win/WebView.h:
    (WebKit::WebView::type):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64255 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 6ceeb60..ba3a31b 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,17 @@
 2010-07-28  Sam Weinig  <sam at webkit.org>
 
+        Fix builds.
+
+        * UIProcess/API/C/WKAPICast.h:
+        (WebKit::ProxyingRefPtr::operator APIType):
+        (toURLRef):
+        (toCopiedRef):
+        (toCopiedURLRef):
+        * UIProcess/win/WebView.h:
+        (WebKit::WebView::type):
+
+2010-07-28  Sam Weinig  <sam at webkit.org>
+
         Reviewed by Darin Adler.
 
         Patch for https://bugs.webkit.org/show_bug.cgi?id=43163
diff --git a/WebKit2/UIProcess/API/C/WKAPICast.h b/WebKit2/UIProcess/API/C/WKAPICast.h
index d1e9e59..979cf07 100644
--- a/WebKit2/UIProcess/API/C/WKAPICast.h
+++ b/WebKit2/UIProcess/API/C/WKAPICast.h
@@ -88,7 +88,7 @@ public:
     {
     }
 
-    operator APIType() { return reinterpret_cast<APIType>(m_impl.get()); }
+    operator APIType() { return toRef(m_impl.get()); }
 
 private:
     RefPtr<ImplType> m_impl;
@@ -121,21 +121,21 @@ inline WebKit::ProxyingRefPtr<WebKit::WebString> toRef(WebCore::StringImpl* stri
 inline WebKit::ProxyingRefPtr<WebKit::WebURL> toURLRef(WebCore::StringImpl* string)
 {
     WebCore::StringImpl* impl = string ? string : WebCore::StringImpl::empty();
-    return WebKit::ProxyingRefPtr<WebKit::WebURL>(WebKit::WebURL::create(WebCore::String(impl)))   ;
+    return WebKit::ProxyingRefPtr<WebKit::WebURL>(WebKit::WebURL::create(WebCore::String(impl)));
 }
 
 inline WKStringRef toCopiedRef(const WebCore::String& string)
 {
     WebCore::StringImpl* impl = string.impl() ? string.impl() : WebCore::StringImpl::empty();
     RefPtr<WebKit::WebString> webString = WebKit::WebString::create(WebCore::String(impl));
-    return reinterpret_cast<WKStringRef>(webString.release().releaseRef());
+    return toRef(webString.release().releaseRef());
 }
 
 inline WKURLRef toCopiedURLRef(const WebCore::String& string)
 {
     WebCore::StringImpl* impl = string.impl() ? string.impl() : WebCore::StringImpl::empty();
     RefPtr<WebKit::WebURL> webURL = WebKit::WebURL::create(WebCore::String(impl));
-    return reinterpret_cast<WKURLRef>(webURL.release().releaseRef());
+    return toRef(webURL.release().releaseRef());
 }
 
 inline WKTypeID toRef(WebKit::APIObject::Type type)
diff --git a/WebKit2/UIProcess/win/WebView.h b/WebKit2/UIProcess/win/WebView.h
index 64d7c5d..0864e61 100644
--- a/WebKit2/UIProcess/win/WebView.h
+++ b/WebKit2/UIProcess/win/WebView.h
@@ -62,6 +62,8 @@ public:
 private:
     WebView(RECT, WebPageNamespace*, HWND hostWindow);
 
+    virtual Type type() const { return TypeView; }
+
     static bool registerWebViewWindowClass();
     static LRESULT CALLBACK WebViewWndProc(HWND, UINT, WPARAM, LPARAM);
     LRESULT wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);

-- 
WebKit Debian packaging