Merge 124556

Source/WebCore/rendering/RenderMenuList.cpp

 /*
  * This file is part of the select element renderer in WebCore.
  *
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *               2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * 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
@@ skipping 56 matching lines @@
     ASSERT(element->hasTagName(HTMLNames::selectTag));
 }
 
 RenderMenuList::~RenderMenuList()
 {
     if (m_popup)
         m_popup->disconnectClient();
     m_popup = 0;
 }
 
+bool RenderMenuList::canBeReplacedWithInlineRunIn() const
+{
+    return false;
+}
+
 void RenderMenuList::createInnerBlock()
 {
     if (m_innerBlock) {
         ASSERT(firstChild() == m_innerBlock);
         ASSERT(!m_innerBlock->nextSibling());
         return;
     }
 
     // Create an anonymous block.
     ASSERT(!firstChild());
@@ skipping 486 matching lines @@
 {
     setTextFromOption(toHTMLSelectElement(node())->listToOptionIndex(listIndex));
 }
 
 FontSelector* RenderMenuList::fontSelector() const
 {
     return document()->styleResolver()->fontSelector();
 }
 
 }