Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 0 insertions, 65 deletions

diff --git a/WebCore/platform/mac/WebCoreView.m b/WebCore/platform/mac/WebCoreView.m
deleted file mode 100644
index e2f11fa..0000000
--- a/WebCore/platform/mac/WebCoreView.m
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, 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 COMPUTER, INC. ``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 COMPUTER, INC. OR
- * 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. 
- */
-
-#import "config.h"
-#import "WebCoreView.h"
-
-@interface NSClipView (WebCoreView)
-- (NSView *)_webcore_effectiveFirstResponder;
-@end
-
-@interface NSScrollView (WebCoreView)
-- (NSView *)_webcore_effectiveFirstResponder;
-@end
-
-@implementation NSView (WebCoreView)
-
-- (NSView *)_webcore_effectiveFirstResponder
-{
-    return self;
-}
-
-@end
-
-@implementation NSClipView (WebCoreView)
-
-- (NSView *)_webcore_effectiveFirstResponder
-{
-    NSView *view = [self documentView];
-    return view ? [view _webcore_effectiveFirstResponder] : [super _webcore_effectiveFirstResponder];
-}
-
-@end
-
-@implementation NSScrollView (WebCoreView)
-
-- (NSView *)_webcore_effectiveFirstResponder
-{
-    NSView *view = [self contentView];
-    return view ? [view _webcore_effectiveFirstResponder] : [super _webcore_effectiveFirstResponder];
-}
-
-@end
-