Rename FrameView fields and methods *Widget* to ...FrameViewBase...

third_party/WebKit/Source/web/WebPluginContainerImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2014 Opera Software ASA. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 215 matching lines @@
   // defaultEventHandler.
   if (!event->defaultHandled())
     m_element->Node::defaultEventHandler(event);
 }
 
 void WebPluginContainerImpl::frameRectsChanged() {
   FrameViewBase::frameRectsChanged();
   reportGeometry();
 }
 
-void WebPluginContainerImpl::widgetGeometryMayHaveChanged() {
-  FrameViewBase::widgetGeometryMayHaveChanged();
+void WebPluginContainerImpl::geometryMayHaveChanged() {
+  FrameViewBase::geometryMayHaveChanged();
   reportGeometry();
 }
 
 void WebPluginContainerImpl::eventListenersRemoved() {
   // We're no longer registered to receive touch events, so don't try to remove
   // the touch event handlers in our destructor.
   m_touchEventRequestType = TouchEventRequestTypeNone;
 }
 
 void WebPluginContainerImpl::setParentVisible(bool parentVisible) {
   // We override this function to make sure that geometry updates are sent
   // over to the plugin. For e.g. when a plugin is instantiated it does not
   // have a valid parent. As a result the first geometry update from webkit
   // is ignored. This function is called when the plugin eventually gets a
   // parent.
 
   if (isParentVisible() == parentVisible)
     return;  // No change.
 
   FrameViewBase::setParentVisible(parentVisible);
   if (!isSelfVisible())
-    return;  // This widget has explicitely been marked as not visible.
+    return;  // This FrameViewBase has explicitely been marked as not visible.
 
   if (m_webPlugin)
     m_webPlugin->updateVisibility(isVisible());
 }
 
 void WebPluginContainerImpl::setPlugin(WebPlugin* plugin) {
   if (plugin == m_webPlugin)
     return;
 
   m_element->resetInstance();
@@ skipping 427 matching lines @@
 
 DEFINE_TRACE(WebPluginContainerImpl) {
   visitor->trace(m_element);
   ContextClient::trace(visitor);
   PluginView::trace(visitor);
 }
 
 void WebPluginContainerImpl::handleMouseEvent(MouseEvent* event) {
   DCHECK(parent()->isFrameView());
 
-  // We cache the parent FrameView here as the plugin widget could be deleted
-  // in the call to HandleEvent. See http://b/issue?id=1362948
+  // We cache the parent FrameView here as the plugin FrameViewBase could be
+  // deleted in the call to HandleEvent. See http://b/issue?id=1362948
   FrameView* parentView = toFrameView(parent());
 
   WebMouseEventBuilder transformedEvent(
       this, LayoutItem(m_element->layoutObject()), *event);
   if (transformedEvent.type() == WebInputEvent::Undefined)
     return;
 
   if (event->type() == EventTypeNames::mousedown)
     focusPlugin();
 
@@ skipping 267 matching lines @@
     // frame view.
     computeClipRectsForPlugin(m_element, windowRect, clipRect, unobscuredRect);
   }
   getPluginOcclusions(m_element, this->parent(), frameRect(), cutOutRects);
   // Convert to the plugin position.
   for (size_t i = 0; i < cutOutRects.size(); i++)
     cutOutRects[i].move(-frameRect().x(), -frameRect().y());
 }
 
 }  // namespace blink