[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit f5267a4eb825f00b99bb13a049f05add20b161bd
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 10 08:14:05 2010 +0000

    2010-01-10  Adam Barth  <abarth at webkit.org>
    
            Unreviewed whitespace fixes.
    
            * html/HTMLFrameOwnerElement.cpp:
            (WebCore::HTMLFrameOwnerElement::setSandboxFlags):
            * loader/FrameLoader.cpp:
            (WebCore::FrameLoader::updateSandboxFlags):
            * loader/FrameLoader.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53050 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index af51d5d..cbb67d3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-10  Adam Barth  <abarth at webkit.org>
+
+        Unreviewed whitespace fixes.
+
+        * html/HTMLFrameOwnerElement.cpp:
+        (WebCore::HTMLFrameOwnerElement::setSandboxFlags):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::updateSandboxFlags):
+        * loader/FrameLoader.h:
+
 2010-01-09  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/html/HTMLFrameOwnerElement.cpp b/WebCore/html/HTMLFrameOwnerElement.cpp
index 7598da2..c3ae785 100644
--- a/WebCore/html/HTMLFrameOwnerElement.cpp
+++ b/WebCore/html/HTMLFrameOwnerElement.cpp
@@ -71,7 +71,7 @@ void HTMLFrameOwnerElement::setSandboxFlags(SandboxFlags flags)
         return;
 
     m_sandboxFlags = flags;
-    
+
     if (Frame* frame = contentFrame())
         frame->loader()->ownerElementSandboxFlagsChanged();
 }
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 85de538..9eac628 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -3917,14 +3917,14 @@ void FrameLoader::updateSandboxFlags()
 
     if (m_sandboxFlags == flags)
         return;
-        
+
     m_sandboxFlags = flags;
 
     m_frame->document()->updateSandboxFlags();
 
     for (Frame* child = m_frame->tree()->firstChild(); child; child = child->tree()->nextSibling())
         child->loader()->updateSandboxFlags();
- }
+}
 
 PassRefPtr<Widget> FrameLoader::createJavaAppletWidget(const IntSize& size, HTMLAppletElement* element, const HashMap<String, String>& args)
 {
diff --git a/WebCore/loader/FrameLoader.h b/WebCore/loader/FrameLoader.h
index 7304bfd..ef5bb41 100644
--- a/WebCore/loader/FrameLoader.h
+++ b/WebCore/loader/FrameLoader.h
@@ -253,7 +253,7 @@ public:
     void dispatchDocumentElementAvailable();
 
     void ownerElementSandboxFlagsChanged() { updateSandboxFlags(); }
-    
+
     bool isSandboxed(SandboxFlags mask) const { return m_sandboxFlags & mask; }
     SandboxFlags sandboxFlags() const { return m_sandboxFlags; }
 

-- 
WebKit Debian packaging