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

jschuh at chromium.org jschuh at chromium.org
Wed Dec 22 12:50:07 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 5bb8d1bc6fa986d2092b3d5ca94d1381dff8ca96
Author: jschuh at chromium.org <jschuh at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 31 12:26:33 2010 +0000

    2010-08-31  Justin Schuh  <jschuh at chromium.org>
    
            Reviewed by Nate Chapin.
    
            Remove unused canReferToParentFrameEncoding() function from FrameLoader.cpp
            https://bugs.webkit.org/show_bug.cgi?id=44895
    
            No new tests; no behavior changed.
    
            * loader/FrameLoader.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66476 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 43fde61..a120d5a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-31  Justin Schuh  <jschuh at chromium.org>
+
+        Reviewed by Nate Chapin.
+
+        Remove unused canReferToParentFrameEncoding() function from FrameLoader.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=44895
+
+        No new tests; no behavior changed.
+
+        * loader/FrameLoader.cpp:
+
 2010-08-31  Jeremy Orlow  <jorlow at chromium.org>
 
         Build fix.
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 9d8d4d1..de14cdf 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -159,11 +159,6 @@ static int numRequests(Document* document)
     return document->docLoader()->requestCount();
 }
 
-static inline bool canReferToParentFrameEncoding(const Frame* frame, const Frame* parentFrame) 
-{
-    return parentFrame && parentFrame->document()->securityOrigin()->canAccess(frame->document()->securityOrigin());
-}
-
 // This is not in the FrameLoader class to emphasize that it does not depend on
 // private FrameLoader data, and to avoid increasing the number of public functions
 // with access to private data.  Since only this .cpp file needs it, making it

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list