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

[weinig at apple.com]

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

    Fix typo: Diplaying -> Displaying
    
    Reviewed by Geoffrey "Error" Garen.
    
    * UIProcess/API/C/WKFrame.cpp:
    (WKFrameIsDisplayingStandaloneImageDocument):
    (WKFrameIsDisplayingMarkupDocument):
    * UIProcess/API/C/WKFrame.h:
    * UIProcess/WebFrameProxy.cpp:
    (WebKit::WebFrameProxy::canProvideSource):
    (WebKit::WebFrameProxy::isDisplayingStandaloneImageDocument):
    (WebKit::WebFrameProxy::isDisplayingMarkupDocument):
    * UIProcess/WebFrameProxy.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73591 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 0875cb7..bbf401c 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,21 @@
 2010-12-08  Sam Weinig  <sam at webkit.org>
 
+        Reviewed by Geoffrey "Error" Garen.
+
+        Fix typo: Diplaying -> Displaying
+
+        * UIProcess/API/C/WKFrame.cpp:
+        (WKFrameIsDisplayingStandaloneImageDocument):
+        (WKFrameIsDisplayingMarkupDocument):
+        * UIProcess/API/C/WKFrame.h:
+        * UIProcess/WebFrameProxy.cpp:
+        (WebKit::WebFrameProxy::canProvideSource):
+        (WebKit::WebFrameProxy::isDisplayingStandaloneImageDocument):
+        (WebKit::WebFrameProxy::isDisplayingMarkupDocument):
+        * UIProcess/WebFrameProxy.h:
+
+2010-12-08  Sam Weinig  <sam at webkit.org>
+
         Reviewed by Gavin Barraclough.
 
         Add WebKit2 Preference for TabsToLinks behavior.
diff --git a/WebKit2/UIProcess/API/C/WKFrame.cpp b/WebKit2/UIProcess/API/C/WKFrame.cpp
index f36880d..7bcd77c 100644
--- a/WebKit2/UIProcess/API/C/WKFrame.cpp
+++ b/WebKit2/UIProcess/API/C/WKFrame.cpp
@@ -96,14 +96,14 @@ bool WKFrameCanShowMIMEType(WKFrameRef frameRef, WKStringRef mimeTypeRef)
     return toImpl(frameRef)->canShowMIMEType(toWTFString(mimeTypeRef));
 }
 
-bool WKFrameIsDiplayingStandaloneImageDocument(WKFrameRef frameRef)
+bool WKFrameIsDisplayingStandaloneImageDocument(WKFrameRef frameRef)
 {
-    return toImpl(frameRef)->isDiplayingStandaloneImageDocument();
+    return toImpl(frameRef)->isDisplayingStandaloneImageDocument();
 }
 
-bool WKFrameIsDiplayingMarkupDocument(WKFrameRef frameRef)
+bool WKFrameIsDisplayingMarkupDocument(WKFrameRef frameRef)
 {
-    return toImpl(frameRef)->isDiplayingMarkupDocument();
+    return toImpl(frameRef)->isDisplayingMarkupDocument();
 }
 
 bool WKFrameIsFrameSet(WKFrameRef frameRef)
diff --git a/WebKit2/UIProcess/API/C/WKFrame.h b/WebKit2/UIProcess/API/C/WKFrame.h
index f4d8608..a74063e 100644
--- a/WebKit2/UIProcess/API/C/WKFrame.h
+++ b/WebKit2/UIProcess/API/C/WKFrame.h
@@ -61,8 +61,8 @@ WK_EXPORT WKCertificateInfoRef WKFrameGetCertificateInfo(WKFrameRef frame);
 WK_EXPORT bool WKFrameCanProvideSource(WKFrameRef frame);
 WK_EXPORT bool WKFrameCanShowMIMEType(WKFrameRef frame, WKStringRef mimeType);
 
-WK_EXPORT bool WKFrameIsDiplayingStandaloneImageDocument(WKFrameRef frame);
-WK_EXPORT bool WKFrameIsDiplayingMarkupDocument(WKFrameRef frame);
+WK_EXPORT bool WKFrameIsDisplayingStandaloneImageDocument(WKFrameRef frame);
+WK_EXPORT bool WKFrameIsDisplayingMarkupDocument(WKFrameRef frame);
 
 WK_EXPORT bool WKFrameIsFrameSet(WKFrameRef frame);
 
diff --git a/WebKit2/UIProcess/WebFrameProxy.cpp b/WebKit2/UIProcess/WebFrameProxy.cpp
index e3d1eb4..a480e51 100644
--- a/WebKit2/UIProcess/WebFrameProxy.cpp
+++ b/WebKit2/UIProcess/WebFrameProxy.cpp
@@ -74,7 +74,7 @@ void WebFrameProxy::setCertificateInfo(PassRefPtr<WebCertificateInfo> certificat
 
 bool WebFrameProxy::canProvideSource() const
 {
-    return isDiplayingMarkupDocument();
+    return isDisplayingMarkupDocument();
 }
 
 bool WebFrameProxy::canShowMIMEType(const String& mimeType) const
@@ -94,12 +94,12 @@ bool WebFrameProxy::canShowMIMEType(const String& mimeType) const
     return false;
 }
 
-bool WebFrameProxy::isDiplayingStandaloneImageDocument() const
+bool WebFrameProxy::isDisplayingStandaloneImageDocument() const
 {
     return Image::supportsType(m_MIMEType);
 }
 
-bool WebFrameProxy::isDiplayingMarkupDocument() const
+bool WebFrameProxy::isDisplayingMarkupDocument() const
 {
     // FIXME: This check should be moved to somewhere in WebCore. 
     return m_MIMEType == "text/html" || m_MIMEType == "image/svg+xml" || DOMImplementation::isXMLMIMEType(m_MIMEType);
diff --git a/WebKit2/UIProcess/WebFrameProxy.h b/WebKit2/UIProcess/WebFrameProxy.h
index 368924f..548bc45 100644
--- a/WebKit2/UIProcess/WebFrameProxy.h
+++ b/WebKit2/UIProcess/WebFrameProxy.h
@@ -90,8 +90,8 @@ public:
     bool canProvideSource() const;
     bool canShowMIMEType(const String& mimeType) const;
 
-    bool isDiplayingStandaloneImageDocument() const;
-    bool isDiplayingMarkupDocument() const;
+    bool isDisplayingStandaloneImageDocument() const;
+    bool isDisplayingMarkupDocument() const;
 
     void didStartProvisionalLoad(const String& url);
     void didReceiveServerRedirectForProvisionalLoad(const String& url);

-- 
WebKit Debian packaging