<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"

"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

<html xmlns="http://www.w3.org/1999/xhtml">

<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />

<title>[191489] trunk/Source/WebCore</title>

</head>

<body>

<style type="text/css"><!--

#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }

#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }

#msg dt:after { content:':';}

#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }

#msg dl a { font-weight: bold}

#msg dl a:link    { color:#fc3; }

#msg dl a:active  { color:#ff0; }

#msg dl a:visited { color:#cc6; }

h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }

#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }

#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }

#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }

#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }

#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }

#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }

#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }

#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }

#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }

#logmsg pre { background: #eee; padding: 1em; }

#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}

#logmsg dl { margin: 0; }

#logmsg dt { font-weight: bold; }

#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }

#logmsg dd:before { content:'\00bb';}

#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }

#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }

#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }

#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }

#logmsg table th.Corner { text-align: left; }

#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }

#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }

#patch { width: 100%; }

#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}

#patch .propset h4, #patch .binary h4 {margin:0;}

#patch pre {padding:0;line-height:1.2em;margin:0;}

#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}

#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}

#patch span {display:block;padding:0 10px;}

#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}

#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}

#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}

#patch .lines, .info {color:#888;background:#fff;}

--></style>

<div id="msg">

<dl class="meta">

<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/191489">191489</a></dd>

<dt>Author</dt> <dd>mmaxfield@apple.com</dd>

<dt>Date</dt> <dd>2015-10-22 19:53:03 -0700 (Thu, 22 Oct 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>[OS X] Migrate GraphicsContext::drawLineForDocumentMarker() away from LocalCurrentGraphicsContext

https://bugs.webkit.org/show_bug.cgi?id=150483

Reviewed by Simon Fraser.

LocalCurrentGraphicsContext is an ugly hack to work around the problem that many NS* functions

operate on the current context rather than a context passed as an argument. This patch

migrates from NSRectFillUsingOperation() which has this behavior to CGContextDrawTiledImage()

which performs the same operation but with a passed-in CGContextRef. An added benefit is that

we don't have to mess around with pattern-based NSColors.

No new tests because there is no behavior change.

* platform/graphics/mac/GraphicsContextMac.mm:

(WebCore::findImage):

(WebCore::GraphicsContext::updateDocumentMarkerResources):

(WebCore::GraphicsContext::drawLineForDocumentMarker):

(WebCore::makePatternColor): Deleted.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoreplatformgraphicsmacGraphicsContextMacmm">trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191488 => 191489)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-10-23 01:10:27 UTC (rev 191488)

+++ trunk/Source/WebCore/ChangeLog        2015-10-23 02:53:03 UTC (rev 191489)

</span><span class="lines">@@ -1,3 +1,24 @@

</span><ins>+2015-10-22  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;

+

+        [OS X] Migrate GraphicsContext::drawLineForDocumentMarker() away from LocalCurrentGraphicsContext

+        https://bugs.webkit.org/show_bug.cgi?id=150483

+

+        Reviewed by Simon Fraser.

+

+        LocalCurrentGraphicsContext is an ugly hack to work around the problem that many NS* functions

+        operate on the current context rather than a context passed as an argument. This patch

+        migrates from NSRectFillUsingOperation() which has this behavior to CGContextDrawTiledImage()

+        which performs the same operation but with a passed-in CGContextRef. An added benefit is that

+        we don't have to mess around with pattern-based NSColors. 

+

+        No new tests because there is no behavior change.

+

+        * platform/graphics/mac/GraphicsContextMac.mm:

+        (WebCore::findImage):

+        (WebCore::GraphicsContext::updateDocumentMarkerResources):

+        (WebCore::GraphicsContext::drawLineForDocumentMarker):

+        (WebCore::makePatternColor): Deleted.

+

</ins><span class="cx"> 2015-10-22  Sam Weinig  &lt;sam@webkit.org&gt;

</span><span class="cx"> 

</span><span class="cx">         Navigations on the same host (but with different schemes and ports) should not trigger universal links

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformgraphicsmacGraphicsContextMacmm"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm (191488 => 191489)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm        2015-10-23 01:10:27 UTC (rev 191488)

+++ trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm        2015-10-23 02:53:03 UTC (rev 191489)

</span><span class="lines">@@ -116,7 +116,7 @@

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> #if !PLATFORM(IOS)

</span><del>-static NSColor* makePatternColor(NSString* firstChoiceName, NSString* secondChoiceName, NSColor* defaultColor, bool&amp; usingDot)

</del><ins>+static NSImage *findImage(NSString* firstChoiceName, NSString* secondChoiceName, bool&amp; usingDot)

</ins><span class="cx"> {

</span><span class="cx">     // Eventually we should be able to get rid of the secondChoiceName. For the time being we need both to keep

<span class="cx">     // this working on all platforms.

</span><span class="lines">@@ -124,12 +124,8 @@

</span><span class="cx">     if (!image)

</span><span class="cx">         image = [NSImage imageNamed:secondChoiceName];

</span><span class="cx">     ASSERT(image); // if image is not available, we want to know

</span><del>-    NSColor *color = (image ? [NSColor colorWithPatternImage:image] : nil);

-    if (color)

-        usingDot = true;

-    else

-        color = defaultColor;

-    return color;

</del><ins>+    usingDot = image;

+    return image;

</ins><span class="cx"> }

</span><span class="cx"> #else

</span><span class="cx"> static RetainPtr&lt;CGPatternRef&gt; createDotPattern(bool&amp; usingDot, const char* resourceName)

</span><span class="lines">@@ -141,18 +137,18 @@

</span><span class="cx"> }

</span><span class="cx"> #endif // !PLATFORM(IOS)

</span><span class="cx"> 

</span><del>-static NSColor *spellingPatternColor = nullptr;

-static NSColor *grammarPatternColor = nullptr;

-static NSColor *correctionPatternColor = nullptr;

</del><ins>+static NSImage *spellingImage = nullptr;

+static NSImage *grammarImage = nullptr;

+static NSImage *correctionImage = nullptr;

</ins><span class="cx"> 

</span><span class="cx"> void GraphicsContext::updateDocumentMarkerResources()

</span><span class="cx"> {

</span><del>-    [spellingPatternColor release];

-    spellingPatternColor = nullptr;

-    [grammarPatternColor release];

-    grammarPatternColor = nullptr;

-    [correctionPatternColor release];

-    correctionPatternColor = nullptr;

</del><ins>+    [spellingImage release];

+    spellingImage = nullptr;

+    [grammarImage release];

+    grammarImage = nullptr;

+    [correctionImage release];

+    correctionImage = nullptr;

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> static inline void setPatternPhaseInUserSpace(CGContextRef context, CGPoint phasePoint)

</span><span class="lines">@@ -175,7 +171,8 @@

</span><span class="cx"> 

</span><span class="cx">     bool usingDot;

</span><span class="cx"> #if !PLATFORM(IOS)

</span><del>-    NSColor *patternColor;

</del><ins>+    NSImage *image;

+    NSColor *fallbackColor;

</ins><span class="cx"> #else

</span><span class="cx">     CGPatternRef dotPattern;

</span><span class="cx"> #endif

</span><span class="lines">@@ -185,9 +182,10 @@

<span class="cx">             // Constants for spelling pattern color.

</span><span class="cx">             static bool usingDotForSpelling = false;

</span><span class="cx"> #if !PLATFORM(IOS)

</span><del>-            if (!spellingPatternColor)

-                spellingPatternColor = [makePatternColor(@&quot;NSSpellingDot&quot;, @&quot;SpellingDot&quot;, [NSColor redColor], usingDotForSpelling) retain];

-            patternColor = spellingPatternColor;

</del><ins>+            if (!spellingImage)

+                spellingImage = [findImage(@&quot;NSSpellingDot&quot;, @&quot;SpellingDot&quot;, usingDotForSpelling) retain];

+            image = spellingImage;

+            fallbackColor = [NSColor redColor];

</ins><span class="cx"> #else

</span><span class="cx">             static CGPatternRef spellingPattern = createDotPattern(usingDotForSpelling, &quot;SpellingDot&quot;).leakRef();

</span><span class="cx">             dotPattern = spellingPattern;

</span><span class="lines">@@ -200,10 +198,11 @@

</span><span class="cx"> #if !PLATFORM(IOS)

<span class="cx">             // Constants for grammar pattern color.

</span><span class="cx">             static bool usingDotForGrammar = false;

</span><del>-            if (!grammarPatternColor)

-                grammarPatternColor = [makePatternColor(@&quot;NSGrammarDot&quot;, @&quot;GrammarDot&quot;, [NSColor greenColor], usingDotForGrammar) retain];

-            usingDot = usingDotForGrammar;

-            patternColor = grammarPatternColor;

</del><ins>+            if (!grammarImage)

+                grammarImage = [findImage(@&quot;NSGrammarDot&quot;, @&quot;GrammarDot&quot;, usingDotForGrammar) retain];

+            usingDot = grammarImage;

+            image = grammarImage;

+            fallbackColor = [NSColor greenColor];

</ins><span class="cx">             break;

</span><span class="cx"> #else

</span><span class="cx">             ASSERT_NOT_REACHED();

</span><span class="lines">@@ -217,10 +216,11 @@

</span><span class="cx">         {

<span class="cx">             // Constants for spelling pattern color.

</span><span class="cx">             static bool usingDotForSpelling = false;

</span><del>-            if (!correctionPatternColor)

-                correctionPatternColor = [makePatternColor(@&quot;NSCorrectionDot&quot;, @&quot;CorrectionDot&quot;, [NSColor blueColor], usingDotForSpelling) retain];

</del><ins>+            if (!correctionImage)

+                correctionImage = [findImage(@&quot;NSCorrectionDot&quot;, @&quot;CorrectionDot&quot;, usingDotForSpelling) retain];

</ins><span class="cx">             usingDot = usingDotForSpelling;

</span><del>-            patternColor = correctionPatternColor;

</del><ins>+            image = correctionImage;

+            fallbackColor = [NSColor blueColor];

</ins><span class="cx">             break;

</span><span class="cx">         }

</span><span class="cx"> #endif

</span><span class="lines">@@ -263,27 +263,30 @@

<span class="cx">     // for transforms.

</span><span class="cx"> 

<span class="cx">     // Draw underline.

</span><del>-#if !PLATFORM(IOS)

-    LocalCurrentGraphicsContext localContext(*this);

-    NSGraphicsContext *currentContext = [NSGraphicsContext currentContext];

-    CGContextRef context = (CGContextRef)[currentContext graphicsPort];

-#else

</del><span class="cx">     CGContextRef context = platformContext();

</span><del>-#endif

</del><span class="cx">     CGContextSaveGState(context);

</span><span class="cx"> 

</span><del>-#if !PLATFORM(IOS)

-    [patternColor set];

-#else

</del><ins>+#if PLATFORM(IOS)

</ins><span class="cx">     WKSetPattern(context, dotPattern, YES, YES);

</span><span class="cx"> #endif

</span><span class="cx"> 

</span><span class="cx">     setPatternPhaseInUserSpace(context, offsetPoint);

</span><span class="cx"> 

</span><ins>+    CGRect destinationRect = CGRectMake(offsetPoint.x(), offsetPoint.y(), width, patternHeight);

</ins><span class="cx"> #if !PLATFORM(IOS)

</span><del>-    NSRectFillUsingOperation(NSMakeRect(offsetPoint.x(), offsetPoint.y(), width, patternHeight), NSCompositeSourceOver);

</del><ins>+    if (image) {

+        // FIXME: Rather than getting the NSImage and then picking the CGImage from it, we should do what iOS does and

+        // just load the CGImage in the first place.

+        NSRect dotRect = NSMakeRect(offsetPoint.x(), offsetPoint.y(), patternWidth, patternHeight);

+        CGImageRef cgImage = [image CGImageForProposedRect:&amp;dotRect context:[NSGraphicsContext graphicsContextWithGraphicsPort:context flipped:YES] hints:nullptr];

+        CGContextClipToRect(context, destinationRect);

+        CGContextDrawTiledImage(context, NSRectToCGRect(dotRect), cgImage);

+    } else {

+        CGContextSetFillColorWithColor(context, [fallbackColor CGColor]);

+        CGContextFillRect(context, destinationRect);

+    }

</ins><span class="cx"> #else

</span><del>-    WKRectFillUsingOperation(context, CGRectMake(offsetPoint.x(), offsetPoint.y(), width, patternHeight), kCGCompositeSover);

</del><ins>+    WKRectFillUsingOperation(context, destinationRect, kCGCompositeSover);

</ins><span class="cx"> #endif

</span><span class="cx">     

</span><span class="cx">     CGContextRestoreGState(context);

</span></span></pre>

</div>

</div>

</body>

</html>