<!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>[191466] trunk/Source</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/191466">191466</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-10-22 12:50:09 -0700 (Thu, 22 Oct 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Cocoa] Migrate WKSetPatternPhaseInUserSpace() and WKGetUserToBaseCTM() from WKSI
https://bugs.webkit.org/show_bug.cgi?id=150460

Reviewed by Tim Horton.

Source/WebCore:

No reason to use WKSI for these calls.

No new tests because there is no behavior change.

* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::GraphicsContext::applyStrokePattern):
(WebCore::GraphicsContext::applyFillPattern):
(WebCore::GraphicsContext::setPlatformShadow):
* platform/graphics/cg/GraphicsContextCG.h:
(WebCore::getUserToBaseCTM):
* platform/graphics/cg/ImageBufferCG.cpp:
(WebCore::ImageBuffer::putByteArray):
* platform/graphics/mac/GraphicsContextMac.mm:
(WebCore::setPatternPhaseInUserSpace):
(WebCore::GraphicsContext::drawLineForDocumentMarker):
* platform/ios/WebCoreSystemInterfaceIOS.mm:
* platform/mac/WebCoreSystemInterface.h:
* platform/mac/WebCoreSystemInterface.mm:

Source/WebKit/mac:

* WebCoreSupport/WebSystemInterface.mm:
(InitWebCoreSystemInterface): Deleted.

Source/WebKit2:

* WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
(InitWebCoreSystemInterface): Deleted.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp">trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgGraphicsContextCGh">trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacGraphicsContextMacmm">trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebCoreSystemInterfaceIOSmm">trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh">trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreSystemInterfacemm">trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebSystemInterfacemm">trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191465 => 191466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-10-22 19:10:15 UTC (rev 191465)
+++ trunk/Source/WebCore/ChangeLog        2015-10-22 19:50:09 UTC (rev 191466)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-10-22  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        [Cocoa] Migrate WKSetPatternPhaseInUserSpace() and WKGetUserToBaseCTM() from WKSI
+        https://bugs.webkit.org/show_bug.cgi?id=150460
+
+        Reviewed by Tim Horton.
+
+        No reason to use WKSI for these calls.
+
+        No new tests because there is no behavior change.
+
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        (WebCore::GraphicsContext::applyStrokePattern):
+        (WebCore::GraphicsContext::applyFillPattern):
+        (WebCore::GraphicsContext::setPlatformShadow):
+        * platform/graphics/cg/GraphicsContextCG.h:
+        (WebCore::getUserToBaseCTM):
+        * platform/graphics/cg/ImageBufferCG.cpp:
+        (WebCore::ImageBuffer::putByteArray):
+        * platform/graphics/mac/GraphicsContextMac.mm:
+        (WebCore::setPatternPhaseInUserSpace):
+        (WebCore::GraphicsContext::drawLineForDocumentMarker):
+        * platform/ios/WebCoreSystemInterfaceIOS.mm:
+        * platform/mac/WebCoreSystemInterface.h:
+        * platform/mac/WebCoreSystemInterface.mm:
+
</ins><span class="cx"> 2015-10-22  Brady Eidson  &lt;beidson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Modern IDB: Basic createObjectStore implementation.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (191465 => 191466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp        2015-10-22 19:10:15 UTC (rev 191465)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp        2015-10-22 19:50:09 UTC (rev 191466)
</span><span class="lines">@@ -583,7 +583,7 @@
</span><span class="cx"> void GraphicsContext::applyStrokePattern()
</span><span class="cx"> {
</span><span class="cx">     CGContextRef cgContext = platformContext();
</span><del>-    AffineTransform userToBaseCTM = AffineTransform(wkGetUserToBaseCTM(cgContext));
</del><ins>+    AffineTransform userToBaseCTM = AffineTransform(getUserToBaseCTM(cgContext));
</ins><span class="cx"> 
</span><span class="cx">     RetainPtr&lt;CGPatternRef&gt; platformPattern = adoptCF(m_state.strokePattern-&gt;createPlatformPattern(userToBaseCTM));
</span><span class="cx">     if (!platformPattern)
</span><span class="lines">@@ -599,7 +599,7 @@
</span><span class="cx"> void GraphicsContext::applyFillPattern()
</span><span class="cx"> {
</span><span class="cx">     CGContextRef cgContext = platformContext();
</span><del>-    AffineTransform userToBaseCTM = AffineTransform(wkGetUserToBaseCTM(cgContext));
</del><ins>+    AffineTransform userToBaseCTM = AffineTransform(getUserToBaseCTM(cgContext));
</ins><span class="cx"> 
</span><span class="cx">     RetainPtr&lt;CGPatternRef&gt; platformPattern = adoptCF(m_state.fillPattern-&gt;createPlatformPattern(userToBaseCTM));
</span><span class="cx">     if (!platformPattern)
</span><span class="lines">@@ -1070,7 +1070,7 @@
</span><span class="cx">     CGContextRef context = platformContext();
</span><span class="cx"> 
</span><span class="cx">     if (!m_state.shadowsIgnoreTransforms) {
</span><del>-        CGAffineTransform userToBaseCTM = wkGetUserToBaseCTM(context);
</del><ins>+        CGAffineTransform userToBaseCTM = getUserToBaseCTM(context);
</ins><span class="cx"> 
</span><span class="cx">         CGFloat A = userToBaseCTM.a * userToBaseCTM.a + userToBaseCTM.b * userToBaseCTM.b;
</span><span class="cx">         CGFloat B = userToBaseCTM.a * userToBaseCTM.c + userToBaseCTM.b * userToBaseCTM.d;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.h (191465 => 191466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.h        2015-10-22 19:10:15 UTC (rev 191465)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.h        2015-10-22 19:50:09 UTC (rev 191466)
</span><span class="lines">@@ -36,6 +36,11 @@
</span><span class="cx"> WEBCORE_EXPORT CGColorSpaceRef sRGBColorSpaceRef();
</span><span class="cx"> CGColorSpaceRef linearRGBColorSpaceRef();
</span><span class="cx"> 
</span><ins>+inline CGAffineTransform getUserToBaseCTM(CGContextRef context)
+{
+    return CGAffineTransformConcat(CGContextGetCTM(context), CGAffineTransformInvert(CGContextGetBaseCTM(context)));
+}
+
</ins><span class="cx"> static inline CGColorSpaceRef cachedCGColorSpace(ColorSpace colorSpace)
</span><span class="cx"> {
</span><span class="cx">     switch (colorSpace) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (191465 => 191466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp        2015-10-22 19:10:15 UTC (rev 191465)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp        2015-10-22 19:50:09 UTC (rev 191466)
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx">     CGContextRef destContext = context().platformContext();
</span><span class="cx">     CGContextSaveGState(destContext);
</span><span class="cx">     if (coordinateSystem == LogicalCoordinateSystem)
</span><del>-        CGContextConcatCTM(destContext, AffineTransform(wkGetUserToBaseCTM(destContext)).inverse());
</del><ins>+        CGContextConcatCTM(destContext, AffineTransform(getUserToBaseCTM(destContext)).inverse());
</ins><span class="cx">     else
</span><span class="cx">         CGContextConcatCTM(destContext, AffineTransform(CGContextGetCTM(destContext)).inverse());
</span><span class="cx">     CGContextResetClip(destContext);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacGraphicsContextMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm (191465 => 191466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm        2015-10-22 19:10:15 UTC (rev 191465)
+++ trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm        2015-10-22 19:50:09 UTC (rev 191466)
</span><span class="lines">@@ -155,6 +155,14 @@
</span><span class="cx">     correctionPatternColor = nullptr;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static inline void setPatternPhaseInUserSpace(CGContextRef context, CGPoint phasePoint)
+{
+    CGAffineTransform userToBase = getUserToBaseCTM(context);
+    CGPoint phase = CGPointApplyAffineTransform(phasePoint, userToBase);
+
+    CGContextSetPatternPhase(context, CGSizeMake(phase.x, phase.y));
+}
+
</ins><span class="cx"> // WebKit on Mac is a standard platform component, so it must use the standard platform artwork for underline.
</span><span class="cx"> void GraphicsContext::drawLineForDocumentMarker(const FloatPoint&amp; point, float width, DocumentMarkerLineStyle style)
</span><span class="cx"> {
</span><span class="lines">@@ -251,7 +259,7 @@
</span><span class="cx">     
</span><span class="cx">     // FIXME: This code should not use NSGraphicsContext currentContext
</span><span class="cx">     // In order to remove this requirement we will need to use CGPattern instead of NSColor
</span><del>-    // FIXME: This code should not be using wkSetPatternPhaseInUserSpace, as this approach is wrong
</del><ins>+    // FIXME: This code should not be using setPatternPhaseInUserSpace, as this approach is wrong
</ins><span class="cx">     // for transforms.
</span><span class="cx"> 
</span><span class="cx">     // Draw underline.
</span><span class="lines">@@ -270,7 +278,7 @@
</span><span class="cx">     WKSetPattern(context, dotPattern, YES, YES);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    wkSetPatternPhaseInUserSpace(context, offsetPoint);
</del><ins>+    setPatternPhaseInUserSpace(context, offsetPoint);
</ins><span class="cx"> 
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx">     NSRectFillUsingOperation(NSMakeRect(offsetPoint.x(), offsetPoint.y(), width, patternHeight), NSCompositeSourceOver);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebCoreSystemInterfaceIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm (191465 => 191466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm        2015-10-22 19:10:15 UTC (rev 191465)
+++ trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm        2015-10-22 19:50:09 UTC (rev 191466)
</span><span class="lines">@@ -32,8 +32,6 @@
</span><span class="cx"> WEBCORE_EXPORT void (*wkClearGlyphVector)(void* glyphs);
</span><span class="cx"> WEBCORE_EXPORT OSStatus (*wkConvertCharToGlyphs)(void* styleGroup, const UniChar*, unsigned numCharacters, void* glyphs);
</span><span class="cx"> WEBCORE_EXPORT NSDate *(*wkGetNSURLResponseLastModifiedDate)(NSURLResponse *response);
</span><del>-WEBCORE_EXPORT void (*wkSetPatternPhaseInUserSpace)(CGContextRef, CGPoint point);
-WEBCORE_EXPORT CGAffineTransform (*wkGetUserToBaseCTM)(CGContextRef);
</del><span class="cx"> WEBCORE_EXPORT bool (*wkCGContextIsPDFContext)(CGContextRef);
</span><span class="cx"> WEBCORE_EXPORT NSString* (*wkCopyNSURLResponseStatusLine)(NSURLResponse*);
</span><span class="cx"> WEBCORE_EXPORT void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (191465 => 191466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h        2015-10-22 19:10:15 UTC (rev 191465)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h        2015-10-22 19:50:09 UTC (rev 191466)
</span><span class="lines">@@ -197,8 +197,6 @@
</span><span class="cx"> extern void (*wkSetDragImage)(NSImage*, NSPoint offset);
</span><span class="cx"> #endif
</span><span class="cx"> extern void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL);
</span><del>-extern void (*wkSetPatternPhaseInUserSpace)(CGContextRef, CGPoint);
-extern CGAffineTransform (*wkGetUserToBaseCTM)(CGContextRef);
</del><span class="cx"> extern bool (*wkCGContextIsPDFContext)(CGContextRef);
</span><span class="cx"> extern unsigned (*wkInitializeMaximumHTTPConnectionCountPerHost)(unsigned preferredConnectionCount);
</span><span class="cx"> extern int (*wkGetHTTPRequestPriority)(CFURLRequestRef);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (191465 => 191466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm        2015-10-22 19:10:15 UTC (rev 191465)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm        2015-10-22 19:50:09 UTC (rev 191466)
</span><span class="lines">@@ -76,8 +76,6 @@
</span><span class="cx"> 
</span><span class="cx"> void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*, BOOL);
</span><span class="cx"> void (*wkSetDragImage)(NSImage*, NSPoint offset);
</span><del>-void (*wkSetPatternPhaseInUserSpace)(CGContextRef, CGPoint point);
-CGAffineTransform (*wkGetUserToBaseCTM)(CGContextRef);
</del><span class="cx"> bool (*wkCGContextIsPDFContext)(CGContextRef);
</span><span class="cx"> void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL);
</span><span class="cx"> unsigned (*wkInitializeMaximumHTTPConnectionCountPerHost)(unsigned preferredConnectionCount);
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (191465 => 191466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2015-10-22 19:10:15 UTC (rev 191465)
+++ trunk/Source/WebKit/mac/ChangeLog        2015-10-22 19:50:09 UTC (rev 191466)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-10-22  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        [Cocoa] Migrate WKSetPatternPhaseInUserSpace() and WKGetUserToBaseCTM() from WKSI
+        https://bugs.webkit.org/show_bug.cgi?id=150460
+
+        Reviewed by Tim Horton.
+
+        * WebCoreSupport/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface): Deleted.
+
</ins><span class="cx"> 2015-10-21  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         NetworkProcess: DNS prefetch happens in the Web Process
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (191465 => 191466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm        2015-10-22 19:10:15 UTC (rev 191465)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm        2015-10-22 19:50:09 UTC (rev 191466)
</span><span class="lines">@@ -93,9 +93,7 @@
</span><span class="cx">     INIT(SetHTTPRequestMinimumFastLanePriority);
</span><span class="cx">     INIT(HTTPRequestEnablePipelining);
</span><span class="cx">     INIT(SetNSURLRequestShouldContentSniff);
</span><del>-    INIT(SetPatternPhaseInUserSpace);
</del><span class="cx">     INIT(CGContextIsPDFContext);
</span><del>-    INIT(GetUserToBaseCTM);
</del><span class="cx"> #if ENABLE(VIDEO) &amp;&amp; !PLATFORM(IOS)
</span><span class="cx">     INIT(QTIncludeOnlyModernMediaFileTypes);
</span><span class="cx">     INIT(QTMovieDisableComponent);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191465 => 191466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-10-22 19:10:15 UTC (rev 191465)
+++ trunk/Source/WebKit2/ChangeLog        2015-10-22 19:50:09 UTC (rev 191466)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-10-22  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        [Cocoa] Migrate WKSetPatternPhaseInUserSpace() and WKGetUserToBaseCTM() from WKSI
+        https://bugs.webkit.org/show_bug.cgi?id=150460
+
+        Reviewed by Tim Horton.
+
+        * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface): Deleted.
+
</ins><span class="cx"> 2015-10-22  Alex Christensen  &lt;achristensen@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Initial NSURLSession WebResourceLoader implementation
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (191465 => 191466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm        2015-10-22 19:10:15 UTC (rev 191465)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm        2015-10-22 19:50:09 UTC (rev 191466)
</span><span class="lines">@@ -62,7 +62,6 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx">         INIT(SignedPublicKeyAndChallengeString);
</span><span class="cx"> #endif
</span><del>-        INIT(GetUserToBaseCTM);
</del><span class="cx">         INIT(GetWebDefaultCFStringEncoding);
</span><span class="cx">         INIT(CGContextIsPDFContext);
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="lines">@@ -99,7 +98,6 @@
</span><span class="cx">         INIT(SetHTTPRequestPriority);
</span><span class="cx">         INIT(SetHTTPRequestMinimumFastLanePriority);
</span><span class="cx">         INIT(SetNSURLRequestShouldContentSniff);
</span><del>-        INIT(SetPatternPhaseInUserSpace);
</del><span class="cx">         INIT(CreatePrivateStorageSession);
</span><span class="cx">         INIT(CopyRequestWithStorageSession);
</span><span class="cx">         INIT(CopyHTTPCookieStorage);
</span></span></pre>
</div>
</div>

</body>
</html>