<!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>[185021] 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/185021">185021</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-05-29 17:11:48 -0700 (Fri, 29 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of WAKViewPrivate.h
https://bugs.webkit.org/show_bug.cgi?id=145482
rdar://problem/21162149
Reviewed by Dan Bernstein.
Source/WebCore:
Merge WAKViewPrivate.h into WAKViewInternal.h and move the NSView sizing enum
to WAKView.h since that was the only thing WebKit used (indirectly) from WAKViewPrivate.h.
* WebCore.xcodeproj/project.pbxproj:
* platform/WAKViewInternal.h:
(WAKViewForWKViewRef):
* platform/ios/ScrollViewIOS.mm:
* platform/ios/wak/WAKResponder.m:
* platform/ios/wak/WAKView.h:
* platform/ios/wak/WAKView.mm:
* platform/ios/wak/WAKViewPrivate.h: Removed.
(WAKViewForWKViewRef): Deleted.
* platform/ios/wak/WAKWindow.mm:
* platform/ios/wak/WKView.h:
* platform/ios/wak/WKView.mm:
Source/WebKit/mac:
Remove WAKViewPrivate.h imports.
* DefaultDelegates/WebDefaultUIDelegate.m:
* MigrateHeaders.make:
* Misc/WebKitNSStringExtras.mm:
* Misc/WebNSViewExtras.m:
* WebCoreSupport/WebFrameLoaderClient.mm:
* WebView/WebFrame.mm:
* WebView/WebFrameView.mm:
* WebView/WebHTMLView.mm:</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="#trunkSourceWebCoreplatformWAKViewInternalh">trunk/Source/WebCore/platform/WAKViewInternal.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosScrollViewIOSmm">trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakWAKResponderm">trunk/Source/WebCore/platform/ios/wak/WAKResponder.m</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="#trunkSourceWebCoreplatformioswakWAKWindowmm">trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakWKViewh">trunk/Source/WebCore/platform/ios/wak/WKView.h</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakWKViewmm">trunk/Source/WebCore/platform/ios/wak/WKView.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacDefaultDelegatesWebDefaultUIDelegatem">trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultUIDelegate.m</a></li>
<li><a href="#trunkSourceWebKitmacMigrateHeadersmake">trunk/Source/WebKit/mac/MigrateHeaders.make</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitNSStringExtrasmm">trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSViewExtrasm">trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramemm">trunk/Source/WebKit/mac/WebView/WebFrame.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFrameViewmm">trunk/Source/WebKit/mac/WebView/WebFrameView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformioswakWAKViewPrivateh">trunk/Source/WebCore/platform/ios/wak/WAKViewPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185020 => 185021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebCore/ChangeLog 2015-05-30 00:11:48 UTC (rev 185021)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-05-29 Anders Carlsson <andersca@apple.com>
+
+ Get rid of WAKViewPrivate.h
+ https://bugs.webkit.org/show_bug.cgi?id=145482
+ rdar://problem/21162149
+
+ Reviewed by Dan Bernstein.
+
+ Merge WAKViewPrivate.h into WAKViewInternal.h and move the NSView sizing enum
+ to WAKView.h since that was the only thing WebKit used (indirectly) from WAKViewPrivate.h.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/WAKViewInternal.h:
+ (WAKViewForWKViewRef):
+ * platform/ios/ScrollViewIOS.mm:
+ * platform/ios/wak/WAKResponder.m:
+ * platform/ios/wak/WAKView.h:
+ * platform/ios/wak/WAKView.mm:
+ * platform/ios/wak/WAKViewPrivate.h: Removed.
+ (WAKViewForWKViewRef): Deleted.
+ * platform/ios/wak/WAKWindow.mm:
+ * platform/ios/wak/WKView.h:
+ * platform/ios/wak/WKView.mm:
+
</ins><span class="cx"> 2015-05-29 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up logic for updating caps lock indicator state
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (185020 => 185021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-05-30 00:11:48 UTC (rev 185021)
</span><span class="lines">@@ -3830,7 +3830,6 @@
</span><span class="cx"> A14832B7187F636C00DA63A6 /* WAKScrollView.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1483293187F508700DA63A6 /* WAKScrollView.mm */; };
</span><span class="cx"> A14832B8187F638600DA63A6 /* WAKView.h in Headers */ = {isa = PBXBuildFile; fileRef = A1483294187F508700DA63A6 /* WAKView.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A14832B9187F63D500DA63A6 /* WAKView.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1483295187F508700DA63A6 /* WAKView.mm */; };
</span><del>- A14832BA187F63E900DA63A6 /* WAKViewPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = A1483296187F508700DA63A6 /* WAKViewPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> A14832BB187F643200DA63A6 /* WAKWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = A1483297187F508700DA63A6 /* WAKWindow.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A14832BC187F648E00DA63A6 /* WAKWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1483298187F508700DA63A6 /* WAKWindow.mm */; };
</span><span class="cx"> A14832BD187F64B400DA63A6 /* WKContentObservation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A14832A2187F508700DA63A6 /* WKContentObservation.cpp */; };
</span><span class="lines">@@ -11134,7 +11133,6 @@
</span><span class="cx"> A1483293187F508700DA63A6 /* WAKScrollView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WAKScrollView.mm; sourceTree = "<group>"; };
</span><span class="cx"> A1483294187F508700DA63A6 /* WAKView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WAKView.h; sourceTree = "<group>"; };
</span><span class="cx"> A1483295187F508700DA63A6 /* WAKView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WAKView.mm; sourceTree = "<group>"; };
</span><del>- A1483296187F508700DA63A6 /* WAKViewPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WAKViewPrivate.h; sourceTree = "<group>"; };
</del><span class="cx"> A1483297187F508700DA63A6 /* WAKWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WAKWindow.h; sourceTree = "<group>"; };
</span><span class="cx"> A1483298187F508700DA63A6 /* WAKWindow.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WAKWindow.mm; sourceTree = "<group>"; };
</span><span class="cx"> A1483299187F508700DA63A6 /* WebCoreThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreThread.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -18789,7 +18787,6 @@
</span><span class="cx"> A1483294187F508700DA63A6 /* WAKView.h */,
</span><span class="cx"> A1483295187F508700DA63A6 /* WAKView.mm */,
</span><span class="cx"> 1A874ADE19085E9100B03171 /* WAKViewInternal.h */,
</span><del>- A1483296187F508700DA63A6 /* WAKViewPrivate.h */,
</del><span class="cx"> A1483297187F508700DA63A6 /* WAKWindow.h */,
</span><span class="cx"> A1483298187F508700DA63A6 /* WAKWindow.mm */,
</span><span class="cx"> A1483299187F508700DA63A6 /* WebCoreThread.h */,
</span><span class="lines">@@ -27028,7 +27025,6 @@
</span><span class="cx"> A14832B6187F631F00DA63A6 /* WAKScrollView.h in Headers */,
</span><span class="cx"> A14832B8187F638600DA63A6 /* WAKView.h in Headers */,
</span><span class="cx"> 1A874ADF19085E9100B03171 /* WAKViewInternal.h in Headers */,
</span><del>- A14832BA187F63E900DA63A6 /* WAKViewPrivate.h in Headers */,
</del><span class="cx"> A14832BB187F643200DA63A6 /* WAKWindow.h in Headers */,
</span><span class="cx"> FD7F299213D4C0CB00AD9535 /* WaveShaperDSPKernel.h in Headers */,
</span><span class="cx"> FD7F299413D4C0CB00AD9535 /* WaveShaperNode.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformWAKViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/WAKViewInternal.h (185020 => 185021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/WAKViewInternal.h 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebCore/platform/WAKViewInternal.h 2015-05-30 00:11:48 UTC (rev 185021)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx">
</span><del>-#import "WAKViewPrivate.h"
</del><ins>+#import "WAKView.h"
+#import "WKView.h"
</ins><span class="cx">
</span><span class="cx"> @interface WAKView () {
</span><span class="cx"> @package
</span><span class="lines">@@ -39,6 +40,23 @@
</span><span class="cx"> BOOL _drawsOwnDescendants;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (WKViewRef)_viewRef;
++ (WAKView *)_wrapperForViewRef:(WKViewRef)_viewRef;
+- (id)_initWithViewRef:(WKViewRef)view;
+- (BOOL)_handleResponderCall:(WKViewResponderCallbackType)type;
+- (NSMutableSet *)_subviewReferences;
+- (BOOL)_selfHandleEvent:(WebEvent *)event;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><ins>+static inline WAKView *WAKViewForWKViewRef(WKViewRef view)
+{
+ if (!view)
+ return nil;
+ WAKView *wrapper = (WAKView *)view->wrapper;
+ if (wrapper)
+ return wrapper;
+ return [WAKView _wrapperForViewRef:view];
+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosScrollViewIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm (185020 => 185021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm 2015-05-30 00:11:48 UTC (rev 185021)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #import "WAKAppKitStubs.h"
</span><span class="cx"> #import "WAKClipView.h"
</span><span class="cx"> #import "WAKScrollView.h"
</span><del>-#import "WAKViewPrivate.h"
</del><ins>+#import "WAKViewInternal.h"
</ins><span class="cx"> #import "WAKWindow.h"
</span><span class="cx"> #import "WKViewPrivate.h"
</span><span class="cx"> #import "WebCoreFrameView.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWAKResponderm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WAKResponder.m (185020 => 185021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WAKResponder.m 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebCore/platform/ios/wak/WAKResponder.m 2015-05-30 00:11:48 UTC (rev 185021)
</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 "WAKViewPrivate.h"
</del><ins>+#import "WAKViewInternal.h"
</ins><span class="cx"> #import "WKViewPrivate.h"
</span><span class="cx">
</span><span class="cx"> @implementation WAKResponder
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWAKViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WAKView.h (185020 => 185021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WAKView.h 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebCore/platform/ios/wak/WAKView.h 2015-05-30 00:11:48 UTC (rev 185021)
</span><span class="lines">@@ -36,6 +36,16 @@
</span><span class="cx"> extern NSString *WAKViewFrameSizeDidChangeNotification;
</span><span class="cx"> extern NSString *WAKViewDidScrollNotification;
</span><span class="cx">
</span><ins>+enum {
+ NSViewNotSizable = 0,
+ NSViewMinXMargin = 1,
+ NSViewWidthSizable = 2,
+ NSViewMaxXMargin = 4,
+ NSViewMinYMargin = 8,
+ NSViewHeightSizable = 16,
+ NSViewMaxYMargin = 32
+};
+
</ins><span class="cx"> @class WAKWindow;
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT @interface WAKView : WAKResponder
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWAKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WAKView.mm (185020 => 185021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WAKView.mm 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebCore/platform/ios/wak/WAKView.mm 2015-05-30 00:11:48 UTC (rev 185021)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #import "GraphicsContext.h"
</span><span class="cx"> #import "WAKClipView.h"
</span><span class="cx"> #import "WAKScrollView.h"
</span><del>-#import "WAKViewPrivate.h"
</del><span class="cx"> #import "WAKWindow.h"
</span><span class="cx"> #import "WKGraphics.h"
</span><span class="cx"> #import "WKUtilities.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWAKViewPrivateh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/ios/wak/WAKViewPrivate.h (185020 => 185021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WAKViewPrivate.h 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebCore/platform/ios/wak/WAKViewPrivate.h 2015-05-30 00:11:48 UTC (rev 185021)
</span><span class="lines">@@ -1,55 +0,0 @@
</span><del>-/*
- * Copyright (C) 2005, 2006, 2007, 2009 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.
- */
-
-#ifndef WAKViewPrivate_h
-#define WAKViewPrivate_h
-
-#if TARGET_OS_IPHONE
-
-#import "WAKView.h"
-#import "WKViewPrivate.h"
-
-@interface WAKView (WAKPrivate)
-- (WKViewRef)_viewRef;
-+ (WAKView *)_wrapperForViewRef:(WKViewRef)_viewRef;
-- (id)_initWithViewRef:(WKViewRef)view;
-- (BOOL)_handleResponderCall:(WKViewResponderCallbackType)type;
-- (NSMutableSet *)_subviewReferences;
-- (BOOL)_selfHandleEvent:(WebEvent *)event;
-@end
-
-static inline WAKView *WAKViewForWKViewRef(WKViewRef view)
-{
- if (!view)
- return nil;
- WAKView *wrapper = (WAKView *)view->wrapper;
- if (wrapper)
- return wrapper;
- return [WAKView _wrapperForViewRef:view];
-}
-
-#endif // TARGET_OS_IPHONE
-
-#endif // WAKViewPrivate_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWAKWindowmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm (185020 => 185021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm 2015-05-30 00:11:48 UTC (rev 185021)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #import "LegacyTileCache.h"
</span><del>-#import "WAKViewPrivate.h"
</del><ins>+#import "WAKViewInternal.h"
</ins><span class="cx"> #import "WebCoreSystemInterface.h"
</span><span class="cx"> #import "WebCoreThreadRun.h"
</span><span class="cx"> #import "WebEvent.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWKViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WKView.h (185020 => 185021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WKView.h 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebCore/platform/ios/wak/WKView.h 2015-05-30 00:11:48 UTC (rev 185021)
</span><span class="lines">@@ -37,16 +37,6 @@
</span><span class="cx">
</span><span class="cx"> @class WAKWindow;
</span><span class="cx">
</span><del>-enum {
- NSViewNotSizable = 0,
- NSViewMinXMargin = 1,
- NSViewWidthSizable = 2,
- NSViewMaxXMargin = 4,
- NSViewMinYMargin = 8,
- NSViewHeightSizable = 16,
- NSViewMaxYMargin = 32
-};
-
</del><span class="cx"> typedef enum {
</span><span class="cx"> WKViewNotificationViewDidMoveToWindow,
</span><span class="cx"> WKViewNotificationViewFrameSizeChanged,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WKView.mm (185020 => 185021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WKView.mm 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebCore/platform/ios/wak/WKView.mm 2015-05-30 00:11:48 UTC (rev 185021)
</span><span class="lines">@@ -23,12 +23,12 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#include "config.h"
</del><ins>+#import "config.h"
</ins><span class="cx"> #import "WKViewPrivate.h"
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><del>-#import "WAKViewPrivate.h"
</del><ins>+#import "WAKViewInternal.h"
</ins><span class="cx"> #import "WAKWindow.h"
</span><span class="cx"> #import "WKUtilities.h"
</span><span class="cx"> #import <wtf/Assertions.h>
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (185020 => 185021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-05-30 00:11:48 UTC (rev 185021)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-05-29 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Get rid of WAKViewPrivate.h
+ https://bugs.webkit.org/show_bug.cgi?id=145482
+ rdar://problem/21162149
+
+ Reviewed by Dan Bernstein.
+
+ Remove WAKViewPrivate.h imports.
+
+ * DefaultDelegates/WebDefaultUIDelegate.m:
+ * MigrateHeaders.make:
+ * Misc/WebKitNSStringExtras.mm:
+ * Misc/WebNSViewExtras.m:
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ * WebView/WebFrame.mm:
+ * WebView/WebFrameView.mm:
+ * WebView/WebHTMLView.mm:
+
+2015-05-29 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> WebResourceLoadDelegatePrivate.h cannot be imported standalone (missing WebNSInteger type)
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=145476
</span><span class="cx"> rdar://problem/21162400
</span></span></pre></div>
<a id="trunkSourceWebKitmacDefaultDelegatesWebDefaultUIDelegatem"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultUIDelegate.m (185020 => 185021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultUIDelegate.m 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultUIDelegate.m 2015-05-30 00:11:48 UTC (rev 185021)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-#import <WebCore/WAKViewPrivate.h>
</del><span class="cx"> #import <WebCore/WAKWindow.h>
</span><span class="cx"> #import <WebCore/WKViewPrivate.h>
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacMigrateHeadersmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/MigrateHeaders.make (185020 => 185021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/MigrateHeaders.make 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebKit/mac/MigrateHeaders.make 2015-05-30 00:11:48 UTC (rev 185021)
</span><span class="lines">@@ -208,7 +208,6 @@
</span><span class="cx"> $(PRIVATE_HEADERS_DIR)/WAKResponder.h \
</span><span class="cx"> $(PRIVATE_HEADERS_DIR)/WAKScrollView.h \
</span><span class="cx"> $(PRIVATE_HEADERS_DIR)/WAKView.h \
</span><del>- $(PRIVATE_HEADERS_DIR)/WAKViewPrivate.h \
</del><span class="cx"> $(PRIVATE_HEADERS_DIR)/WAKWindow.h \
</span><span class="cx"> $(PRIVATE_HEADERS_DIR)/WKContentObservation.h \
</span><span class="cx"> $(PRIVATE_HEADERS_DIR)/WKGraphics.h \
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitNSStringExtrasmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm (185020 => 185021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm 2015-05-30 00:11:48 UTC (rev 185021)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> #import <sys/param.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-#import <WebCore/WAKViewPrivate.h>
</del><span class="cx"> #import <WebKitLegacy/DOM.h>
</span><span class="cx"> #import <WebKitLegacy/WebFrame.h>
</span><span class="cx"> #import <WebKitLegacy/WebFrameView.h>
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSViewExtrasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m (185020 => 185021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m 2015-05-30 00:11:48 UTC (rev 185021)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-#import <WebCore/WAKViewPrivate.h>
</del><span class="cx"> #import <WebCore/WAKWindow.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (185020 => 185021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2015-05-30 00:11:48 UTC (rev 185021)
</span><span class="lines">@@ -136,7 +136,6 @@
</span><span class="cx"> #import <WebCore/HTMLPlugInImageElement.h>
</span><span class="cx"> #import <WebCore/WAKClipView.h>
</span><span class="cx"> #import <WebCore/WAKScrollView.h>
</span><del>-#import <WebCore/WAKViewPrivate.h>
</del><span class="cx"> #import <WebCore/WAKWindow.h>
</span><span class="cx"> #import <WebCore/WebCoreThreadMessage.h>
</span><span class="cx"> #import "WebKitVersionChecks.h"
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (185020 => 185021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2015-05-30 00:11:48 UTC (rev 185021)
</span><span class="lines">@@ -121,7 +121,6 @@
</span><span class="cx"> #import <WebCore/RenderLayer.h>
</span><span class="cx"> #import <WebCore/TextResourceDecoder.h>
</span><span class="cx"> #import <WebCore/WAKScrollView.h>
</span><del>-#import <WebCore/WAKViewPrivate.h>
</del><span class="cx"> #import <WebCore/WKGraphics.h>
</span><span class="cx"> #import <WebCore/WebCoreThreadRun.h>
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.mm (185020 => 185021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2015-05-30 00:11:48 UTC (rev 185021)
</span><span class="lines">@@ -78,7 +78,6 @@
</span><span class="cx"> #import <WebCore/MainFrame.h>
</span><span class="cx"> #import <WebCore/WAKClipView.h>
</span><span class="cx"> #import <WebCore/WAKScrollView.h>
</span><del>-#import <WebCore/WAKViewPrivate.h>
</del><span class="cx"> #import <WebCore/WAKWindow.h>
</span><span class="cx"> #import <WebCore/WKGraphics.h>
</span><span class="cx"> #import <WebCore/WebEvent.h>
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (185020 => 185021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-05-30 00:11:48 UTC (rev 185021)
</span><span class="lines">@@ -152,7 +152,6 @@
</span><span class="cx"> #import <WebCore/PlatformEventFactoryIOS.h>
</span><span class="cx"> #import <WebCore/WAKClipView.h>
</span><span class="cx"> #import <WebCore/WAKScrollView.h>
</span><del>-#import <WebCore/WAKViewPrivate.h>
</del><span class="cx"> #import <WebCore/WAKWindow.h>
</span><span class="cx"> #import <WebCore/WKGraphics.h>
</span><span class="cx"> #import <WebCore/WebEvent.h>
</span></span></pre>
</div>
</div>
</body>
</html>