<!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>[165218] trunk/Source/WebKit2</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/165218">165218</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-03-06 14:43:27 -0800 (Thu, 06 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove WebKit1 header includes from WebKit2
https://bugs.webkit.org/show_bug.cgi?id=129824
Reviewed by Dan Bernstein.
* UIProcess/mac/WKFullScreenWindowController.mm:
(makeResponderFirstResponderIfDescendantOfView):
Add a new function instead of calling an NSWindow category method that's defined in WebKit1.
(-[WKFullScreenWindowController enterFullScreen:]):
(-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
(-[WKFullScreenWindowController finishedExitFullScreenAnimation:]):
Call makeResponderFirstResponderIfDescendantOfView.
* WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
Remove unused WebKit1 header import.
* WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm:
(WebKit::WebEditorClient::documentFragmentFromAttributedString):
Change a category to be on NSObject instead of WebResource.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKFullScreenWindowControllermm">trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebDragClientMacmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebEditorClientMacmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165217 => 165218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-06 22:41:29 UTC (rev 165217)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-06 22:43:27 UTC (rev 165218)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-03-06 Anders Carlsson <andersca@apple.com>
+
+ Remove WebKit1 header includes from WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=129824
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/mac/WKFullScreenWindowController.mm:
+ (makeResponderFirstResponderIfDescendantOfView):
+ Add a new function instead of calling an NSWindow category method that's defined in WebKit1.
+
+ (-[WKFullScreenWindowController enterFullScreen:]):
+ (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
+ (-[WKFullScreenWindowController finishedExitFullScreenAnimation:]):
+ Call makeResponderFirstResponderIfDescendantOfView.
+
+ * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
+ Remove unused WebKit1 header import.
+
+ * WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm:
+ (WebKit::WebEditorClient::documentFragmentFromAttributedString):
+ Change a category to be on NSObject instead of WebResource.
+
</ins><span class="cx"> 2014-03-06 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> iOS build fix.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKFullScreenWindowControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (165217 => 165218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2014-03-06 22:41:29 UTC (rev 165217)
+++ trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2014-03-06 22:43:27 UTC (rev 165218)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> #import <WebCore/WebCoreFullScreenPlaceholderView.h>
</span><span class="cx"> #import <WebCore/WebCoreFullScreenWindow.h>
</span><span class="cx"> #import <WebCore/WebWindowAnimation.h>
</span><del>-#import <WebKit/WebNSWindowExtras.h>
</del><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="lines">@@ -80,9 +79,11 @@
</span><span class="cx"> return [window convertRectToScreen:rect];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@interface NSWindow(IsOnActiveSpaceAdditionForTigerAndLeopard)
-- (BOOL)isOnActiveSpace;
-@end
</del><ins>+static void makeResponderFirstResponderIfDescendantOfView(NSWindow *window, NSResponder *responder, NSView *view)
+{
+ if ([responder isKindOfClass:[NSView class]] && [(NSView *)responder isDescendantOf:view])
+ [window makeFirstResponder:responder];
+}
</ins><span class="cx">
</span><span class="cx"> @implementation WKFullScreenWindowController
</span><span class="cx">
</span><span class="lines">@@ -246,7 +247,7 @@
</span><span class="cx"> [contentView addSubview:_webView positioned:NSWindowBelow relativeTo:nil];
</span><span class="cx"> [_webView setFrame:[contentView bounds]];
</span><span class="cx">
</span><del>- [[self window] makeResponder:webWindowFirstResponder firstResponderIfDescendantOfView:_webView];
</del><ins>+ makeResponderFirstResponderIfDescendantOfView(self.window, webWindowFirstResponder, _webView);
</ins><span class="cx">
</span><span class="cx"> [self _manager]->setAnimatingFullScreen(true);
</span><span class="cx"> [self _manager]->willEnterFullScreen();
</span><span class="lines">@@ -309,7 +310,7 @@
</span><span class="cx">
</span><span class="cx"> NSResponder *firstResponder = [[self window] firstResponder];
</span><span class="cx"> [self _replaceView:_webViewPlaceholder.get() with:_webView];
</span><del>- [[_webView window] makeResponder:firstResponder firstResponderIfDescendantOfView:_webView];
</del><ins>+ makeResponderFirstResponderIfDescendantOfView(_webView.window, firstResponder, _webView);
</ins><span class="cx"> [[_webView window] makeKeyAndOrderFront:self];
</span><span class="cx">
</span><span class="cx"> [self _manager]->didExitFullScreen();
</span><span class="lines">@@ -379,7 +380,7 @@
</span><span class="cx">
</span><span class="cx"> NSResponder *firstResponder = [[self window] firstResponder];
</span><span class="cx"> [self _replaceView:_webViewPlaceholder.get() with:_webView];
</span><del>- [[_webView window] makeResponder:firstResponder firstResponderIfDescendantOfView:_webView];
</del><ins>+ makeResponderFirstResponderIfDescendantOfView(_webView.window, firstResponder, _webView);
</ins><span class="cx">
</span><span class="cx"> NSRect windowBounds = [[self window] frame];
</span><span class="cx"> windowBounds.origin = NSZeroPoint;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebDragClientMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (165217 => 165218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2014-03-06 22:41:29 UTC (rev 165217)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2014-03-06 22:43:27 UTC (rev 165218)
</span><span class="lines">@@ -46,7 +46,6 @@
</span><span class="cx"> #import <WebCore/RenderImage.h>
</span><span class="cx"> #import <WebCore/ResourceHandle.h>
</span><span class="cx"> #import <WebCore/StringTruncator.h>
</span><del>-#import <WebKit/WebArchive.h>
</del><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx"> #import <wtf/StdLibExtras.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebEditorClientMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm (165217 => 165218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm 2014-03-06 22:41:29 UTC (rev 165217)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm 2014-03-06 22:43:27 UTC (rev 165218)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> #import <WebCore/NotImplemented.h>
</span><span class="cx"> #import <WebCore/Page.h>
</span><span class="cx"> #import <WebCore/WebCoreNSURLExtras.h>
</span><del>-#import <WebKit/WebResource.h> // FIXME: WebKit2 should not include WebKit headers.
</del><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -55,7 +54,7 @@
</span><span class="cx"> - (DOMDocumentFragment*)_documentFromRange:(NSRange)range document:(DOMDocument*)document documentAttributes:(NSDictionary *)dict subresources:(NSArray **)subresources;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@interface WebResource (WebResourceInternal)
</del><ins>+@interface NSObject (WebResourceInternal)
</ins><span class="cx"> - (WebCore::ArchiveResource*)_coreResource;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -116,11 +115,13 @@
</span><span class="cx">
</span><span class="cx"> NSArray *subResources;
</span><span class="cx"> Document* document = m_page->mainFrame()->document();
</span><ins>+
+ // FIXME: Isntead of calling this WebKit1 method, the code should be factored out and moved into WebCore.
</ins><span class="cx"> DOMDocumentFragment* fragment = [string _documentFromRange:NSMakeRange(0, [string length])
</span><span class="cx"> document:kit(document)
</span><span class="cx"> documentAttributes:dictionary
</span><span class="cx"> subresources:&subResources];
</span><del>- for (WebResource* resource in subResources)
</del><ins>+ for (id resource in subResources)
</ins><span class="cx"> resources.append([resource _coreResource]);
</span><span class="cx">
</span><span class="cx"> return core(fragment);
</span></span></pre>
</div>
</div>
</body>
</html>