Title: [165218] trunk/Source/WebKit2
- Revision
- 165218
- Author
- [email protected]
- Date
- 2014-03-06 14:43:27 -0800 (Thu, 06 Mar 2014)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (165217 => 165218)
--- 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)
@@ -1,3 +1,26 @@
+2014-03-06 Anders Carlsson <[email protected]>
+
+ 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.
+
2014-03-06 Jon Lee <[email protected]>
iOS build fix.
Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (165217 => 165218)
--- 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)
@@ -43,7 +43,6 @@
#import <WebCore/WebCoreFullScreenPlaceholderView.h>
#import <WebCore/WebCoreFullScreenWindow.h>
#import <WebCore/WebWindowAnimation.h>
-#import <WebKit/WebNSWindowExtras.h>
#import <WebKitSystemInterface.h>
using namespace WebKit;
@@ -80,9 +79,11 @@
return [window convertRectToScreen:rect];
}
-@interface NSWindow(IsOnActiveSpaceAdditionForTigerAndLeopard)
-- (BOOL)isOnActiveSpace;
-@end
+static void makeResponderFirstResponderIfDescendantOfView(NSWindow *window, NSResponder *responder, NSView *view)
+{
+ if ([responder isKindOfClass:[NSView class]] && [(NSView *)responder isDescendantOf:view])
+ [window makeFirstResponder:responder];
+}
@implementation WKFullScreenWindowController
@@ -246,7 +247,7 @@
[contentView addSubview:_webView positioned:NSWindowBelow relativeTo:nil];
[_webView setFrame:[contentView bounds]];
- [[self window] makeResponder:webWindowFirstResponder firstResponderIfDescendantOfView:_webView];
+ makeResponderFirstResponderIfDescendantOfView(self.window, webWindowFirstResponder, _webView);
[self _manager]->setAnimatingFullScreen(true);
[self _manager]->willEnterFullScreen();
@@ -309,7 +310,7 @@
NSResponder *firstResponder = [[self window] firstResponder];
[self _replaceView:_webViewPlaceholder.get() with:_webView];
- [[_webView window] makeResponder:firstResponder firstResponderIfDescendantOfView:_webView];
+ makeResponderFirstResponderIfDescendantOfView(_webView.window, firstResponder, _webView);
[[_webView window] makeKeyAndOrderFront:self];
[self _manager]->didExitFullScreen();
@@ -379,7 +380,7 @@
NSResponder *firstResponder = [[self window] firstResponder];
[self _replaceView:_webViewPlaceholder.get() with:_webView];
- [[_webView window] makeResponder:firstResponder firstResponderIfDescendantOfView:_webView];
+ makeResponderFirstResponderIfDescendantOfView(_webView.window, firstResponder, _webView);
NSRect windowBounds = [[self window] frame];
windowBounds.origin = NSZeroPoint;
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (165217 => 165218)
--- 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)
@@ -46,7 +46,6 @@
#import <WebCore/RenderImage.h>
#import <WebCore/ResourceHandle.h>
#import <WebCore/StringTruncator.h>
-#import <WebKit/WebArchive.h>
#import <WebKitSystemInterface.h>
#import <wtf/StdLibExtras.h>
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm (165217 => 165218)
--- 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)
@@ -47,7 +47,6 @@
#import <WebCore/NotImplemented.h>
#import <WebCore/Page.h>
#import <WebCore/WebCoreNSURLExtras.h>
-#import <WebKit/WebResource.h> // FIXME: WebKit2 should not include WebKit headers.
using namespace WebCore;
@@ -55,7 +54,7 @@
- (DOMDocumentFragment*)_documentFromRange:(NSRange)range document:(DOMDocument*)document documentAttributes:(NSDictionary *)dict subresources:(NSArray **)subresources;
@end
-@interface WebResource (WebResourceInternal)
+@interface NSObject (WebResourceInternal)
- (WebCore::ArchiveResource*)_coreResource;
@end
@@ -116,11 +115,13 @@
NSArray *subResources;
Document* document = m_page->mainFrame()->document();
+
+ // FIXME: Isntead of calling this WebKit1 method, the code should be factored out and moved into WebCore.
DOMDocumentFragment* fragment = [string _documentFromRange:NSMakeRange(0, [string length])
document:kit(document)
documentAttributes:dictionary
subresources:&subResources];
- for (WebResource* resource in subResources)
+ for (id resource in subResources)
resources.append([resource _coreResource]);
return core(fragment);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
