Changeset 270000 in webkit


Ignore:
Timestamp:
Nov 18, 2020 4:27:51 PM (3 years ago)
Author:
timothy_horton@apple.com
Message:

REGRESSION (r269895): Google Maps expanded route options are missing background color
https://bugs.webkit.org/show_bug.cgi?id=219119
<rdar://problem/71510412>

Reviewed by Said Abou-Hallawa.

No new tests, yet. Test is pending.

  • platform/graphics/cg/GraphicsContextCG.cpp:

(WebCore::GraphicsContext::drawPlatformImage):
r199071 removed the state save/restore around the CG implementation of
drawNativeImage, explicitly saving and restoring the few things it knew
that the implementation would change. However, it failed to save/restore
the composite operator.

This was mostly not a problem, because e.g. canvas always hands down the
global op. However, in r269895, I added code that passes in a /different/
compositing operator, and it gets stuck on the context.

Save and restore the composite operator and blend mode like we do for other properties.

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r269999 r270000  
     12020-11-18  Tim Horton  <timothy_horton@apple.com>
     2
     3        REGRESSION (r269895): Google Maps expanded route options are missing background color
     4        https://bugs.webkit.org/show_bug.cgi?id=219119
     5        <rdar://problem/71510412>
     6
     7        Reviewed by Said Abou-Hallawa.
     8
     9        No new tests, yet. Test is pending.
     10
     11        * platform/graphics/cg/GraphicsContextCG.cpp:
     12        (WebCore::GraphicsContext::drawPlatformImage):
     13        r199071 removed the state save/restore around the CG implementation of
     14        drawNativeImage, explicitly saving and restoring the few things it knew
     15        that the implementation would change. However, it failed to save/restore
     16        the composite operator.
     17
     18        This was mostly not a problem, because e.g. canvas always hands down the
     19        global op. However, in r269895, I added code that passes in a /different/
     20        compositing operator, and it gets stuck on the context.
     21
     22        Save and restore the composite operator and blend mode like we do for other properties.
     23
    1242020-11-18  Aditya Keerthi  <akeerthi@apple.com>
    225
  • trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp

    r269753 r270000  
    366366#endif
    367367
     368    auto oldCompositeOperator = compositeOperation();
     369    auto oldBlendMode = blendModeOperation();
    368370    setPlatformCompositeOperation(options.compositeOperator(), options.blendMode());
    369371
     
    393395        CGContextSetShouldAntialias(context, wasAntialiased);
    394396#endif
     397        setPlatformCompositeOperation(oldCompositeOperator, oldBlendMode);
    395398    }
    396399
Note: See TracChangeset for help on using the changeset viewer.