Changeset 155683 in webkit

Timestamp:

Sep 13, 2013 3:08:36 AM (11 years ago)

Author:

timothy_horton@apple.com

Message:

REGRESSION (r155615): Lots of reftests fail with single line or single pixel differences
​https://bugs.webkit.org/show_bug.cgi?id=121245

Reviewed by Darin Adler.

Similar to ​https://bugs.webkit.org/show_bug.cgi?id=120963,
we need to manually ensure that some pieces of persistent
CoreGraphics state are restored after PDFKit changes them.

In this case, we bookend our restoration around the various
_recursiveDisplay... functions that we also use in WebHTMLView.

• WebView/WebPDFView.mm:

(-[WebPDFView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:]):
(-[WebPDFView _recursiveDisplayAllDirtyWithLockFocus:visRect:]):
(-[WebPDFView _recursive:displayRectIgnoringOpacity:inContext:topView:]):
(-[WebPDFView _recursive:displayRectIgnoringOpacity:inGraphicsContext:CGContext:topView:shouldChangeFontReferenceColor:]):

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebPDFView.mm (modified) (3 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2013-09-13  Tim Horton  <timothy_horton@apple.com>
+
+        REGRESSION (r155615): Lots of reftests fail with single line or single pixel differences
+        https://bugs.webkit.org/show_bug.cgi?id=121245
+
+        Reviewed by Darin Adler.
+
+        Similar to https://bugs.webkit.org/show_bug.cgi?id=120963,
+        we need to manually ensure that some pieces of persistent
+        CoreGraphics state are restored after PDFKit changes them.
+
+        In this case, we bookend our restoration around the various
+        _recursiveDisplay... functions that we also use in WebHTMLView.
+
+        * WebView/WebPDFView.mm:
+        (-[WebPDFView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:]):
+        (-[WebPDFView _recursiveDisplayAllDirtyWithLockFocus:visRect:]):
+        (-[WebPDFView _recursive:displayRectIgnoringOpacity:inContext:topView:]):
+        (-[WebPDFView _recursive:displayRectIgnoringOpacity:inGraphicsContext:CGContext:topView:shouldChangeFontReferenceColor:]):
+
 2013-09-12  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebPDFView.mm

@@ -66 +66 @@
 #import <wtf/CurrentTime.h>
 
+#ifdef __has_include
+#if __has_include(<ApplicationServices/ApplicationServicesPriv.h>)
+#import <ApplicationServices/ApplicationServicesPriv.h>
+#endif
+#endif
+
+extern "C" {
+    bool CGContextGetAllowsFontSmoothing(CGContextRef context);
+    bool CGContextGetAllowsFontSubpixelQuantization(CGContextRef context);
+}
+
 using namespace WebCore;
 
@@ -101 +112 @@
 @end;
 
+@interface NSView (Details)
+- (void)_recursiveDisplayRectIfNeededIgnoringOpacity:(NSRect)rect isVisibleRect:(BOOL)isVisibleRect rectIsVisibleRectForView:(NSView *)visibleView topView:(BOOL)topView;
+- (void)_recursiveDisplayAllDirtyWithLockFocus:(BOOL)needsLockFocus visRect:(NSRect)visRect;
+- (void)_recursive:(BOOL)recurse displayRectIgnoringOpacity:(NSRect)displayRect inContext:(NSGraphicsContext *)context topView:(BOOL)topView;
+- (void)_recursive:(BOOL)recurseX displayRectIgnoringOpacity:(NSRect)displayRect inGraphicsContext:(NSGraphicsContext *)graphicsContext CGContext:(CGContextRef)ctx topView:(BOOL)isTopView shouldChangeFontReferenceColor:(BOOL)shouldChangeFontReferenceColor;
+@end
+
 // WebPDFPrefUpdatingProxy is a class that forwards everything it gets to a target and updates the PDF viewing prefs
 // after each of those messages.  We use it as a way to hook all the places that the PDF viewing attrs change.
@@ -345 +363 @@
     
     return self;
+}
+
+// These states can be mutated by PDFKit but are not saved
+// on the context's state stack. (<rdar://problem/14951759>)
+
+- (void)_recursiveDisplayRectIfNeededIgnoringOpacity:(NSRect)rect isVisibleRect:(BOOL)isVisibleRect rectIsVisibleRectForView:(NSView *)visibleView topView:(BOOL)topView
+{
+    CGContextRef context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
+    
+    bool allowsSmoothing = CGContextGetAllowsFontSmoothing(context);
+    bool allowsSubpixelQuantization = CGContextGetAllowsFontSubpixelQuantization(context);
+    
+    [super _recursiveDisplayRectIfNeededIgnoringOpacity:rect isVisibleRect:isVisibleRect rectIsVisibleRectForView:visibleView topView:topView];
+    
+    CGContextSetAllowsFontSmoothing(context, allowsSmoothing);
+    CGContextSetAllowsFontSubpixelQuantization(context, allowsSubpixelQuantization);
+}
+
+- (void)_recursiveDisplayAllDirtyWithLockFocus:(BOOL)needsLockFocus visRect:(NSRect)visRect
+{
+    CGContextRef context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
+    
+    bool allowsSmoothing = CGContextGetAllowsFontSmoothing(context);
+    bool allowsSubpixelQuantization = CGContextGetAllowsFontSubpixelQuantization(context);
+    
+    [super _recursiveDisplayAllDirtyWithLockFocus:needsLockFocus visRect:visRect];
+    
+    CGContextSetAllowsFontSmoothing(context, allowsSmoothing);
+    CGContextSetAllowsFontSubpixelQuantization(context, allowsSubpixelQuantization);
+}
+
+- (void)_recursive:(BOOL)recurse displayRectIgnoringOpacity:(NSRect)displayRect inContext:(NSGraphicsContext *)graphicsContext topView:(BOOL)topView
+{
+    CGContextRef context = (CGContextRef)[graphicsContext graphicsPort];
+    
+    bool allowsSmoothing = CGContextGetAllowsFontSmoothing(context);
+    bool allowsSubpixelQuantization = CGContextGetAllowsFontSubpixelQuantization(context);
+    
+    [super _recursive:recurse displayRectIgnoringOpacity:displayRect inContext:graphicsContext topView:topView];
+    
+    CGContextSetAllowsFontSmoothing(context, allowsSmoothing);
+    CGContextSetAllowsFontSubpixelQuantization(context, allowsSubpixelQuantization);
+}
+
+- (void)_recursive:(BOOL)recurseX displayRectIgnoringOpacity:(NSRect)displayRect inGraphicsContext:(NSGraphicsContext *)graphicsContext CGContext:(CGContextRef)context topView:(BOOL)isTopView shouldChangeFontReferenceColor:(BOOL)shouldChangeFontReferenceColor
+{
+    bool allowsSmoothing = CGContextGetAllowsFontSmoothing(context);
+    bool allowsSubpixelQuantization = CGContextGetAllowsFontSubpixelQuantization(context);
+    
+    [super _recursive:recurseX displayRectIgnoringOpacity:displayRect inGraphicsContext:graphicsContext CGContext:context topView:isTopView shouldChangeFontReferenceColor:shouldChangeFontReferenceColor];
+    
+    CGContextSetAllowsFontSmoothing(context, allowsSmoothing);
+    CGContextSetAllowsFontSubpixelQuantization(context, allowsSubpixelQuantization);
 }