<!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>[167730] 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/167730">167730</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-04-23 16:17:49 -0700 (Wed, 23 Apr 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Don't migrate the WKView.h header from WebCore to WebKit
https://bugs.webkit.org/show_bug.cgi?id=132086

Reviewed by Dan Bernstein.

Source/WebCore:
* WebCore.xcodeproj/project.pbxproj:
Add WAKViewInternal.h.

* platform/WAKViewInternal.h: Added.

* platform/ios/wak/WAKClipView.m:
Import WAKViewInternal.h instead of WAKViewPrivate.h.

* platform/ios/wak/WAKScrollView.mm:
Import WAKViewInternal.h instead of WAKViewPrivate.h.

* platform/ios/wak/WAKView.h:
Move ivars to a class extension in WAKViewInternal.h and remove WKView.h import.

* platform/ios/wak/WAKView.mm:
Import WAKViewInternal.h instead of WAKViewPrivate.h.

* platform/ios/wak/WAKViewPrivate.h:
Import WKViewPrivate.h.

Source/WebKit/mac:
* MigrateHeaders.make:
Remove WKView.h from the list of headers to migrate.

* WebView/WebView.mm:
Import WKView.h.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakWAKClipViewm">trunk/Source/WebCore/platform/ios/wak/WAKClipView.m</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakWAKScrollViewmm">trunk/Source/WebCore/platform/ios/wak/WAKScrollView.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakWAKViewh">trunk/Source/WebCore/platform/ios/wak/WAKView.h</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakWAKViewmm">trunk/Source/WebCore/platform/ios/wak/WAKView.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakWAKViewPrivateh">trunk/Source/WebCore/platform/ios/wak/WAKViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMigrateHeadersmake">trunk/Source/WebKit/mac/MigrateHeaders.make</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformWAKViewInternalh">trunk/Source/WebCore/platform/WAKViewInternal.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167729 => 167730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-04-23 22:35:16 UTC (rev 167729)
+++ trunk/Source/WebCore/ChangeLog        2014-04-23 23:17:49 UTC (rev 167730)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-04-23  Anders Carlsson  &lt;andersca@apple.com&gt;
+
+        Don't migrate the WKView.h header from WebCore to WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=132086
+
+        Reviewed by Dan Bernstein.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        Add WAKViewInternal.h.
+
+        * platform/WAKViewInternal.h: Added.
+
+        * platform/ios/wak/WAKClipView.m:
+        Import WAKViewInternal.h instead of WAKViewPrivate.h.
+
+        * platform/ios/wak/WAKScrollView.mm:
+        Import WAKViewInternal.h instead of WAKViewPrivate.h.
+
+        * platform/ios/wak/WAKView.h:
+        Move ivars to a class extension in WAKViewInternal.h and remove WKView.h import.
+
+        * platform/ios/wak/WAKView.mm:
+        Import WAKViewInternal.h instead of WAKViewPrivate.h.
+
+        * platform/ios/wak/WAKViewPrivate.h:
+        Import WKViewPrivate.h.
+
</ins><span class="cx"> 2014-04-23  David Hyatt  &lt;hyatt@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [New Multicolumn] fast/multicol/fixed-column-percent-logical-height-orthogonal-writing-mode.html fails
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (167729 => 167730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj        2014-04-23 22:35:16 UTC (rev 167729)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj        2014-04-23 23:17:49 UTC (rev 167730)
</span><span class="lines">@@ -751,6 +751,7 @@
</span><span class="cx">                 1A85B2110A1B258700D8C87C /* JSHTMLUListElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A85B20F0A1B258700D8C87C /* JSHTMLUListElement.h */; };
</span><span class="cx">                 1A85B2B60A1B2AC700D8C87C /* JSHTMLDivElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A85B2B40A1B2AC700D8C87C /* JSHTMLDivElement.cpp */; };
</span><span class="cx">                 1A85B2B70A1B2AC700D8C87C /* JSHTMLDivElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A85B2B50A1B2AC700D8C87C /* JSHTMLDivElement.h */; };
</span><ins>+                1A874ADF19085E9100B03171 /* WAKViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A874ADE19085E9100B03171 /* WAKViewInternal.h */; };
</ins><span class="cx">                 1A88A90417553CD7000C74F9 /* FileIconLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A88A90217553CD7000C74F9 /* FileIconLoader.cpp */; };
</span><span class="cx">                 1A88A90517553CD7000C74F9 /* FileIconLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A88A90317553CD7000C74F9 /* FileIconLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">                 1A8F6B020DB53006001DB794 /* SubstituteResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8F6B010DB53006001DB794 /* SubstituteResource.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -7624,6 +7625,7 @@
</span><span class="cx">                 1A85B2AD0A1B2A6D00D8C87C /* HTMLDivElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLDivElement.idl; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 1A85B2B40A1B2AC700D8C87C /* JSHTMLDivElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLDivElement.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 1A85B2B50A1B2AC700D8C87C /* JSHTMLDivElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLDivElement.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><ins>+                1A874ADE19085E9100B03171 /* WAKViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WAKViewInternal.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</ins><span class="cx">                 1A88A90217553CD7000C74F9 /* FileIconLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileIconLoader.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 1A88A90317553CD7000C74F9 /* FileIconLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileIconLoader.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 1A8F6B010DB53006001DB794 /* SubstituteResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SubstituteResource.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -18130,6 +18132,7 @@
</span><span class="cx">                                 A1483293187F508700DA63A6 /* WAKScrollView.mm */,
</span><span class="cx">                                 A1483294187F508700DA63A6 /* WAKView.h */,
</span><span class="cx">                                 A1483295187F508700DA63A6 /* WAKView.mm */,
</span><ins>+                                1A874ADE19085E9100B03171 /* WAKViewInternal.h */,
</ins><span class="cx">                                 A1483296187F508700DA63A6 /* WAKViewPrivate.h */,
</span><span class="cx">                                 A1483297187F508700DA63A6 /* WAKWindow.h */,
</span><span class="cx">                                 A1483298187F508700DA63A6 /* WAKWindow.mm */,
</span><span class="lines">@@ -23329,6 +23332,7 @@
</span><span class="cx">                                 A80E6E0F0A19911C007FB8C5 /* CSSStyleDeclaration.h in Headers */,
</span><span class="cx">                                 A80E6D0C0A1989CA007FB8C5 /* CSSStyleRule.h in Headers */,
</span><span class="cx">                                 A8EA80070A19516E00A8EF5F /* CSSStyleSheet.h in Headers */,
</span><ins>+                                1A874ADF19085E9100B03171 /* WAKViewInternal.h in Headers */,
</ins><span class="cx">                                 FC54D05716A7673100575E4D /* CSSSupportsRule.h in Headers */,
</span><span class="cx">                                 7A45033018DB717200377B34 /* BufferedLineReader.h in Headers */,
</span><span class="cx">                                 BC80C9880CD294EE00A0B7B3 /* CSSTimingFunctionValue.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformWAKViewInternalhfromrev167729trunkSourceWebCoreplatformioswakWAKViewPrivateh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/WAKViewInternal.h (from rev 167729, trunk/Source/WebCore/platform/ios/wak/WAKViewPrivate.h) (0 => 167730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/WAKViewInternal.h                                (rev 0)
+++ trunk/Source/WebCore/platform/WAKViewInternal.h        2014-04-23 23:17:49 UTC (rev 167730)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+/*
+ * Copyright (C) 2014 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
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if TARGET_OS_IPHONE
+
+#import &quot;WAKViewPrivate.h&quot;
+
+@interface WAKView () {
+@package
+    WKViewContext viewContext;
+    WKViewRef viewRef;
+
+    NSMutableSet *subviewReferences;    // This array is only used to keep WAKViews alive.
+                                        // The actual subviews are maintained by the WKView.
+
+    BOOL _isHidden;
+    BOOL _drawsOwnDescendants;
+}
+
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWAKClipViewm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WAKClipView.m (167729 => 167730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WAKClipView.m        2014-04-23 22:35:16 UTC (rev 167729)
+++ trunk/Source/WebCore/platform/ios/wak/WAKClipView.m        2014-04-23 23:17:49 UTC (rev 167730)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> 
</span><del>-#import &quot;WAKViewPrivate.h&quot;
</del><ins>+#import &quot;WAKViewInternal.h&quot;
</ins><span class="cx"> #import &lt;wtf/Assertions.h&gt;
</span><span class="cx"> 
</span><span class="cx"> @implementation WAKClipView
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWAKScrollViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WAKScrollView.mm (167729 => 167730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WAKScrollView.mm        2014-04-23 22:35:16 UTC (rev 167729)
+++ trunk/Source/WebCore/platform/ios/wak/WAKScrollView.mm        2014-04-23 23:17:49 UTC (rev 167730)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> 
</span><span class="cx"> #import &quot;WAKAppKitStubs.h&quot;
</span><span class="cx"> #import &quot;WAKClipView.h&quot;
</span><del>-#import &quot;WAKViewPrivate.h&quot;
</del><ins>+#import &quot;WAKViewInternal.h&quot;
</ins><span class="cx"> #import &quot;WAKWindow.h&quot;
</span><span class="cx"> #import &quot;WebEvent.h&quot;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWAKViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WAKView.h (167729 => 167730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WAKView.h        2014-04-23 22:35:16 UTC (rev 167729)
+++ trunk/Source/WebCore/platform/ios/wak/WAKView.h        2014-04-23 23:17:49 UTC (rev 167730)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> 
</span><span class="cx"> #import &quot;WAKResponder.h&quot;
</span><del>-#import &quot;WKView.h&quot;
</del><span class="cx"> #import &lt;Foundation/Foundation.h&gt;
</span><span class="cx"> #import &lt;CoreGraphics/CoreGraphics.h&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -45,17 +44,7 @@
</span><span class="cx"> @class WAKWindow;
</span><span class="cx"> 
</span><span class="cx"> @interface WAKView : WAKResponder
</span><del>-{
-    WKViewContext viewContext;
-    WKViewRef viewRef;
-    
-    NSMutableSet *subviewReferences;    // This array is only used to keep WAKViews alive.
-                                        // The actual subviews are maintained by the WKView.
</del><span class="cx"> 
</span><del>-    BOOL _isHidden;
-    BOOL _drawsOwnDescendants;
-}
-
</del><span class="cx"> + (WAKView *)focusView;
</span><span class="cx"> 
</span><span class="cx"> - (id)initWithFrame:(CGRect)rect;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWAKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WAKView.mm (167729 => 167730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WAKView.mm        2014-04-23 22:35:16 UTC (rev 167729)
+++ trunk/Source/WebCore/platform/ios/wak/WAKView.mm        2014-04-23 23:17:49 UTC (rev 167730)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx">  */
</span><span class="cx"> 
</span><span class="cx"> #import &quot;config.h&quot;
</span><del>-#import &quot;WAKViewPrivate.h&quot;
</del><ins>+#import &quot;WAKViewInternal.h&quot;
</ins><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWAKViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WAKViewPrivate.h (167729 => 167730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WAKViewPrivate.h        2014-04-23 22:35:16 UTC (rev 167729)
+++ trunk/Source/WebCore/platform/ios/wak/WAKViewPrivate.h        2014-04-23 23:17:49 UTC (rev 167730)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> 
</span><span class="cx"> #import &quot;WAKView.h&quot;
</span><ins>+#import &quot;WKViewPrivate.h&quot;
</ins><span class="cx"> 
</span><span class="cx"> @interface WAKView (WAKPrivate)
</span><span class="cx"> - (WKViewRef)_viewRef;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (167729 => 167730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2014-04-23 22:35:16 UTC (rev 167729)
+++ trunk/Source/WebKit/mac/ChangeLog        2014-04-23 23:17:49 UTC (rev 167730)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-04-23  Anders Carlsson  &lt;andersca@apple.com&gt;
+
+        Don't migrate the WKView.h header from WebCore to WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=132086
+
+        Reviewed by Dan Bernstein.
+
+        * MigrateHeaders.make:
+        Remove WKView.h from the list of headers to migrate.
+
+        * WebView/WebView.mm:
+        Import WKView.h.
+
</ins><span class="cx"> 2014-04-22  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Cursor doesn't change back to pointer when leaving the Safari window
</span></span></pre></div>
<a id="trunkSourceWebKitmacMigrateHeadersmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/MigrateHeaders.make (167729 => 167730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/MigrateHeaders.make        2014-04-23 22:35:16 UTC (rev 167729)
+++ trunk/Source/WebKit/mac/MigrateHeaders.make        2014-04-23 23:17:49 UTC (rev 167730)
</span><span class="lines">@@ -214,7 +214,6 @@
</span><span class="cx">     $(PRIVATE_HEADERS_DIR)/WKGraphics.h \
</span><span class="cx">     $(PRIVATE_HEADERS_DIR)/WKTypes.h \
</span><span class="cx">     $(PRIVATE_HEADERS_DIR)/WKUtilities.h \
</span><del>-    $(PRIVATE_HEADERS_DIR)/WKView.h \
</del><span class="cx">     $(PRIVATE_HEADERS_DIR)/WebAutocapitalize.h \
</span><span class="cx">     $(PRIVATE_HEADERS_DIR)/WebCoreFrameView.h \
</span><span class="cx">     $(PRIVATE_HEADERS_DIR)/WebCoreThread.h \
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (167729 => 167730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm        2014-04-23 22:35:16 UTC (rev 167729)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm        2014-04-23 23:17:49 UTC (rev 167730)
</span><span class="lines">@@ -239,6 +239,7 @@
</span><span class="cx"> #import &lt;WebCore/TextRun.h&gt;
</span><span class="cx"> #import &lt;WebCore/TileControllerMemoryHandlerIOS.h&gt;
</span><span class="cx"> #import &lt;WebCore/WAKWindow.h&gt;
</span><ins>+#import &lt;WebCore/WKView.h&gt;
</ins><span class="cx"> #import &lt;WebCore/WebCoreThread.h&gt;
</span><span class="cx"> #import &lt;WebCore/WebCoreThreadMessage.h&gt;
</span><span class="cx"> #import &lt;WebCore/WebCoreThreadRun.h&gt;
</span></span></pre>
</div>
</div>

</body>
</html>