2009-02-05 Sam Weinig <sam@webkit.org>

        Reviewed by Darin Adler.

        Fix missing checked cast.

        * rendering/RenderObject.cpp:
        (WebCore::RenderObject::containingBlock):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@40691 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a6674b2dbb72a087ed14d0eb73a35904dfce56c1..af21277a0badd22b4df7468ec5d20b746dfe0153 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-02-05  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Fix missing checked cast.
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::containingBlock):
+

 2009-02-05  Nikolas Zimmermann  <nikolas.zimmermann@torchmobile.com>
 
         Not reviewed. Fix WML enabled builds.
 2009-02-05  Nikolas Zimmermann  <nikolas.zimmermann@torchmobile.com>
 
         Not reviewed. Fix WML enabled builds.

diff --git a/WebCore/rendering/RenderObject.cpp b/WebCore/rendering/RenderObject.cpp
index 34b909c04f690bbc42fcf7a2376225eaf5e316be..3907f994afe1d7d2e96515989827e28959fcbfa1 100644 (file)
--- a/WebCore/rendering/RenderObject.cpp
+++ b/WebCore/rendering/RenderObject.cpp
@@ -596,7 +596,7 @@ RenderBlock* RenderObject::containingBlock() const
     }
 
     if (isRenderView())
     }
 
     if (isRenderView())

-        return const_cast<RenderBlock*>(static_cast<const RenderBlock*>(this));
+        return const_cast<RenderView*>(toRenderView(this));

 
     RenderObject* o = parent();
     if (!isText() && m_style->position() == FixedPosition) {
 
     RenderObject* o = parent();
     if (!isText() && m_style->position() == FixedPosition) {