Changeset 55381 in webkit

Timestamp:

Mar 1, 2010 2:51:25 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-01 Thatcher Ulrich <​tulrich@google.com>

Reviewed by Darin Fisher.

Fix chromium iframe shims. Add another test case to the
iframes-shims test. After r53637, the plugin widget doesn't get
moved every paint. This used to hide the bug that if an iframe
gets added, the plugin's cutout rectangles don't get updated until
a layout happens.
​https://bugs.webkit.org/show_bug.cgi?id=35184

• plugins/iframe-shims.html: test case that adds an iframe shim dynamically

2010-03-01 Thatcher Ulrich <​tulrich@google.com>

Reviewed by Darin Fisher.

Fix chromium iframe shims. Add another test case to the
iframes-shims test. After r53637, the plugin widget doesn't get
moved every paint. This used to hide the bug that if an iframe
gets added, the plugin's cutout rectangles don't get updated until
a layout happens.
​https://bugs.webkit.org/show_bug.cgi?id=35184

• platform/Widget.h: (WebCore::Widget::widgetPositionsUpdated): new virtual method

widgetPositionsUpdated() to notify widgets when other widgets on
the page have been repositioned.

• rendering/RenderView.cpp: (WebCore::RenderView::updateWidgetPositions): call widgetPositionsUpdated() on the widgets
• rendering/RenderWidget.cpp: (WebCore::RenderWidget::widgetPositionsUpdated): call widgetPositionsUpdated() on the widget
• rendering/RenderWidget.h:

2010-03-01 Thatcher Ulrich <​tulrich@google.com>

Reviewed by Darin Fisher.

Fix chromium iframe shims. Add another test case to the
iframes-shims test. After r53637, the plugin widget doesn't get
moved every paint. This used to hide the bug that if an iframe
gets added, the plugin's cutout rectangles don't get updated until
a layout happens.
​https://bugs.webkit.org/show_bug.cgi?id=35184

• src/WebPluginContainerImpl.cpp: (WebKit::WebPluginContainerImpl::widgetPositionsUpdated): do reportGeometry() to ensure that

the plugin is aware of the positions of cutouts on the page (for iframe shim behavior).

• src/WebPluginContainerImpl.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/plugins/iframe-shims-expected.txt (modified) (1 diff)
• LayoutTests/plugins/iframe-shims.html (modified) (4 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/Widget.h (modified) (1 diff)
• WebCore/rendering/RenderView.cpp (modified) (1 diff)
• WebCore/rendering/RenderWidget.cpp (modified) (1 diff)
• WebCore/rendering/RenderWidget.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebPluginContainerImpl.cpp (modified) (1 diff)
• WebKit/chromium/src/WebPluginContainerImpl.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-03-01  Thatcher Ulrich  <tulrich@google.com>
+
+        Reviewed by Darin Fisher.
+
+        Fix chromium iframe shims.  Add another test case to the
+        iframes-shims test.  After r53637, the plugin widget doesn't get
+        moved every paint.  This used to hide the bug that if an iframe
+        gets added, the plugin's cutout rectangles don't get updated until
+        a layout happens.
+        https://bugs.webkit.org/show_bug.cgi?id=35184
+
+        * plugins/iframe-shims.html: test case that adds an iframe shim dynamically
+
 2010-03-01  Gavin Barraclough  <barraclough@apple.com>
 

trunk/LayoutTests/plugins/iframe-shims-expected.txt

@@ -21 +21 @@
 
 
+
+

trunk/LayoutTests/plugins/iframe-shims.html

@@ -49 +49 @@
         return o;
     }
+    
+    function appendOverlay(overlayDivZIframe, overlayDivZOverlay, overlayInsideDiv, expectClickable, caseId)
+    {
+        var id = makeIframeDiv();
+        var root = document.getElementById(caseId);
+        if (overlayDivZIframe)
+            id.style.zIndex = overlayDivZIframe;
+
+        var od = makeOverlayDiv(expectClickable ? 'green' : 'red', caseId);
+        od.style.position = 'absolute';
+        if (overlayDivZOverlay)
+            od.style.zIndex = overlayDivZOverlay;
+
+        if (overlayInsideDiv) {
+            var parentdiv = document.createElement('div');
+            if (overlayDivZOverlay)
+                parentdiv.style.zIndex = overlayDivZOverlay;
+
+            parentdiv.style.position = 'absolute';
+            parentdiv.style.top = '0px';
+            parentdiv.style.left = '0px';
+            parentdiv.appendChild(id);
+            parentdiv.appendChild(od);
+            root.appendChild(parentdiv);
+        } else {
+            root.appendChild(id);
+            root.appendChild(od);
+        }
+    };
 
     function addCase(x, y, tags)
@@ -63 +92 @@
         root.style.left = x * (width + 40) + 'px';
         root.style.top = y * (height + 20) + 'px';
+        root.id = caseId;
         container.appendChild(root);
 
@@ -103 +133 @@
         };
 
-        var appendOverlay = function()
-        {
-            var id = makeIframeDiv();
-            if (overlayDivZIframe)
-                id.style.zIndex = overlayDivZIframe;
-
-            var od = makeOverlayDiv(expectClickable ? 'green' : 'red', caseId);
-            od.style.position = 'absolute';
-            if (overlayDivZOverlay)
-                od.style.zIndex = overlayDivZOverlay;
-
-            if (tags.overlayInsideDiv) {
-                var parentdiv = document.createElement('div');
-                if (overlayDivZOverlay)
-                    parentdiv.style.zIndex = overlayDivZOverlay;
-
-                parentdiv.style.position = 'absolute';
-                parentdiv.style.top = '0px';
-                parentdiv.style.left = '0px';
-                parentdiv.appendChild(id);
-                parentdiv.appendChild(od);
-                root.appendChild(parentdiv);
-            } else {
-                root.appendChild(id);
-                root.appendChild(od);
-            }
-        };
-
         if (tags.overlayEarlier) {
-            appendOverlay();
+            appendOverlay(overlayDivZIframe, overlayDivZOverlay, tags.overlayInsideDiv, expectClickable, caseId);
             appendPlugin();
         } else {
             appendPlugin();
-            appendOverlay();
+            if (tags.overlayOnTimeout) {
+                setTimeout('appendOverlay('+overlayDivZIframe+', '+overlayDivZOverlay +', ' + tags.overlayInsideDiv + ', ' + expectClickable + ', ' + caseId + ')', 0);
+            } else {
+                appendOverlay(overlayDivZIframe, overlayDivZOverlay, tags.overlayInsideDiv, expectClickable, caseId);
+            }
         }
      }
@@ -178 +184 @@
         addCase(1, 3, {'overlayEarlier':1, 'pluginNorelative':1, 'pluginInsideDiv':1, expect:'overlay OVER'});
         addCase(2, 3, {'pluginNorelative':1, 'pluginInsideDiv':1, expect:'overlay OVER'});
+        addCase(3, 3, {'pluginLowerz':1, 'overlayOnTimeout':1, expect:'overlay OVER'});
 
         runTest();

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-01  Thatcher Ulrich  <tulrich@google.com>
+
+        Reviewed by Darin Fisher.
+
+        Fix chromium iframe shims.  Add another test case to the
+        iframes-shims test.  After r53637, the plugin widget doesn't get
+        moved every paint.  This used to hide the bug that if an iframe
+        gets added, the plugin's cutout rectangles don't get updated until
+        a layout happens.
+        https://bugs.webkit.org/show_bug.cgi?id=35184
+
+        * platform/Widget.h:
+        (WebCore::Widget::widgetPositionsUpdated): new virtual method
+            widgetPositionsUpdated() to notify widgets when other widgets on
+            the page have been repositioned.
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::updateWidgetPositions): call widgetPositionsUpdated() on the widgets
+        * rendering/RenderWidget.cpp:
+        (WebCore::RenderWidget::widgetPositionsUpdated): call widgetPositionsUpdated() on the widget
+        * rendering/RenderWidget.h:
+
 2010-03-01  Fridrich Strba  <fridrich.strba@bluewin.ch>
 

trunk/WebCore/platform/Widget.h

@@ -187 +187 @@
     virtual void frameRectsChanged() {}
 
+    // Notifies this widget that other widgets on the page have been repositioned.
+    virtual void widgetPositionsUpdated() {}
+
 #if PLATFORM(MAC)
     NSView* getOuterView() const;

trunk/WebCore/rendering/RenderView.cpp

@@ -542 +542 @@
     for (RenderWidgetSet::iterator it = m_widgets.begin(); it != end; ++it)
         (*it)->updateWidgetPosition();
+    for (RenderWidgetSet::iterator it = m_widgets.begin(); it != end; ++it)
+        (*it)->widgetPositionsUpdated();
 }
 

trunk/WebCore/rendering/RenderWidget.cpp

@@ -326 +326 @@
 }
 
+void RenderWidget::widgetPositionsUpdated()
+{
+    if (!m_widget)
+        return;
+    m_widget->widgetPositionsUpdated();
+}
+
 void RenderWidget::setSelectionState(SelectionState state)
 {

trunk/WebCore/rendering/RenderWidget.h

@@ -40 +40 @@
 
     void updateWidgetPosition();
+    void widgetPositionsUpdated();
 
     void showSubstituteImage(PassRefPtr<Image>);

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-03-01  Thatcher Ulrich  <tulrich@google.com>
+
+        Reviewed by Darin Fisher.
+
+        Fix chromium iframe shims.  Add another test case to the
+        iframes-shims test.  After r53637, the plugin widget doesn't get
+        moved every paint.  This used to hide the bug that if an iframe
+        gets added, the plugin's cutout rectangles don't get updated until
+        a layout happens.
+        https://bugs.webkit.org/show_bug.cgi?id=35184
+
+        * src/WebPluginContainerImpl.cpp:
+        (WebKit::WebPluginContainerImpl::widgetPositionsUpdated): do reportGeometry() to ensure that
+            the plugin is aware of the positions of cutouts on the page (for iframe shim behavior).
+        * src/WebPluginContainerImpl.h:
+
 2010-02-27  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebKit/chromium/src/WebPluginContainerImpl.cpp

@@ -171 +171 @@
 }
 
+void WebPluginContainerImpl::widgetPositionsUpdated()
+{
+    Widget::widgetPositionsUpdated();
+    reportGeometry();
+}
+
 void WebPluginContainerImpl::setParentVisible(bool parentVisible)
 {

trunk/WebKit/chromium/src/WebPluginContainerImpl.h

@@ -74 +74 @@
     virtual void setParentVisible(bool);
     virtual void setParent(WebCore::ScrollView*);
+    virtual void widgetPositionsUpdated();
 
     // WebPluginContainer methods