Changeset 102197 in webkit

Timestamp:

Dec 6, 2011, 5:22:20 PM (15 years ago)

Author:

Lucas Forschler

Message:

Merged r92491.

Location:

branches/safari-534.53-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/PluginView.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (3 diffs)

branches/safari-534.53-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-12-06  Lucas Forschler  <lforschler@apple.com>
+
+    Merge 92491
+
+    2011-08-05  Darin Adler  <darin@apple.com>
+
+            Reviewed by Anders Carlsson.
+
+            [WebKit2] Fix code paths that can leave frame view paint behavior in the wrong state
+            https://bugs.webkit.org/show_bug.cgi?id=63779
+
+            * WebProcess/Plugins/PluginView.cpp:
+            (WebKit::PluginView::handleEvent): Unrelated cleanup. Removed unneeded local variable.
+
+            * WebProcess/WebPage/WebPage.cpp:
+            (WebKit::WebPage::snapshotInViewCoordinates): Rearranged code so that the call to
+            setPaintBehavior is after the early exit. Also got rid of unneeded save/restore since
+            the function uses a graphics context that it then throws away.
+            (WebKit::WebPage::scaledSnapshotInDocumentCoordinates): Ditto.
+
 2011-12-02  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -636 +636 @@
         
         // Adjust mouse coordinates to account for pageScaleFactor
-        float scaleFactor = frame()->pageScaleFactor();
-        WebMouseEvent eventWithScaledCoordinates(*(static_cast<const WebMouseEvent*>(currentEvent)), scaleFactor);
+        WebMouseEvent eventWithScaledCoordinates(*static_cast<const WebMouseEvent*>(currentEvent), frame()->pageScaleFactor());
         didHandleEvent = m_plugin->handleMouseEvent(eventWithScaledCoordinates);
     } else if (event->type() == eventNames().mousewheelEvent && currentEvent->type() == WebEvent::Wheel) {

branches/safari-534.53-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -871 +871 @@
         return 0;
 
-    frameView->updateLayoutAndStyleIfNeededRecursive();
-
-    PaintBehavior oldBehavior = frameView->paintBehavior();
-    frameView->setPaintBehavior(oldBehavior | PaintBehaviorFlattenCompositingLayers);
-
     RefPtr<WebImage> snapshot = WebImage::create(rect.size(), options);
     if (!snapshot->bitmap())
@@ -881 +876 @@
     
     OwnPtr<WebCore::GraphicsContext> graphicsContext = snapshot->bitmap()->createGraphicsContext();
-
-    graphicsContext->save();
     graphicsContext->translate(-rect.x(), -rect.y());
+
+    frameView->updateLayoutAndStyleIfNeededRecursive();
+
+    PaintBehavior oldBehavior = frameView->paintBehavior();
+    frameView->setPaintBehavior(oldBehavior | PaintBehaviorFlattenCompositingLayers);
     frameView->paint(graphicsContext.get(), rect);
-    graphicsContext->restore();
-
     frameView->setPaintBehavior(oldBehavior);
 
@@ -898 +894 @@
         return 0;
 
-    frameView->updateLayoutAndStyleIfNeededRecursive();
-
-    PaintBehavior oldBehavior = frameView->paintBehavior();
-    frameView->setPaintBehavior(oldBehavior | PaintBehaviorFlattenCompositingLayers);
-
-    bool scale = scaleFactor != 1;
-    IntSize size = rect.size();
-    if (scale) 
-        size = IntSize(ceil(rect.width() * scaleFactor), ceil(rect.height() * scaleFactor));
-
+    IntSize size(ceil(rect.width() * scaleFactor), ceil(rect.height() * scaleFactor));
     RefPtr<WebImage> snapshot = WebImage::create(size, options);
     if (!snapshot->bitmap())
         return 0;
-    
+
     OwnPtr<WebCore::GraphicsContext> graphicsContext = snapshot->bitmap()->createGraphicsContext();
-    graphicsContext->save();
-    
-    if (scale)
-        graphicsContext->scale(FloatSize(scaleFactor, scaleFactor));
-    
+    graphicsContext->scale(FloatSize(scaleFactor, scaleFactor));
     graphicsContext->translate(-rect.x(), -rect.y());
+
+    frameView->updateLayoutAndStyleIfNeededRecursive();
+
+    PaintBehavior oldBehavior = frameView->paintBehavior();
+    frameView->setPaintBehavior(oldBehavior | PaintBehaviorFlattenCompositingLayers);
     frameView->paintContents(graphicsContext.get(), rect);
-    graphicsContext->restore();
-
     frameView->setPaintBehavior(oldBehavior);