Changeset 99107 in webkit


Ignore:
Timestamp:
Nov 2, 2011, 3:26:15 PM (14 years ago)
Author:
andersca@apple.com
Message:

Get rid of Plugin::deprecatedGeometryDidChange
​https://bugs.webkit.org/show_bug.cgi?id=71411

Reviewed by Sam Weinig.

Now that all Plugin subclasses implement geometryDidChange and do all the work there
we can get rid of deprecatedGeometryDidChange.

  • WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
  • WebProcess/Plugins/Netscape/NetscapePlugin.h:
  • WebProcess/Plugins/PDF/BuiltInPDFView.cpp:
  • WebProcess/Plugins/PDF/BuiltInPDFView.h:
  • WebProcess/Plugins/Plugin.h:
  • WebProcess/Plugins/PluginProxy.cpp:
  • WebProcess/Plugins/PluginProxy.h:
  • WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::viewGeometryDidChange):

Location:
trunk/Source/WebKit2
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r99102 r99107  
     12011-11-02  Anders Carlsson  <andersca@apple.com>
     2
     3        Get rid of Plugin::deprecatedGeometryDidChange
     4        https://bugs.webkit.org/show_bug.cgi?id=71411
     5
     6        Reviewed by Sam Weinig.
     7
     8        Now that all Plugin subclasses implement geometryDidChange and do all the work there
     9        we can get rid of deprecatedGeometryDidChange.
     10
     11        * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
     12        * WebProcess/Plugins/Netscape/NetscapePlugin.h:
     13        * WebProcess/Plugins/PDF/BuiltInPDFView.cpp:
     14        * WebProcess/Plugins/PDF/BuiltInPDFView.h:
     15        * WebProcess/Plugins/Plugin.h:
     16        * WebProcess/Plugins/PluginProxy.cpp:
     17        * WebProcess/Plugins/PluginProxy.h:
     18        * WebProcess/Plugins/PluginView.cpp:
     19        (WebKit::PluginView::viewGeometryDidChange):
     20
    1212011-11-02  Anders Carlsson  <andersca@apple.com>
    222

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp

    r99093 r99107  
    671671}
    672672
    673 void NetscapePlugin::deprecatedGeometryDidChange(const IntRect& frameRectInWindowCoordinates, const IntRect& clipRectInWindowCoordinates)
    674 {
    675     ASSERT(m_isStarted);
    676 
    677     if (m_frameRectInWindowCoordinates == frameRectInWindowCoordinates && m_clipRectInWindowCoordinates == clipRectInWindowCoordinates) {
    678         // Nothing to do.
    679         return;
    680     }
    681 
    682     m_frameRectInWindowCoordinates = frameRectInWindowCoordinates;
    683     m_clipRectInWindowCoordinates = clipRectInWindowCoordinates;
    684 
    685     platformGeometryDidChange();
    686     callSetWindow();
    687 }
    688 
    689673void NetscapePlugin::geometryDidChange(const IntSize& pluginSize, const IntRect& clipRect, const AffineTransform& pluginToRootViewTransform)
    690674{

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h

    r99093 r99107  
    170170#endif
    171171    virtual bool isTransparent();
    172     virtual void deprecatedGeometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect);
    173172    virtual void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform);
    174173    virtual void visibilityDidChange();

  • trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp

    r98756 r99107  
    367367}
    368368
    369 void BuiltInPDFView::deprecatedGeometryDidChange(const IntRect& frameRect, const IntRect& clipRect)
    370 {
    371     ASSERT_NOT_REACHED();
    372 }
    373 
    374369void BuiltInPDFView::geometryDidChange(const IntSize& pluginSize, const IntRect& clipRect, const AffineTransform& pluginToRootViewTransform)
    375370{

  • trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h

    r98756 r99107  
    7878#endif
    7979    virtual bool isTransparent();
    80     virtual void deprecatedGeometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect);
    8180    virtual void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform);
    8281    virtual void visibilityDidChange();

  • trunk/Source/WebKit2/WebProcess/Plugins/Plugin.h

    r99093 r99107  
    118118    virtual bool isTransparent() = 0;
    119119
    120     // Tells the plug-in that either the plug-ins frame rect or its clip rect has changed. Both rects are in window coordinates.
    121     virtual void deprecatedGeometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect) = 0;
    122 
    123120    // Tells the plug-in that its geometry has changed. The clip rect is in plug-in coordinates, and the affine transform can be used
    124121    // to convert from root view coordinates to plug-in coordinates.

  • trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp

    r99093 r99107  
    205205}
    206206
    207 void PluginProxy::deprecatedGeometryDidChange(const IntRect&, const IntRect&)
    208 {
    209     ASSERT_NOT_REACHED();
    210 }
    211 
    212207void PluginProxy::geometryDidChange(const IntSize& pluginSize, const IntRect& clipRect, const AffineTransform& pluginToRootViewTransform)
    213208{

  • trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h

    r99093 r99107  
    7373#endif
    7474    virtual bool isTransparent();
    75     virtual void deprecatedGeometryDidChange(const WebCore::IntRect& frameRectInWindowCoordinates, const WebCore::IntRect& clipRectInWindowCoordinates);
    7675    virtual void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform);
    7776    virtual void visibilityDidChange();

  • trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

    r99093 r99107  
    717717        return;
    718718
    719     if (m_plugin->wantsWindowRelativeCoordinates()) {
    720         // Get the frame rect in window coordinates.
    721         IntRect rect = parent()->contentsToWindow(frameRect());
    722         m_plugin->deprecatedGeometryDidChange(rect, clipRectInWindowCoordinates());
    723     }
    724 
    725719    // FIXME: Just passing a translation matrix isn't good enough.
    726720    IntPoint locationInWindowCoordinates = parent()->contentsToRootView(frameRect().location());
Note: See TracChangeset for help on using the changeset viewer.