Title: [128196] trunk/Source
Revision
128196
Author
commit-qu...@webkit.org
Date
2012-09-11 09:44:34 -0700 (Tue, 11 Sep 2012)

Log Message

Fix FilterTypeZoom to properly call canvas->restore()
https://bugs.webkit.org/show_bug.cgi?id=96082

Patch by Zach Kuznia <z...@chromium.org> on 2012-09-11
Reviewed by Adrienne Walker.

Source/Platform:

Fix zoom filter to properly indicate that it affects pixels.

* chromium/src/WebFilterOperations.cpp:
(WebKit::WebFilterOperations::hasFilterThatMovesPixels):
(WebKit::WebFilterOperations::hasFilterThatAffectsOpacity):

Source/WebCore:

Fix zoom filter to properly call canvas->restore()

* platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp:
(WebCore::CCRenderSurfaceFilters::apply):

Modified Paths

Diff

Modified: trunk/Source/Platform/ChangeLog (128195 => 128196)


--- trunk/Source/Platform/ChangeLog	2012-09-11 16:42:11 UTC (rev 128195)
+++ trunk/Source/Platform/ChangeLog	2012-09-11 16:44:34 UTC (rev 128196)
@@ -1,3 +1,16 @@
+2012-09-11  Zach Kuznia  <z...@chromium.org>
+
+        Fix FilterTypeZoom to properly call canvas->restore()
+        https://bugs.webkit.org/show_bug.cgi?id=96082
+
+        Reviewed by Adrienne Walker.
+
+        Fix zoom filter to properly indicate that it affects pixels.
+
+        * chromium/src/WebFilterOperations.cpp:
+        (WebKit::WebFilterOperations::hasFilterThatMovesPixels):
+        (WebKit::WebFilterOperations::hasFilterThatAffectsOpacity):
+
 2012-09-11  Tommy Widenflycht  <tom...@google.com>
 
         MediaStream API: add RTCPeerConnection::onnegotiationneeded

Modified: trunk/Source/Platform/chromium/src/WebFilterOperations.cpp (128195 => 128196)


--- trunk/Source/Platform/chromium/src/WebFilterOperations.cpp	2012-09-11 16:42:11 UTC (rev 128195)
+++ trunk/Source/Platform/chromium/src/WebFilterOperations.cpp	2012-09-11 16:44:34 UTC (rev 128196)
@@ -116,6 +116,7 @@
         switch (op.type()) {
         case WebFilterOperation::FilterTypeBlur:
         case WebFilterOperation::FilterTypeDropShadow:
+        case WebFilterOperation::FilterTypeZoom:
             return true;
         default:
             break;
@@ -132,6 +133,7 @@
         case WebFilterOperation::FilterTypeOpacity:
         case WebFilterOperation::FilterTypeBlur:
         case WebFilterOperation::FilterTypeDropShadow:
+        case WebFilterOperation::FilterTypeZoom:
             return true;
         case WebFilterOperation::FilterTypeColorMatrix: {
             const SkScalar* matrix = op.matrix();

Modified: trunk/Source/WebCore/ChangeLog (128195 => 128196)


--- trunk/Source/WebCore/ChangeLog	2012-09-11 16:42:11 UTC (rev 128195)
+++ trunk/Source/WebCore/ChangeLog	2012-09-11 16:44:34 UTC (rev 128196)
@@ -1,3 +1,15 @@
+2012-09-11  Zach Kuznia  <z...@chromium.org>
+
+        Fix FilterTypeZoom to properly call canvas->restore()
+        https://bugs.webkit.org/show_bug.cgi?id=96082
+
+        Reviewed by Adrienne Walker.
+
+        Fix zoom filter to properly call canvas->restore()
+
+        * platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp:
+        (WebCore::CCRenderSurfaceFilters::apply):
+
 2012-09-11  Sergio Villar Senin  <svil...@igalia.com>
 
         [GTK] WebKitGtk+ crashes with non-UTF8 HTTP header names

Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp (128195 => 128196)


--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp	2012-09-11 16:42:11 UTC (rev 128195)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp	2012-09-11 16:44:34 UTC (rev 128196)
@@ -441,6 +441,7 @@
             paint.setImageFilter(zoomFilter.get());
             canvas->saveLayer(0, &paint);
             canvas->drawBitmap(state.source(), 0, 0);
+            canvas->restore();
             break;
         }
         case WebKit::WebFilterOperation::FilterTypeBrightness:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to