Merge RenderWidget into single subclass, RenderPart

Source/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 48 matching lines @@
 #include "core/paint/ScrollbarPainter.h"
 #include "core/rendering/RenderCounter.h"
 #include "core/rendering/RenderEmbeddedObject.h"
 #include "core/rendering/RenderLayer.h"
 #include "core/rendering/RenderListBox.h"
 #include "core/rendering/RenderPart.h"
 #include "core/rendering/RenderScrollbar.h"
 #include "core/rendering/RenderScrollbarPart.h"
 #include "core/rendering/RenderTheme.h"
 #include "core/rendering/RenderView.h"
-#include "core/rendering/RenderWidget.h"
 #include "core/rendering/TextAutosizer.h"
 #include "core/rendering/compositing/CompositedLayerMapping.h"
 #include "core/rendering/compositing/CompositedSelectionBound.h"
 #include "core/rendering/compositing/RenderLayerCompositor.h"
 #include "core/rendering/style/RenderStyle.h"
 #include "core/rendering/svg/RenderSVGRoot.h"
 #include "core/svg/SVGDocumentExtensions.h"
 #include "core/svg/SVGSVGElement.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/ScriptForbiddenScope.h"
@@ skipping 953 matching lines @@
         return 0;
 
     // Curently only embedded SVG documents participate in the size-negotiation logic.
     if (firstChild->isSVGRoot())
         return toRenderBox(firstChild);
 
     return 0;
 }
 
 
-void FrameView::addWidget(RenderWidget* object)
+void FrameView::addPart(RenderPart* object)
 {
-    m_widgets.add(object);
+    m_parts.add(object);
 }
 
-void FrameView::removeWidget(RenderWidget* object)
+void FrameView::removePart(RenderPart* object)
 {
-    m_widgets.remove(object);
+    m_parts.remove(object);
 }
 
 void FrameView::updateWidgetPositions()
 {
-    WillBeHeapVector<RefPtrWillBeMember<RenderWidget> > widgets;
-    copyToVector(m_widgets, widgets);
+    WillBeHeapVector<RefPtrWillBeMember<RenderPart> > parts;
+    copyToVector(m_parts, parts);
 
     // Script or plugins could detach the frame so abort processing if that happens.
 
-    for (size_t i = 0; i < widgets.size() && renderView(); ++i)
-        widgets[i]->updateWidgetPosition();
+    for (size_t i = 0; i < parts.size() && renderView(); ++i)
+        parts[i]->updateWidgetPosition();
 
-    for (size_t i = 0; i < widgets.size() && renderView(); ++i)
-        widgets[i]->widgetPositionsUpdated();
+    for (size_t i = 0; i < parts.size() && renderView(); ++i)
+        parts[i]->widgetPositionsUpdated();
 }
 
-void FrameView::addWidgetToUpdate(RenderEmbeddedObject& object)
+void FrameView::addPartToUpdate(RenderEmbeddedObject& object)
 {
     ASSERT(isInPerformLayout());
     // Tell the DOM element that it needs a widget update.
     Node* node = object.node();
     ASSERT(node);
     if (isHTMLObjectElement(*node) || isHTMLEmbedElement(*node))
         toHTMLPlugInElement(node)->setNeedsWidgetUpdate(true);
 
-    m_widgetUpdateSet.add(&object);
+    m_partUpdateSet.add(&object);
 }
 
 void FrameView::setMediaType(const AtomicString& mediaType)
 {
     ASSERT(m_frame->document());
     m_frame->document()->mediaQueryAffectingValueChanged();
     m_mediaType = mediaType;
 }
 
 AtomicString FrameView::mediaType() const
@@ skipping 752 matching lines @@
 
     // scrollRectToVisible can call into setScrollPosition(), which resets m_maintainScrollPositionAnchor.
     m_maintainScrollPositionAnchor = anchorNode;
 }
 
 bool FrameView::updateWidgets()
 {
     // This is always called from updateWidgetsTimerFired.
     // m_updateWidgetsTimer should only be scheduled if we have widgets to update.
     // Thus I believe we can stop checking isEmpty here, and just ASSERT isEmpty:
-    ASSERT(!m_widgetUpdateSet.isEmpty());
-    if (m_nestedLayoutCount > 1 || m_widgetUpdateSet.isEmpty())
+    ASSERT(!m_partUpdateSet.isEmpty());
+    if (m_nestedLayoutCount > 1 || m_partUpdateSet.isEmpty())
         return true;
 
     // Need to swap because script will run inside the below loop and invalidate the iterator.
     EmbeddedObjectSet objects;
-    objects.swap(m_widgetUpdateSet);
+    objects.swap(m_partUpdateSet);
 
     for (EmbeddedObjectSet::iterator it = objects.begin(); it != objects.end(); ++it) {
         RenderEmbeddedObject& object = **it;
         HTMLPlugInElement* element = toHTMLPlugInElement(object.node());
 
         // The object may have already been destroyed (thus node cleared),
         // but FrameView holds a manual ref, so it won't have been deleted.
         if (!element)
             continue;
 
         // No need to update if it's already crashed or known to be missing.
         if (object.showsUnavailablePluginIndicator())
             continue;
 
         if (element->needsWidgetUpdate())
             element->updateWidget();
         object.updateWidgetPosition();
 
         // Prevent plugins from causing infinite updates of themselves.
         // FIXME: Do we really need to prevent this?
-        m_widgetUpdateSet.remove(&object);
+        m_partUpdateSet.remove(&object);
     }
 
-    return m_widgetUpdateSet.isEmpty();
+    return m_partUpdateSet.isEmpty();
 }
 
 void FrameView::updateWidgetsTimerFired(Timer<FrameView>*)
 {
     ASSERT(!isInPerformLayout());
     RefPtr<FrameView> protect(this);
     m_updateWidgetsTimer.stop();
     for (unsigned i = 0; i < maxUpdateWidgetsIterations; ++i) {
         if (updateWidgets())
             return;
     }
 }
 
 void FrameView::flushAnyPendingPostLayoutTasks()
 {
     ASSERT(!isInPerformLayout());
     if (m_postLayoutTasksTimer.isActive())
         performPostLayoutTasks();
     if (m_updateWidgetsTimer.isActive())
         updateWidgetsTimerFired(0);
 }
 
 void FrameView::scheduleUpdateWidgetsIfNecessary()
 {
     ASSERT(!isInPerformLayout());
-    if (m_updateWidgetsTimer.isActive() || m_widgetUpdateSet.isEmpty())
+    if (m_updateWidgetsTimer.isActive() || m_partUpdateSet.isEmpty())
         return;
     m_updateWidgetsTimer.startOneShot(0, FROM_HERE);
 }
 
 void FrameView::performPostLayoutTasks()
 {
     // FIXME: We can reach here, even when the page is not active!
     // http/tests/inspector/elements/html-link-import.html and many other
     // tests hit that case.
     // We should ASSERT(isActive()); or at least return early if we can!
@@ skipping 1120 matching lines @@
     IntSize visibleSize = expandedIntSize(visibleContentSizeF);
 
     IntPoint maximumOffset(
         contentsWidth() - visibleSize.width() - scrollOrigin().x(),
         contentsHeight() - visibleSize.height() - scrollOrigin().y());
     maximumOffset.clampNegativeToZero();
     return maximumOffset;
 }
 
 } // namespace blink