[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[tkent at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit f6a30b93bf7245da2ae8d672a191da8c79b1943a
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 15 04:08:52 2010 +0000

    2010-02-14  Kent Tamura  <tkent at chromium.org>
    
            No review. Touch RenderRuny*.cpp to fix Chromium/Windows build bot.
    
            * rendering/RenderRuby.cpp: Add a comment for #endf.
            * rendering/RenderRubyBase.cpp: Add a comment for #endf.
            * rendering/RenderRubyRun.cpp: Add a comment for #endf.
            * rendering/RenderRubyText.cpp: Add a comment for #endf.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54758 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7bd8186..3ae86ee 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-14  Kent Tamura  <tkent at chromium.org>
+
+        No review. Touch RenderRuny*.cpp to fix Chromium/Windows build bot.
+
+        * rendering/RenderRuby.cpp: Add a comment for #endf.
+        * rendering/RenderRubyBase.cpp: Add a comment for #endf.
+        * rendering/RenderRubyRun.cpp: Add a comment for #endf.
+        * rendering/RenderRubyText.cpp: Add a comment for #endf.
+
 2010-02-13  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/rendering/RenderRuby.cpp b/WebCore/rendering/RenderRuby.cpp
index f13e2b4..4ab9d73 100644
--- a/WebCore/rendering/RenderRuby.cpp
+++ b/WebCore/rendering/RenderRuby.cpp
@@ -194,4 +194,4 @@ void RenderRubyAsBlock::removeChild(RenderObject* child)
 
 } // namespace WebCore
 
-#endif
+#endif // ENABLE(RUBY)
diff --git a/WebCore/rendering/RenderRubyBase.cpp b/WebCore/rendering/RenderRubyBase.cpp
index 65f9bc0..9b2dc9e 100644
--- a/WebCore/rendering/RenderRubyBase.cpp
+++ b/WebCore/rendering/RenderRubyBase.cpp
@@ -187,4 +187,4 @@ void RenderRubyBase::mergeBlockChildren(RenderRubyBase* toBase, RenderObject* fr
 
 } // namespace WebCore
 
-#endif
+#endif // ENABLE(RUBY)
diff --git a/WebCore/rendering/RenderRubyRun.cpp b/WebCore/rendering/RenderRubyRun.cpp
index 61be455..d91c625 100644
--- a/WebCore/rendering/RenderRubyRun.cpp
+++ b/WebCore/rendering/RenderRubyRun.cpp
@@ -225,4 +225,4 @@ RenderRubyRun* RenderRubyRun::staticCreateRubyRun(const RenderObject* parentRuby
 
 } // namespace WebCore
 
-#endif
+#endif // ENABLE(RUBY)
diff --git a/WebCore/rendering/RenderRubyText.cpp b/WebCore/rendering/RenderRubyText.cpp
index 1cf2b9e..12e8fea 100644
--- a/WebCore/rendering/RenderRubyText.cpp
+++ b/WebCore/rendering/RenderRubyText.cpp
@@ -51,4 +51,4 @@ bool RenderRubyText::isChildAllowed(RenderObject* child, RenderStyle*) const
 
 } // namespace WebCore
 
-#endif
+#endif // ENABLE(RUBY)

-- 
WebKit Debian packaging