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

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 61fe784bc18bcf7bc82594dae1cec6f8cbe3d74a
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 9 00:47:38 2010 +0000

    Move canShowMIMEType to Frame
    https://bugs.webkit.org/show_bug.cgi?id=50723
    
    Reviewed by Sam Weinig.
    
    * UIProcess/API/C/WKFrame.cpp:
    (WKFrameCanShowMIMEType):
    * UIProcess/API/C/WKFrame.h:
    * UIProcess/API/C/WKPage.cpp:
    * UIProcess/API/C/WKPage.h:
    * UIProcess/WebFrameProxy.cpp:
    (WebKit::WebFrameProxy::canShowMIMEType):
    * UIProcess/WebFrameProxy.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73565 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index cb86518..5249a59 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-08  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Move canShowMIMEType to Frame
+        https://bugs.webkit.org/show_bug.cgi?id=50723
+
+        * UIProcess/API/C/WKFrame.cpp:
+        (WKFrameCanShowMIMEType):
+        * UIProcess/API/C/WKFrame.h:
+        * UIProcess/API/C/WKPage.cpp:
+        * UIProcess/API/C/WKPage.h:
+        * UIProcess/WebFrameProxy.cpp:
+        (WebKit::WebFrameProxy::canShowMIMEType):
+        * UIProcess/WebFrameProxy.h:
+
 2010-12-08  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Oliver Hunt.
diff --git a/WebKit2/UIProcess/API/C/WKFrame.cpp b/WebKit2/UIProcess/API/C/WKFrame.cpp
index 17d9ce3..6f501c7 100644
--- a/WebKit2/UIProcess/API/C/WKFrame.cpp
+++ b/WebKit2/UIProcess/API/C/WKFrame.cpp
@@ -95,3 +95,8 @@ bool WKFrameIsFrameSet(WKFrameRef frameRef)
 {
     return toImpl(frameRef)->isFrameSet();
 }
+
+bool WKFrameCanShowMIMEType(WKFrameRef frameRef, WKStringRef mimeTypeRef)
+{
+    return toImpl(frameRef)->canShowMIMEType(toWTFString(mimeTypeRef));
+}
diff --git a/WebKit2/UIProcess/API/C/WKFrame.h b/WebKit2/UIProcess/API/C/WKFrame.h
index 4ed7eb6..04f657e 100644
--- a/WebKit2/UIProcess/API/C/WKFrame.h
+++ b/WebKit2/UIProcess/API/C/WKFrame.h
@@ -59,6 +59,7 @@ WK_EXPORT WKPageRef WKFrameGetPage(WKFrameRef frame);
 WK_EXPORT WKCertificateInfoRef WKFrameGetCertificateInfo(WKFrameRef frame);
 
 WK_EXPORT bool WKFrameCanProvideSource(WKFrameRef frame);
+WK_EXPORT bool WKFrameCanShowMIMEType(WKFrameRef frame, WKStringRef mimeType);
 
 WK_EXPORT bool WKFrameIsFrameSet(WKFrameRef frame);
 
diff --git a/WebKit2/UIProcess/API/C/WKPage.cpp b/WebKit2/UIProcess/API/C/WKPage.cpp
index 08ea77e..2d44c81 100644
--- a/WebKit2/UIProcess/API/C/WKPage.cpp
+++ b/WebKit2/UIProcess/API/C/WKPage.cpp
@@ -137,11 +137,6 @@ WKBackForwardListRef WKPageGetBackForwardList(WKPageRef pageRef)
     return toAPI(toImpl(pageRef)->backForwardList());
 }
 
-bool WKPageCanShowMIMEType(WKPageRef pageRef, WKStringRef mimeTypeRef)
-{
-    return toImpl(pageRef)->canShowMIMEType(toWTFString(mimeTypeRef));
-}
-
 WKStringRef WKPageCopyTitle(WKPageRef pageRef)
 {
     return toCopiedAPI(toImpl(pageRef)->pageTitle());
diff --git a/WebKit2/UIProcess/API/C/WKPage.h b/WebKit2/UIProcess/API/C/WKPage.h
index 1eeb849..7e48962 100644
--- a/WebKit2/UIProcess/API/C/WKPage.h
+++ b/WebKit2/UIProcess/API/C/WKPage.h
@@ -241,8 +241,6 @@ WK_EXPORT bool WKPageCanGoBack(WKPageRef page);
 WK_EXPORT void WKPageGoToBackForwardListItem(WKPageRef page, WKBackForwardListItemRef item);
 WK_EXPORT WKBackForwardListRef WKPageGetBackForwardList(WKPageRef page);
 
-WK_EXPORT bool WKPageCanShowMIMEType(WKPageRef page, WKStringRef mimeType);
-
 WK_EXPORT WKStringRef WKPageCopyTitle(WKPageRef page);
 
 WK_EXPORT WKFrameRef WKPageGetMainFrame(WKPageRef page);
diff --git a/WebKit2/UIProcess/WebFrameProxy.cpp b/WebKit2/UIProcess/WebFrameProxy.cpp
index 9773523..f5b5731 100644
--- a/WebKit2/UIProcess/WebFrameProxy.cpp
+++ b/WebKit2/UIProcess/WebFrameProxy.cpp
@@ -78,6 +78,17 @@ bool WebFrameProxy::canProvideSource() const
     return false;
 }
 
+bool WebFrameProxy::canShowMIMEType(const String& mimeType) const
+{
+    if (!m_page)
+        return false;
+
+    if (m_page->canShowMIMEType(mimeType))
+        return true;
+
+    return false;
+}
+
 void WebFrameProxy::didStartProvisionalLoad(const String& url)
 {
     // FIXME: Add assertions.
diff --git a/WebKit2/UIProcess/WebFrameProxy.h b/WebKit2/UIProcess/WebFrameProxy.h
index 51fc787..6409d40 100644
--- a/WebKit2/UIProcess/WebFrameProxy.h
+++ b/WebKit2/UIProcess/WebFrameProxy.h
@@ -88,6 +88,7 @@ public:
     WebCertificateInfo* certificateInfo() const { return m_certificateInfo.get(); }
 
     bool canProvideSource() const;
+    bool canShowMIMEType(const String& mimeType) const;
 
     void didStartProvisionalLoad(const String& url);
     void didReceiveServerRedirectForProvisionalLoad(const String& url);

-- 
WebKit Debian packaging