Changeset 138987 in webkit

Timestamp:

Jan 7, 2013 2:05:33 PM (11 years ago)

Author:

alokp@chromium.org

Message:

[chromium] Fix PlatformContextSkia::setDrawingToImageBuffer abuse
​https://bugs.webkit.org/show_bug.cgi?id=104956

Reviewed by James Robinson.

Replaced PlatformContextSkia::SetDrawingToImageBuffer with GraphicsContext::setShouldSmoothFonts.

Source/WebCore:

No new tests needed. No change in functionality.

• platform/graphics/chromium/CompositorHUDFontAtlas.cpp:

(WebCore::CompositorHUDFontAtlas::generateFontAtlas):

• platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate.cpp:

(WebCore::OpaqueRectTrackingContentLayerDelegate::paintContents):

• platform/graphics/skia/ImageBufferSkia.cpp:

(WebCore::ImageBuffer::ImageBuffer):

• platform/graphics/skia/PlatformContextSkia.cpp:

(WebCore::PlatformContextSkia::couldUseLCDRenderedText):
(WebCore):

Source/WebKit/chromium:

• src/NonCompositedContentHost.cpp:

(WebKit::NonCompositedContentHost::paintContents):
(WebKit):
(WebKit::NonCompositedContentHost::setShowDebugBorders):

• src/PageWidgetDelegate.cpp:

(WebKit::PageWidgetDelegate::paint):

• src/WebFontImpl.cpp:

(WebKit::WebFontImpl::drawText):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/chromium/CompositorHUDFontAtlas.cpp (modified) (1 diff)
• WebCore/platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate.cpp (modified) (1 diff)
• WebCore/platform/graphics/skia/ImageBufferSkia.cpp (modified) (2 diffs)
• WebCore/platform/graphics/skia/PlatformContextSkia.cpp (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/NonCompositedContentHost.cpp (modified) (1 diff)
• WebKit/chromium/src/PageWidgetDelegate.cpp (modified) (1 diff)
• WebKit/chromium/src/WebFontImpl.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-07  Alok Priyadarshi  <alokp@chromium.org>
+
+        [chromium] Fix PlatformContextSkia::setDrawingToImageBuffer abuse
+        https://bugs.webkit.org/show_bug.cgi?id=104956
+
+        Reviewed by James Robinson.
+
+        Replaced PlatformContextSkia::SetDrawingToImageBuffer with GraphicsContext::setShouldSmoothFonts.
+
+        No new tests needed. No change in functionality.
+
+        * platform/graphics/chromium/CompositorHUDFontAtlas.cpp:
+        (WebCore::CompositorHUDFontAtlas::generateFontAtlas):
+        * platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate.cpp:
+        (WebCore::OpaqueRectTrackingContentLayerDelegate::paintContents):
+        * platform/graphics/skia/ImageBufferSkia.cpp:
+        (WebCore::ImageBuffer::ImageBuffer):
+        * platform/graphics/skia/PlatformContextSkia.cpp:
+        (WebCore::PlatformContextSkia::couldUseLCDRenderedText):
+        (WebCore):
+
 2013-01-07  Enrica Casucci  <enrica@apple.com>
 

trunk/Source/WebCore/platform/graphics/chromium/CompositorHUDFontAtlas.cpp

@@ -61 +61 @@
 
     PlatformContextSkia platformContext(canvas.get());
-    platformContext.setDrawingToImageBuffer(true);
     GraphicsContext atlasContext(&platformContext);
+    atlasContext.setShouldSmoothFonts(false);
 
     // Clear the entire texture atlas to transparent before drawing fonts.

trunk/Source/WebCore/platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate.cpp

@@ -58 +58 @@
 #endif
     platformContext.setTrackOpaqueRegion(!m_opaque);
-    // FIXME: Rename PlatformContextSkia::setDrawingToImageBuffer to setCanPaintLCDText.
-    // I also suspect that a function on PlatformContextSkia is not really needed.
-    // GraphicsContext::setAllowsFontSmoothing can be used for this purpose.
-    platformContext.setDrawingToImageBuffer(!(canPaintLCDText && m_opaque));
     GraphicsContext context(&platformContext);
+    context.setShouldSmoothFonts(canPaintLCDText && m_opaque);
 
     // Record transform prior to painting, as all opaque tracking will be

trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp

@@ -139 +139 @@
     m_data.m_platformContext.setCanvas(m_data.m_canvas.get());
     m_context = adoptPtr(new GraphicsContext(&m_data.m_platformContext));
-    m_context->platformContext()->setDrawingToImageBuffer(true);
+    m_context->setShouldSmoothFonts(false);
     m_context->scale(FloatSize(m_resolutionScale, m_resolutionScale));
 
@@ -169 +169 @@
     m_data.m_platformContext.setCanvas(m_data.m_canvas.get());
     m_context = adoptPtr(new GraphicsContext(&m_data.m_platformContext));
-    m_context->platformContext()->setDrawingToImageBuffer(true);
+    m_context->setShouldSmoothFonts(false);
     m_context->scale(FloatSize(m_resolutionScale, m_resolutionScale));
 

trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp

@@ -630 +630 @@
         return false;
 
-    // If this text is not in an image buffer and so won't be externally
-    // composited, then subpixel antialiasing is fine.
-    return !isDrawingToImageBuffer();
+    return m_gc->shouldSmoothFonts();
 }
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-01-07  Alok Priyadarshi  <alokp@chromium.org>
+
+        [chromium] Fix PlatformContextSkia::setDrawingToImageBuffer abuse
+        https://bugs.webkit.org/show_bug.cgi?id=104956
+
+        Reviewed by James Robinson.
+
+        Replaced PlatformContextSkia::SetDrawingToImageBuffer with GraphicsContext::setShouldSmoothFonts.
+
+        * src/NonCompositedContentHost.cpp:
+        (WebKit::NonCompositedContentHost::paintContents):
+        (WebKit):
+        (WebKit::NonCompositedContentHost::setShowDebugBorders):
+        * src/PageWidgetDelegate.cpp:
+        (WebKit::PageWidgetDelegate::paint):
+        * src/WebFontImpl.cpp:
+        (WebKit::WebFontImpl::drawText):
+
 2013-01-07  Mike West  <mkwst@chromium.org>
 

trunk/Source/WebKit/chromium/src/NonCompositedContentHost.cpp

@@ -173 +173 @@
 void NonCompositedContentHost::paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext& context, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& clipRect)
 {
-    // FIXME: Remove LCD text setting after it is implemented in chromium.
-    // On non-android platforms, we want to render text with subpixel antialiasing on the root layer
-    // so long as the root is opaque. On android all text is grayscale.
-#if !OS(ANDROID)
-    if (m_graphicsLayer->contentsOpaque())
-        context.platformContext()->setDrawingToImageBuffer(false);
-#endif
     context.translate(-m_layerAdjust);
     WebCore::IntRect adjustedClipRect = clipRect;

trunk/Source/WebKit/chromium/src/PageWidgetDelegate.cpp

@@ -88 +88 @@
     GraphicsContextBuilder builder(canvas);
     GraphicsContext& gc = builder.context();
-    gc.platformContext()->setDrawingToImageBuffer(background == Opaque ? false : true);
+    gc.setShouldSmoothFonts(background == Opaque);
     if (applyDeviceScale) {
         gc.applyDeviceScaleFactor(page->deviceScaleFactor());

trunk/Source/WebKit/chromium/src/WebFontImpl.cpp

@@ -99 +99 @@
     GraphicsContext& gc = builder.context();
 
-    gc.platformContext()->setDrawingToImageBuffer(!canvasIsOpaque);
-
     gc.save();
+    gc.setShouldSmoothFonts(canvasIsOpaque);
     gc.setFillColor(color, ColorSpaceDeviceRGB);
     gc.clip(WebCore::FloatRect(clip));