Changeset 84523 in webkit

Timestamp:

Apr 21, 2011 10:57:36 AM (13 years ago)

Author:

weinig@apple.com

Message:

2011-04-21 Sam Weinig <​sam@webkit.org>

Reviewed by Simon Fraser.

Deploy GraphicsContextStateSaver in WebKit2
​https://bugs.webkit.org/show_bug.cgi?id=59116

• UIProcess/FindIndicator.cpp: (WebKit::FindIndicator::draw):
• WebProcess/Plugins/PluginView.cpp: (WebKit::PluginView::paint):
• WebProcess/WebPage/FindController.cpp: (WebKit::FindController::drawRect):
• WebProcess/WebPage/PageOverlay.cpp: (WebKit::PageOverlay::drawRect):
• WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect): (WebKit::WebPage::drawPageOverlay):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/FindIndicator.cpp (modified) (1 diff)
• WebProcess/Plugins/PluginView.cpp (modified) (1 diff)
• WebProcess/WebPage/FindController.cpp (modified) (1 diff)
• WebProcess/WebPage/PageOverlay.cpp (modified) (2 diffs)
• WebProcess/WebPage/WebPage.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-21  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Simon Fraser.
+
+        Deploy GraphicsContextStateSaver in WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=59116
+
+        * UIProcess/FindIndicator.cpp:
+        (WebKit::FindIndicator::draw):
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::paint):
+        * WebProcess/WebPage/FindController.cpp:
+        (WebKit::FindController::drawRect):
+        * WebProcess/WebPage/PageOverlay.cpp:
+        (WebKit::PageOverlay::drawRect):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::drawRect):
+        (WebKit::WebPage::drawPageOverlay):
+
 2011-04-21  Jessie Berlin  <jberlin@apple.com>
 

trunk/Source/WebKit2/UIProcess/FindIndicator.cpp

@@ -149 +149 @@
         textRect.move(leftBorderThickness, topBorderThickness);
 
-        graphicsContext.save();
         FloatRect outerPathRect = inflateRect(textRect, horizontalOutsetToCenterOfLightBorder, verticalOutsetToCenterOfLightBorder);
-        graphicsContext.setShadow(FloatSize(shadowOffsetX, shadowOffsetY), shadowBlurRadius, shadowColor(), ColorSpaceSRGB);
-        graphicsContext.setFillColor(lightBorderColor(), ColorSpaceDeviceRGB);
-        graphicsContext.fillPath(pathWithRoundedRect(outerPathRect, cornerRadius));
-        graphicsContext.restore();
+        FloatRect innerPathRect = inflateRect(textRect, horizontalPaddingInsideLightBorder, verticalPaddingInsideLightBorder);
 
-        graphicsContext.save();
-        FloatRect innerPathRect = inflateRect(textRect, horizontalPaddingInsideLightBorder, verticalPaddingInsideLightBorder);
-        graphicsContext.clip(pathWithRoundedRect(innerPathRect, cornerRadius));
-        RefPtr<Gradient> gradient = Gradient::create(FloatPoint(innerPathRect.x(), innerPathRect.y()), FloatPoint(innerPathRect.x(), innerPathRect.maxY()));
-        gradient->addColorStop(0, gradientLightColor());
-        gradient->addColorStop(1, gradientDarkColor());
-        graphicsContext.setFillGradient(gradient);
-        graphicsContext.fillRect(outerPathRect);
-        graphicsContext.restore();
+        {
+            GraphicsContextStateSaver stateSaver(graphicsContext);
+            graphicsContext.setShadow(FloatSize(shadowOffsetX, shadowOffsetY), shadowBlurRadius, shadowColor(), ColorSpaceSRGB);
+            graphicsContext.setFillColor(lightBorderColor(), ColorSpaceDeviceRGB);
+            graphicsContext.fillPath(pathWithRoundedRect(outerPathRect, cornerRadius));
+        }
 
-        graphicsContext.save();
-        graphicsContext.translate(FloatSize(roundf(leftBorderThickness), roundf(topBorderThickness)));
-        m_contentImage->paint(graphicsContext, IntPoint(0, 0), m_contentImage->bounds());
-        graphicsContext.restore();
+        {
+            GraphicsContextStateSaver stateSaver(graphicsContext);
+            graphicsContext.clip(pathWithRoundedRect(innerPathRect, cornerRadius));
+            RefPtr<Gradient> gradient = Gradient::create(FloatPoint(innerPathRect.x(), innerPathRect.y()), FloatPoint(innerPathRect.x(), innerPathRect.maxY()));
+            gradient->addColorStop(0, gradientLightColor());
+            gradient->addColorStop(1, gradientDarkColor());
+            graphicsContext.setFillGradient(gradient);
+            graphicsContext.fillRect(outerPathRect);
+        }
+
+        {
+            GraphicsContextStateSaver stateSaver(graphicsContext);
+            graphicsContext.translate(FloatSize(roundf(leftBorderThickness), roundf(topBorderThickness)));
+            m_contentImage->paint(graphicsContext, IntPoint(0, 0), m_contentImage->bounds());
+        }
     }
 }

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

@@ -532 +532 @@
         // the document's window coordinates.
         IntPoint documentOriginInWindowCoordinates = parent()->contentsToWindow(IntPoint());
-        context->save();
+        
+        GraphicsContextStateSaver stateSaver(*context);
         context->translate(-documentOriginInWindowCoordinates.x(), -documentOriginInWindowCoordinates.y());
         m_plugin->paint(context, paintRectInWindowCoordinates);
-        context->restore();
     }
 }

trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp

@@ -300 +300 @@
     graphicsContext.fillRect(dirtyRect, overlayBackgroundColor(fractionFadedIn), ColorSpaceSRGB);
 
-    graphicsContext.save();
-    graphicsContext.setShadow(FloatSize(shadowOffsetX, shadowOffsetY), shadowBlurRadius, holeShadowColor(fractionFadedIn), ColorSpaceSRGB);
-
-    graphicsContext.setFillColor(holeFillColor(fractionFadedIn), ColorSpaceSRGB);
-
-    // Draw white frames around the holes.
-    for (size_t i = 0; i < rects.size(); ++i) {
-        IntRect whiteFrameRect = rects[i];
-        whiteFrameRect.inflate(1);
-
-        graphicsContext.fillRect(whiteFrameRect);
-    }
-
-    graphicsContext.restore();
+    {
+        GraphicsContextStateSaver stateSaver(graphicsContext);
+
+        graphicsContext.setShadow(FloatSize(shadowOffsetX, shadowOffsetY), shadowBlurRadius, holeShadowColor(fractionFadedIn), ColorSpaceSRGB);
+        graphicsContext.setFillColor(holeFillColor(fractionFadedIn), ColorSpaceSRGB);
+
+        // Draw white frames around the holes.
+        for (size_t i = 0; i < rects.size(); ++i) {
+            IntRect whiteFrameRect = rects[i];
+            whiteFrameRect.inflate(1);
+
+            graphicsContext.fillRect(whiteFrameRect);
+        }
+    }
 
     graphicsContext.setFillColor(Color::transparent, ColorSpaceSRGB);

trunk/Source/WebKit2/WebProcess/WebPage/PageOverlay.cpp

@@ -105 +105 @@
         return;
 
-    graphicsContext.save();
+    GraphicsContextStateSaver stateSaver(graphicsContext);
     graphicsContext.beginTransparencyLayer(1);
     graphicsContext.setCompositeOperation(CompositeCopy);
@@ -112 +112 @@
 
     graphicsContext.endTransparencyLayer();
-    graphicsContext.restore();
 }
     

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -642 +642 @@
 void WebPage::drawRect(GraphicsContext& graphicsContext, const IntRect& rect)
 {
-    graphicsContext.save();
+    GraphicsContextStateSaver stateSaver(graphicsContext);
     graphicsContext.clip(rect);
     m_mainFrame->coreFrame()->view()->paint(&graphicsContext, rect);
-    graphicsContext.restore();
 }
 
@@ -652 +651 @@
     ASSERT(m_pageOverlay);
 
-    graphicsContext.save();
+    GraphicsContextStateSaver stateSaver(graphicsContext);
     graphicsContext.clip(rect);
     m_pageOverlay->drawRect(graphicsContext, rect);
-    graphicsContext.restore();
 }