Eliminate remaining WebCore dependencies from webplugin_impl.cc...

webkit/api/src/WebPluginContainerImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 54 matching lines @@
 
 using namespace WebCore;
 
 namespace WebKit {
 
 // Public methods --------------------------------------------------------------
 
 void WebPluginContainerImpl::setFrameRect(const IntRect& frameRect)
 {
     Widget::setFrameRect(frameRect);
-
-    if (!parent())
-        return;
-
-    IntRect windowRect, clipRect;
-    Vector<IntRect> cutOutRects;
-    calculateGeometry(frameRect, windowRect, clipRect, cutOutRects);
-
-    m_webPlugin->updateGeometry(windowRect, clipRect, cutOutRects, isVisible());
+    reportGeometry();
 }
 
 void WebPluginContainerImpl::paint(GraphicsContext* gc, const IntRect& damageRect)
 {
     if (gc->paintingDisabled())
         return;
 
     if (!parent())
         return;
 
@@ skipping 72 matching lines @@
     // where mozilla behaves differently than the spec.
     if (event->isMouseEvent())
         handleMouseEvent(static_cast<MouseEvent*>(event));
     else if (event->isKeyboardEvent())
         handleKeyboardEvent(static_cast<KeyboardEvent*>(event));
 }
 
 void WebPluginContainerImpl::frameRectsChanged()
 {
     Widget::frameRectsChanged();
-
-    // This is a hack to tickle re-positioning of the plugin in the case where
-    // our parent view was scrolled.
-    setFrameRect(frameRect());
+    reportGeometry();
 }
 
 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.
 
     Widget::setParentVisible(parentVisible);
     if (!isSelfVisible())
         return;  // This widget has explicitely been marked as not visible.
 
     m_webPlugin->updateVisibility(isVisible());
 }
 
 void WebPluginContainerImpl::setParent(ScrollView* view)
 {
     // We override this function so that if the plugin is windowed, we can call
     // NPP_SetWindow at the first possible moment.  This ensures that
     // NPP_SetWindow is called before the manual load data is sent to a plugin.
     // If this order is reversed, Flash won't load videos.
 
     Widget::setParent(view);
     if (view)
-        setFrameRect(frameRect());
+        reportGeometry();
 }
 
 void WebPluginContainerImpl::invalidate()
 {
     Widget::invalidate();
 }
 
 void WebPluginContainerImpl::invalidateRect(const WebRect& rect)
 {
     invalidateRect(static_cast<IntRect>(rect));
 }
 
+void WebPluginContainerImpl::reportGeometry()
+{
+    if (!parent())
+        return;
+
+    IntRect windowRect, clipRect;
+    Vector<IntRect> cutOutRects;
+    calculateGeometry(frameRect(), windowRect, clipRect, cutOutRects);
+
+    m_webPlugin->updateGeometry(windowRect, clipRect, cutOutRects, isVisible());
+}
+
+void WebPluginContainerImpl::clearScriptObjects()
+{
+    Frame* frame = m_element->document()->frame();
+    if (!frame)
+        return;
+    frame->script()->cleanupScriptObjectsForPlugin(this);
+}
+
 NPObject* WebPluginContainerImpl::scriptableObjectForElement()
 {
     return m_element->getNPObject();
 }
 
 WebString WebPluginContainerImpl::executeScriptURL(const WebURL& url, bool popupsAllowed)
 {
     Frame* frame = m_element->document()->frame();
     if (!frame)
         return WebString();
@@ skipping 283 matching lines @@
                     roundedIntPoint(iframeRenderer->localToAbsolute());
                 RenderBox* rbox = toRenderBox(iframeRenderer);
                 IntSize size(rbox->width(), rbox->height());
                 cutOutRects.append(IntRect(point, size));
             }
         }
     }
 }
 
 } // namespace WebKit