Merge 124556

Source/WebCore/rendering/RenderProgress.cpp

 /*
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 43 matching lines @@
 {
     HTMLProgressElement* element = progressElement();
     if (m_position == element->position())
         return;
     m_position = element->position();
 
     updateAnimationState();
     RenderBlock::updateFromElement();
 }
 
+bool RenderProgress::canBeReplacedWithInlineRunIn() const
+{
+    return false;
+}
+
 double RenderProgress::animationProgress() const
 {
     return m_animating ? (fmod((currentTime() - m_animationStartTime), m_animationDuration) / m_animationDuration) : 0;
 }
 
 bool RenderProgress::isDeterminate() const
 {
     return (HTMLProgressElement::IndeterminatePosition != position()
             && HTMLProgressElement::InvalidPosition != position());
 }
@@ skipping 24 matching lines @@
 }
 
 HTMLProgressElement* RenderProgress::progressElement() const
 {
     return static_cast<HTMLProgressElement*>(node());
 }    
 
 } // namespace WebCore
 
 #endif