WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/platform/graphics/mac/WebLayer.mm

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 36 matching lines @@
     if (layerContents && layerContents->client()) {
         [NSGraphicsContext saveGraphicsState];
 
         // Set up an NSGraphicsContext for the context, so that parts of AppKit that rely on
         // the current NSGraphicsContext (e.g. NSCell drawing) get the right one.
         NSGraphicsContext* layerContext = [NSGraphicsContext graphicsContextWithGraphicsPort:context flipped:YES];
         [NSGraphicsContext setCurrentContext:layerContext];
 
         GraphicsContext graphicsContext(context);
 
-        // When drawing into CALayers, we need to turn off font smoothing (aka LCD antialiasing).
-        bool wasSmoothing = graphicsContext.usingFontSmoothing();
-        graphicsContext.setUseFontSmoothing(false);
-
         // It's important to get the clip from the context, because it may be significantly
         // smaller than the layer bounds (e.g. tiled layers)
         CGRect clipBounds = CGContextGetClipBoundingBox(context);
         IntRect clip(enclosingIntRect(clipBounds));
         layerContents->paintGraphicsLayerContents(graphicsContext, clip);
 
-        graphicsContext.setUseFontSmoothing(wasSmoothing);
-
         [NSGraphicsContext restoreGraphicsState];
     }
 #ifndef NDEBUG
     else {
         ASSERT_NOT_REACHED();
 
         // FIXME: ideally we'd avoid calling -setNeedsDisplay on a layer that is a plain color,
         // so CA never makes backing store for it (which is what -setNeedsDisplay will do above).
         CGContextSetRGBFillColor(context, 0.0f, 1.0f, 0.0f, 1.0f);
         CGRect aBounds = [layer bounds];
@@ skipping 137 matching lines @@
 - (NSString*)extendedDescription
 {
     return [self _descriptionWithPrefix:@""];
 }
 
 @end  // implementation WebLayer(ExtendedDescription)
 
 #endif // NDEBUG
 
 #endif // USE(ACCELERATED_COMPOSITING)