Changeset 75897 in webkit

Timestamp:

Jan 16, 2011, 5:07:24 PM (15 years ago)

Author:

Simon Fraser

Message:

2011-01-16 Simon Fraser <Simon Fraser>

Reviewed by Dan Bernstein.

Issues with iframes and plugins when the WebView is scaled.
<rdar://problem/6213380>

When _scaleWebView has been called on a WebView, iframes
in WebKit1 render and hit-test incorrectly, and plug-ins don't scale up.
This is caused by AppKit NSViews not playing nicely with the scale
applied through style.

Work around most of these issues by adjusting the bounds size
of widgets to allow iframe contents to paint with the correct scale,
and fix various places in the code where we relied on coordinate
transforms via NSViews (which ignore CSS transforms).

• WebCore.exp.in:
• platform/Widget.cpp: (WebCore::Widget::setBoundsSize):
• platform/Widget.h:
• platform/mac/WidgetMac.mm: (WebCore::Widget::setBoundsSize): (WebCore::Widget::paint):
• rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::shouldPropagateCompositingToEnclosingIFrame):
• rendering/RenderWidget.cpp: (WebCore::RenderWidget::setWidgetGeometry): (WebCore::RenderWidget::setWidget): (WebCore::RenderWidget::updateWidgetPosition):
• rendering/RenderWidget.h:

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/WebCore.exp.in (modified) (1 diff)
• Source/WebCore/platform/Widget.cpp (modified) (1 diff)
• Source/WebCore/platform/Widget.h (modified) (1 diff)
• Source/WebCore/platform/mac/WidgetMac.mm (modified) (6 diffs)
• Source/WebCore/rendering/RenderLayerCompositor.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderWidget.cpp (modified) (4 diffs)
• Source/WebCore/rendering/RenderWidget.h (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm (modified) (1 diff)
• WebKit/mac/WebView/WebFrameView.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog ¶

@@ -8 +8 @@
         * plugins/qt/PluginViewQt.cpp:
         (WebCore::setXKeyEventSpecificFields): map event text to keycode
+
+2011-01-16  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Issues with iframes and plugins when the WebView is scaled.
+        <rdar://problem/6213380>
+        
+        When _scaleWebView has been called on a WebView, iframes
+        in WebKit1 render and hit-test incorrectly, and plug-ins don't scale up.
+        This is caused by AppKit NSViews not playing nicely with the scale
+        applied through style.
+        
+        Work around most of these issues by adjusting the bounds size
+        of widgets to allow iframe contents to paint with the correct scale,
+        and fix various places in the code where we relied on coordinate
+        transforms via NSViews (which ignore CSS transforms).
+
+        * WebCore.exp.in:
+        * platform/Widget.cpp:
+        (WebCore::Widget::setBoundsSize):
+        * platform/Widget.h:
+        * platform/mac/WidgetMac.mm:
+        (WebCore::Widget::setBoundsSize):
+        (WebCore::Widget::paint):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::shouldPropagateCompositingToEnclosingIFrame):
+        * rendering/RenderWidget.cpp:
+        (WebCore::RenderWidget::setWidgetGeometry):
+        (WebCore::RenderWidget::setWidget):
+        (WebCore::RenderWidget::updateWidgetPosition):
+        * rendering/RenderWidget.h:
 
 2011-01-16  Simon Fraser  <simon.fraser@apple.com>

trunk/Source/WebCore/WebCore.exp.in ¶

@@ -1160 +1160 @@
 __ZNK7WebCore6Editor8canPasteEv
 __ZNK7WebCore6Editor9canDeleteEv
+__ZN7WebCore6Widget13setBoundsSizeERKNS_7IntSizeE
 __ZNK7WebCore6Widget14platformWidgetEv
 __ZNK7WebCore6Widget23convertToContainingViewERKNS_7IntRectE

trunk/Source/WebCore/platform/Widget.cpp ¶

@@ -107 +107 @@
 
 #if !PLATFORM(MAC)
+void Widget::setBoundsSize(const IntSize&)
+{
+}
+
 IntRect Widget::convertFromRootToContainingWindow(const Widget*, const IntRect& rect)
 {

trunk/Source/WebCore/platform/Widget.h ¶

@@ -154 +154 @@
 
     virtual void setFrameRect(const IntRect&);
+    virtual void setBoundsSize(const IntSize&);
     virtual IntRect frameRect() const;
     IntRect boundsRect() const { return IntRect(0, 0, width(),  height()); }

trunk/Source/WebCore/platform/mac/WidgetMac.mm ¶

@@ -35 +35 @@
 #import "Cursor.h"
 #import "Document.h"
+#import "FloatConversion.h"
 #import "Font.h"
 #import "Frame.h"
@@ -191 +192 @@
 }
 
+void Widget::setBoundsSize(const IntSize& size)
+{
+    BEGIN_BLOCK_OBJC_EXCEPTIONS;
+    NSView *outerView = getOuterView();
+    if (!outerView)
+        return;
+
+    // Take a reference to this Widget, because sending messages to outerView can invoke arbitrary
+    // code, which can deref it.
+    RefPtr<Widget> protectedThis(this);
+
+    NSSize nsSize = size;
+    if (!NSEqualSizes(nsSize, [outerView bounds].size)) {
+        [outerView setBoundsSize:nsSize];
+        [outerView setNeedsDisplay:NO];
+    }
+    END_BLOCK_OBJC_EXCEPTIONS;
+}
+
 NSView *Widget::getOuterView() const
 {
@@ -215 +235 @@
     RefPtr<Widget> protectedThis(this);
 
+    IntPoint transformOrigin = frameRect().location();
+    AffineTransform widgetToViewTranform = makeMapBetweenRects(IntRect(IntPoint(), frameRect().size()), [view bounds]);
+
     NSGraphicsContext *currentContext = [NSGraphicsContext currentContext];
     if (currentContext == [[view window] graphicsContext] || ![currentContext isDrawingToScreen]) {
         // This is the common case of drawing into a window or printing.
         BEGIN_BLOCK_OBJC_EXCEPTIONS;
-        [view displayRectIgnoringOpacity:[view convertRect:r fromView:[view superview]]];
+        
+        CGContextRef context = (CGContextRef)[currentContext graphicsPort];
+
+        CGContextSaveGState(context);
+        CGContextTranslateCTM(context, transformOrigin.x(), transformOrigin.y());
+        CGContextScaleCTM(context, narrowPrecisionToFloat(widgetToViewTranform.xScale()), narrowPrecisionToFloat(widgetToViewTranform.yScale()));
+        CGContextTranslateCTM(context, -transformOrigin.x(), -transformOrigin.y());
+
+        IntRect dirtyRect = r;
+        dirtyRect.move(-transformOrigin.x(), -transformOrigin.y());
+        if (![view isFlipped])
+            dirtyRect.setY([view bounds].size.height - dirtyRect.bottom());
+
+        [view displayRectIgnoringOpacity:dirtyRect];
+
+        CGContextRestoreGState(context);
+
         END_BLOCK_OBJC_EXCEPTIONS;
     } else {
@@ -244 +283 @@
         CGContextSaveGState(cgContext);
 
+        CGContextTranslateCTM(cgContext, transformOrigin.x(), transformOrigin.y());
+        CGContextScaleCTM(cgContext, narrowPrecisionToFloat(widgetToViewTranform.xScale()), narrowPrecisionToFloat(widgetToViewTranform.yScale()));
+        CGContextTranslateCTM(cgContext, -transformOrigin.x(), -transformOrigin.y());
+
         NSRect viewFrame = [view frame];
         NSRect viewBounds = [view bounds];
@@ -251 +294 @@
         CGContextScaleCTM(cgContext, 1, -1);
 
+        IntRect dirtyRect = r;
+        dirtyRect.move(-transformOrigin.x(), -transformOrigin.y());
+        if (![view isFlipped])
+            dirtyRect.setY([view bounds].size.height - dirtyRect.bottom());
+
         BEGIN_BLOCK_OBJC_EXCEPTIONS;
         {
@@ -257 +305 @@
 #endif
             NSGraphicsContext *nsContext = [NSGraphicsContext graphicsContextWithGraphicsPort:cgContext flipped:YES];
-            [view displayRectIgnoringOpacity:[view convertRect:r fromView:[view superview]] inContext:nsContext];
+            [view displayRectIgnoringOpacity:dirtyRect inContext:nsContext];
         }
         END_BLOCK_OBJC_EXCEPTIONS;

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp ¶

@@ -1119 +1119 @@
 
     // On Mac, only propagate compositing if the iframe is overlapped in the parent
-    // document, or the parent is already compositing.
+    // document, or the parent is already compositing, or the main frame is scaled.
+    Frame* frame = m_renderView->frameView()->frame();
+    Page* page = frame ? frame->page() : 0;
+    if (page->mainFrame()->pageScaleFactor() != 1)
+        return true;
+    
     RenderIFrame* iframeRenderer = toRenderIFrame(renderer);
     if (iframeRenderer->widget()) {

trunk/Source/WebCore/rendering/RenderWidget.cpp ¶

@@ -158 +158 @@
 }
 
-bool RenderWidget::setWidgetGeometry(const IntRect& frame)
+bool RenderWidget::setWidgetGeometry(const IntRect& frame, const IntSize& boundsSize)
 {
     if (!node())
@@ -175 +175 @@
     RefPtr<Node> protectedNode(node());
     m_widget->setFrameRect(frame);
+    m_widget->setBoundsSize(boundsSize);
     
 #if USE(ACCELERATED_COMPOSITING)
@@ -202 +203 @@
         if (style()) {
             if (!needsLayout())
-                setWidgetGeometry(absoluteContentBox());
+                setWidgetGeometry(localToAbsoluteQuad(FloatQuad(contentBoxRect())).enclosingBoundingBox(), contentBoxRect().size());
             if (style()->visibility() != VISIBLE)
                 m_widget->hide();
@@ -342 +343 @@
         return;
 
-    // FIXME: This doesn't work correctly with transforms.
-    FloatPoint absPos = localToAbsolute();
-    absPos.move(borderLeft() + paddingLeft(), borderTop() + paddingTop());
-
-    int w = width() - borderAndPaddingWidth();
-    int h = height() - borderAndPaddingHeight();
-
-    bool boundsChanged = setWidgetGeometry(IntRect(absPos.x(), absPos.y(), w, h));
+    IntRect contentBox = contentBoxRect();
+    IntRect absoluteContentBox = localToAbsoluteQuad(FloatQuad(contentBoxRect())).enclosingBoundingBox();
+    bool boundsChanged = setWidgetGeometry(absoluteContentBox, contentBoxRect().size());
 
     // if the frame bounds got changed, or if view needs layout (possibly indicating

trunk/Source/WebCore/rendering/RenderWidget.h ¶

@@ -71 +71 @@
     virtual void setOverlapTestResult(bool);
 
-    bool setWidgetGeometry(const IntRect&);
+    bool setWidgetGeometry(const IntRect&, const IntSize&);
 
     RefPtr<Widget> m_widget;

trunk/WebKit/mac/ChangeLog ¶

@@ +1 @@
+2011-01-16  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Issues with iframes and plugins when the WebView is scaled.
+        <rdar://problem/6213380>
+        
+        When _scaleWebView has been called on a WebView, iframes
+        in WebKit1 render and hit-test incorrectly, and plug-ins don't scale up.
+        This is caused by AppKit NSViews not playing nicely with the scale
+        applied through style.
+        
+        Work around most of these issues by adjusting the bounds size
+        of widgets to allow iframe contents to paint with the correct scale,
+        and fix various places in the code where we relied on coordinate
+        transforms via NSViews (which ignore CSS transforms).
+
+        * Plugins/Hosted/WebHostedNetscapePluginView.mm:
+        (-[WebHostedNetscapePluginView updateAndSetWindow]):
+        * WebView/WebFrameView.mm:
+        (-[WebFrameView setBoundsSize:]):
+
 2011-01-16  Beth Dakin  <bdakin@apple.com>
 

trunk/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm ¶

@@ -209 +209 @@
     
     _proxy->resize(boundsInWindow, visibleRectInWindow);
+
+    CGRect layerBounds = NSRectToCGRect(boundsInWindow);
+    CGRect bounds = NSRectToCGRect([self bounds]);
+    CGRect frame = NSRectToCGRect([self frame]);
+    
+    // We're not scaled, or in a subframe
+    CATransform3D scaleTransform = CATransform3DIdentity;
+    if (CGSizeEqualToSize(bounds.size, frame.size)) {
+        // We're in a subframe. Backing store is boundsInWindow.size.
+        if (boundsInWindow.size.width && boundsInWindow.size.height)
+            scaleTransform = CATransform3DMakeScale(frame.size.width / boundsInWindow.size.width, frame.size.height / boundsInWindow.size.height, 1);
+    } else {
+        // We're in the main frame with scaling. Need to mimic the frame/bounds scaling on Widgets.
+        if (frame.size.width && frame.size.height)
+            scaleTransform = CATransform3DMakeScale(bounds.size.width / frame.size.width, bounds.size.height / frame.size.height, 1);
+    }
+
+    _pluginLayer.get().sublayerTransform = scaleTransform;
 }
 

trunk/WebKit/mac/WebView/WebFrameView.mm ¶

@@ -510 +510 @@
 }
 
+- (void)setBoundsSize:(NSSize)size
+{
+    [super setBoundsSize:size];
+    [[self _scrollView] setFrameSize:size];
+}
+
 - (void)viewDidMoveToWindow
 {