Diff
Modified: trunk/Source/WebCore/ChangeLog (95129 => 95130)
--- trunk/Source/WebCore/ChangeLog 2011-09-14 22:24:23 UTC (rev 95129)
+++ trunk/Source/WebCore/ChangeLog 2011-09-14 22:31:40 UTC (rev 95130)
@@ -1,3 +1,17 @@
+2011-09-14 Anders Carlsson <[email protected]>
+
+ Get rid of WebCoreViewFactory and its WebViewFactory subclass
+ https://bugs.webkit.org/show_bug.cgi?id=68124
+
+ Reviewed by Sam Weinig.
+
+ * WebCore.exp.in:
+ * WebCore.xcodeproj/project.pbxproj:
+ * editing/mac/FrameSelectionMac.mm:
+ * page/mac/FrameMac.mm:
+ * page/mac/WebCoreViewFactory.h: Removed.
+ * page/mac/WebCoreViewFactory.m: Removed.
+
2011-09-14 David Hyatt <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=52736
Modified: trunk/Source/WebCore/WebCore.exp.in (95129 => 95130)
--- trunk/Source/WebCore/WebCore.exp.in 2011-09-14 22:24:23 UTC (rev 95129)
+++ trunk/Source/WebCore/WebCore.exp.in 2011-09-14 22:31:40 UTC (rev 95130)
@@ -105,7 +105,6 @@
.objc_class_name_DOMTreeWalker
.objc_class_name_DOMUIEvent
.objc_class_name_DOMWheelEvent
-.objc_class_name_WebCoreViewFactory
.objc_class_name_WebFontCache
.objc_class_name_WebHTMLConverter
.objc_class_name_WebScriptObject
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (95129 => 95130)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2011-09-14 22:24:23 UTC (rev 95129)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2011-09-14 22:31:40 UTC (rev 95130)
@@ -3121,7 +3121,6 @@
93F1996308245E59001E9ABC /* SSLKeyGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866202DE3B1101EA4122 /* SSLKeyGenerator.h */; };
93F1998C08245E59001E9ABC /* RenderTreeAsText.h in Headers */ = {isa = PBXBuildFile; fileRef = 93955A4103D72932008635CE /* RenderTreeAsText.h */; settings = {ATTRIBUTES = (Private, ); }; };
93F199A808245E59001E9ABC /* WebCoreFrameView.h in Headers */ = {isa = PBXBuildFile; fileRef = F587854C02DE375901EA4122 /* WebCoreFrameView.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 93F199B308245E59001E9ABC /* WebCoreViewFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = F587855402DE375901EA4122 /* WebCoreViewFactory.h */; settings = {ATTRIBUTES = (Private, ); }; };
93F199B808245E59001E9ABC /* Scrollbar.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7B2AF80450824100A8000F /* Scrollbar.h */; settings = {ATTRIBUTES = (Private, ); }; };
93F199BB08245E59001E9ABC /* WebCoreKeyboardUIMode.h in Headers */ = {isa = PBXBuildFile; fileRef = BE983D95052A2E0A00892D85 /* WebCoreKeyboardUIMode.h */; settings = {ATTRIBUTES = (Private, ); }; };
93F199BE08245E59001E9ABC /* BlockExceptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 65A640F00533BB1F0085E777 /* BlockExceptions.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -3132,7 +3131,6 @@
93F199ED08245E59001E9ABC /* XSLTProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = BC06F24C06D18A7E004A6FA3 /* XSLTProcessor.h */; };
93F199F008245E59001E9ABC /* WebCoreView.h in Headers */ = {isa = PBXBuildFile; fileRef = BE855F7F0701E83500239769 /* WebCoreView.h */; settings = {ATTRIBUTES = (Private, ); }; };
93F19A2608245E59001E9ABC /* CursorMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784F002DE375901EA4122 /* CursorMac.mm */; };
- 93F19A5F08245E59001E9ABC /* WebCoreViewFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = F587855502DE375901EA4122 /* WebCoreViewFactory.m */; };
93F19A9108245E59001E9ABC /* HTMLDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D23B02DE4396018635CA /* HTMLDocument.cpp */; };
93F19A9208245E59001E9ABC /* HTMLElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D23E02DE4396018635CA /* HTMLElement.cpp */; };
93F19A9D08245E59001E9ABC /* TextResourceDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D27802DE43D7018635CA /* TextResourceDecoder.cpp */; };
@@ -12575,8 +12573,6 @@
F55B3DAC1251F12D003EF269 /* WeekInputType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeekInputType.h; sourceTree = "<group>"; };
F58784F002DE375901EA4122 /* CursorMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CursorMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587854C02DE375901EA4122 /* WebCoreFrameView.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreFrameView.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- F587855402DE375901EA4122 /* WebCoreViewFactory.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreViewFactory.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- F587855502DE375901EA4122 /* WebCoreViewFactory.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebCoreViewFactory.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587863A02DE3A1401EA4122 /* Settings.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Settings.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587864902DE3A9A01EA4122 /* CachePolicy.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = CachePolicy.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587866202DE3B1101EA4122 /* SSLKeyGenerator.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = SSLKeyGenerator.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -16143,8 +16139,6 @@
65BF023C0974819000C43196 /* FrameMac.mm */,
1C26497B0D7E24EC00BD10F2 /* PageMac.cpp */,
F587854C02DE375901EA4122 /* WebCoreFrameView.h */,
- F587855402DE375901EA4122 /* WebCoreViewFactory.h */,
- F587855502DE375901EA4122 /* WebCoreViewFactory.m */,
);
path = mac;
sourceTree = "<group>";
@@ -23345,7 +23339,6 @@
93EB169709F880C00091F8FF /* WebCoreSystemInterface.h in Headers */,
37F818FD0D657606005E1F05 /* WebCoreURLResponse.h in Headers */,
93F199F008245E59001E9ABC /* WebCoreView.h in Headers */,
- 93F199B308245E59001E9ABC /* WebCoreViewFactory.h in Headers */,
BC6DADEF0A195FDF00E5CD14 /* WebFontCache.h in Headers */,
A7D20F6D107F438B00A80392 /* WebGLActiveInfo.h in Headers */,
49C7B9C91042D32F0009D447 /* WebGLBuffer.h in Headers */,
@@ -26186,7 +26179,6 @@
93EB169509F880B00091F8FF /* WebCoreSystemInterface.mm in Sources */,
37F818FE0D657606005E1F05 /* WebCoreURLResponse.mm in Sources */,
93F19B0708245E59001E9ABC /* WebCoreView.m in Sources */,
- 93F19A5F08245E59001E9ABC /* WebCoreViewFactory.m in Sources */,
BC6DADFA0A19602B00E5CD14 /* WebFontCache.mm in Sources */,
49C7B9C81042D32F0009D447 /* WebGLBuffer.cpp in Sources */,
6E4E91AE10F7FB3100A2779C /* WebGLContextAttributes.cpp in Sources */,
Modified: trunk/Source/WebCore/editing/mac/FrameSelectionMac.mm (95129 => 95130)
--- trunk/Source/WebCore/editing/mac/FrameSelectionMac.mm 2011-09-14 22:24:23 UTC (rev 95129)
+++ trunk/Source/WebCore/editing/mac/FrameSelectionMac.mm 2011-09-14 22:31:40 UTC (rev 95130)
@@ -29,7 +29,6 @@
#import "AXObjectCache.h"
#import "Frame.h"
#import "RenderView.h"
-#import "WebCoreViewFactory.h"
namespace WebCore {
Modified: trunk/Source/WebCore/page/mac/FrameMac.mm (95129 => 95130)
--- trunk/Source/WebCore/page/mac/FrameMac.mm 2011-09-14 22:24:23 UTC (rev 95129)
+++ trunk/Source/WebCore/page/mac/FrameMac.mm 2011-09-14 22:31:40 UTC (rev 95130)
@@ -50,9 +50,7 @@
#import "RenderTableCell.h"
#import "Scrollbar.h"
#import "SimpleFontData.h"
-#import "WebCoreViewFactory.h"
#import "visible_units.h"
-#import <Carbon/Carbon.h>
#import <wtf/StdLibExtras.h>
@interface NSView (WebCoreHTMLDocumentView)
Deleted: trunk/Source/WebCore/page/mac/WebCoreViewFactory.h (95129 => 95130)
--- trunk/Source/WebCore/page/mac/WebCoreViewFactory.h 2011-09-14 22:24:23 UTC (rev 95129)
+++ trunk/Source/WebCore/page/mac/WebCoreViewFactory.h 2011-09-14 22:31:40 UTC (rev 95130)
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2003, 2005, 2009, 2010 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 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.
- */
-
-@class WebCoreTextMarker;
-@class WebCoreTextMarkerRange;
-
-@protocol WebCoreViewFactory
-
-- (BOOL)objectIsTextMarker:(id)object;
-- (BOOL)objectIsTextMarkerRange:(id)object;
-
-- (WebCoreTextMarker *)textMarkerWithBytes:(const void *)bytes length:(size_t)length;
-- (BOOL)getBytes:(void *)bytes fromTextMarker:(WebCoreTextMarker *)textMarker length:(size_t)length;
-
-- (WebCoreTextMarkerRange *)textMarkerRangeWithStart:(WebCoreTextMarker *)start end:(WebCoreTextMarker *)end;
-- (WebCoreTextMarker *)startOfTextMarkerRange:(WebCoreTextMarkerRange *)range;
-- (WebCoreTextMarker *)endOfTextMarkerRange:(WebCoreTextMarkerRange *)range;
-
-- (void)accessibilityHandleFocusChanged;
-- (CGRect)accessibilityConvertScreenRect:(CGRect)bounds;
-
-- (AXUIElementRef)AXUIElementForElement:(id)element;
-- (void)unregisterUniqueIdForUIElement:(id)element;
-
-@end
-
-@interface WebCoreViewFactory : NSObject
-+ (WebCoreViewFactory *)sharedFactory;
-@end
-
-@interface WebCoreViewFactory (SubclassResponsibility) <WebCoreViewFactory>
-@end
Deleted: trunk/Source/WebCore/page/mac/WebCoreViewFactory.m (95129 => 95130)
--- trunk/Source/WebCore/page/mac/WebCoreViewFactory.m 2011-09-14 22:24:23 UTC (rev 95129)
+++ trunk/Source/WebCore/page/mac/WebCoreViewFactory.m 2011-09-14 22:31:40 UTC (rev 95130)
@@ -1,48 +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.
- */
-#include "config.h"
-#import "WebCoreViewFactory.h"
-#import <wtf/Assertions.h>
-
-@implementation WebCoreViewFactory
-
-static WebCoreViewFactory *sharedFactory;
-
-+ (WebCoreViewFactory *)sharedFactory
-{
- return sharedFactory;
-}
-
-- (id)init
-{
- self = [super init];
-
- ASSERT(!sharedFactory);
- sharedFactory = [self retain];
-
- return self;
-}
-
-@end
Modified: trunk/Source/WebKit/ChangeLog (95129 => 95130)
--- trunk/Source/WebKit/ChangeLog 2011-09-14 22:24:23 UTC (rev 95129)
+++ trunk/Source/WebKit/ChangeLog 2011-09-14 22:31:40 UTC (rev 95130)
@@ -1,3 +1,12 @@
+2011-09-14 Anders Carlsson <[email protected]>
+
+ Get rid of WebCoreViewFactory and its WebViewFactory subclass
+ https://bugs.webkit.org/show_bug.cgi?id=68124
+
+ Reviewed by Sam Weinig.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
2011-08-23 Jonas M. Gastal <[email protected]>
Reviewed by Antonio Gomes.
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (95129 => 95130)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2011-09-14 22:24:23 UTC (rev 95129)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2011-09-14 22:31:40 UTC (rev 95130)
@@ -176,7 +176,6 @@
939810390824BF01008DF038 /* WebPluginPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = 83E4AF4B036659440000E506 /* WebPluginPackage.h */; };
9398103A0824BF01008DF038 /* WebPluginViewFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF860365FE6A00CA2ACA /* WebPluginViewFactory.h */; settings = {ATTRIBUTES = (Public, ); }; };
939810420824BF01008DF038 /* WebJavaScriptTextInputPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = 9345D4EA0365C5B2008635CE /* WebJavaScriptTextInputPanel.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 939810460824BF01008DF038 /* WebViewFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F7174C02885C5B018635CA /* WebViewFactory.h */; settings = {ATTRIBUTES = (); }; };
939810470824BF01008DF038 /* WebKitPrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = F5C283730284676D018635CA /* WebKitPrefix.h */; };
939810490824BF01008DF038 /* WebClipView.h in Headers */ = {isa = PBXBuildFile; fileRef = 933D659903413FF2008635CE /* WebClipView.h */; };
9398104B0824BF01008DF038 /* WebDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 39446070020F50ED0ECA1767 /* WebDataSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -272,7 +271,6 @@
939810DD0824BF01008DF038 /* npapi.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5F717230288493C018635CA /* npapi.mm */; };
939810E30824BF01008DF038 /* WebImageRendererFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 9CE1F8A302A5C6F30ECA2ACD /* WebImageRendererFactory.m */; };
939810E40824BF01008DF038 /* WebJavaScriptTextInputPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9345D4EB0365C5B2008635CE /* WebJavaScriptTextInputPanel.m */; };
- 939810E80824BF01008DF038 /* WebViewFactory.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5F7174D02885C5B018635CA /* WebViewFactory.mm */; };
939810EB0824BF01008DF038 /* WebClipView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 933D659A03413FF2008635CE /* WebClipView.mm */; };
939810ED0824BF01008DF038 /* WebDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 39446071020F50ED0ECA1767 /* WebDataSource.mm */; };
939810EF0824BF01008DF038 /* WebDefaultContextMenuDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5152FADE033FC50400CA2ACD /* WebDefaultContextMenuDelegate.mm */; };
@@ -738,8 +736,6 @@
F5F717200288493C018635CA /* WebPluginDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginDatabase.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F5F717210288493C018635CA /* WebPluginDatabase.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; indentWidth = 4; path = WebPluginDatabase.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F5F717230288493C018635CA /* npapi.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; indentWidth = 4; path = npapi.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- F5F7174C02885C5B018635CA /* WebViewFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebViewFactory.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- F5F7174D02885C5B018635CA /* WebViewFactory.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebViewFactory.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F5F732D202FF4D4F01A80180 /* WebKit.exp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.exports; name = WebKit.exp; path = mac/WebKit.exp; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
F5F81C3902B67C26018635CA /* WebRenderNode.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebRenderNode.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F5F81C3A02B67C26018635CA /* WebRenderNode.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebRenderNode.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -1323,8 +1319,6 @@
A5DEFC0911D5331C00885273 /* WebSecurityOriginPrivate.h */,
93EB178E09F88D510091F8FF /* WebSystemInterface.h */,
93EB178C09F88D460091F8FF /* WebSystemInterface.mm */,
- F5F7174C02885C5B018635CA /* WebViewFactory.h */,
- F5F7174D02885C5B018635CA /* WebViewFactory.mm */,
);
name = WebCoreSupport;
path = mac/WebCoreSupport;
@@ -1605,7 +1599,6 @@
C0C5B3EE1177A4A0002B0AEF /* WebUserContentURLPattern.h in Headers */,
939810700824BF01008DF038 /* WebView.h in Headers */,
BC2E464D0FD8A96800A9D9DE /* WebViewData.h in Headers */,
- 939810460824BF01008DF038 /* WebViewFactory.h in Headers */,
9398109B0824BF01008DF038 /* WebViewInternal.h in Headers */,
939810710824BF01008DF038 /* WebViewPrivate.h in Headers */,
41F4484F10338E8C0030E55E /* WebWorkersPrivate.h in Headers */,
@@ -1982,7 +1975,6 @@
939811070824BF01008DF038 /* WebView.mm in Sources */,
BC2E464E0FD8A96800A9D9DE /* WebViewData.mm in Sources */,
BC97E7E210963D260010D361 /* WebViewEventHandling.mm in Sources */,
- 939810E80824BF01008DF038 /* WebViewFactory.mm in Sources */,
41F4485010338E8C0030E55E /* WebWorkersPrivate.mm in Sources */,
A5DEFC0A11D5331C00885273 /* WebSecurityOrigin.mm in Sources */,
A5DEFC1011D5343E00885273 /* WebDatabaseQuotaManager.mm in Sources */,
Modified: trunk/Source/WebKit/mac/ChangeLog (95129 => 95130)
--- trunk/Source/WebKit/mac/ChangeLog 2011-09-14 22:24:23 UTC (rev 95129)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-09-14 22:31:40 UTC (rev 95130)
@@ -1,3 +1,16 @@
+2011-09-14 Anders Carlsson <[email protected]>
+
+ Get rid of WebCoreViewFactory and its WebViewFactory subclass
+ https://bugs.webkit.org/show_bug.cgi?id=68124
+
+ Reviewed by Sam Weinig.
+
+ * WebCoreSupport/WebContextMenuClient.mm:
+ * WebCoreSupport/WebViewFactory.h: Removed.
+ * WebCoreSupport/WebViewFactory.mm: Removed.
+ * WebView/WebFrameView.mm:
+ (-[WebFrameView initWithFrame:]):
+
2011-09-14 Mark Hahnenberg <[email protected]>
Unzip initialization lists and constructors in JSCell hierarchy (6/7)
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm (95129 => 95130)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2011-09-14 22:24:23 UTC (rev 95129)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2011-09-14 22:31:40 UTC (rev 95130)
@@ -39,7 +39,6 @@
#import "WebUIDelegate.h"
#import "WebUIDelegatePrivate.h"
#import "WebView.h"
-#import "WebViewFactory.h"
#import "WebViewInternal.h"
#import <WebCore/ContextMenu.h>
#import <WebCore/ContextMenuController.h>
Deleted: trunk/Source/WebKit/mac/WebCoreSupport/WebViewFactory.h (95129 => 95130)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebViewFactory.h 2011-09-14 22:24:23 UTC (rev 95129)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebViewFactory.h 2011-09-14 22:31:40 UTC (rev 95130)
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2005 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.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE 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 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.
- */
-
-#import <WebCore/WebCoreViewFactory.h>
-
-@interface WebViewFactory : WebCoreViewFactory <WebCoreViewFactory>
-
-+ (void)createSharedFactory;
-
-@end
Deleted: trunk/Source/WebKit/mac/WebCoreSupport/WebViewFactory.mm (95129 => 95130)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebViewFactory.mm 2011-09-14 22:24:23 UTC (rev 95129)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebViewFactory.mm 2011-09-14 22:31:40 UTC (rev 95130)
@@ -1,136 +0,0 @@
-/*
- * Copyright (C) 2005, 2009 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.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE 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 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.
- */
-
-#import <WebKit/WebViewFactory.h>
-
-#import <WebKit/WebFrameInternal.h>
-#import <WebKit/WebViewInternal.h>
-#import <WebKit/WebHTMLViewInternal.h>
-#import <WebKit/WebNSUserDefaultsExtras.h>
-#import <WebKit/WebNSObjectExtras.h>
-#import <WebKit/WebNSViewExtras.h>
-#import <WebKitSystemInterface.h>
-#import <wtf/Assertions.h>
-
-@interface NSMenu (WebViewFactoryAdditions)
-- (NSMenuItem *)addItemWithTitle:(NSString *)title action:(SEL)action tag:(int)tag;
-@end
-
-@implementation NSMenu (WebViewFactoryAdditions)
-
-- (NSMenuItem *)addItemWithTitle:(NSString *)title action:(SEL)action tag:(int)tag
-{
- NSMenuItem *item = [[[NSMenuItem alloc] initWithTitle:title action:action keyEquivalent:@""] autorelease];
- [item setTag:tag];
- [self addItem:item];
- return item;
-}
-
-@end
-
-@implementation WebViewFactory
-
-+ (void)createSharedFactory
-{
- if (![self sharedFactory]) {
- [[[self alloc] init] release];
- }
- ASSERT([[self sharedFactory] isKindOfClass:self]);
-}
-
-- (BOOL)objectIsTextMarker:(id)object
-{
- return object != nil && CFGetTypeID(object) == WKGetAXTextMarkerTypeID();
-}
-
-- (BOOL)objectIsTextMarkerRange:(id)object
-{
- return object != nil && CFGetTypeID(object) == WKGetAXTextMarkerRangeTypeID();
-}
-
-- (WebCoreTextMarker *)textMarkerWithBytes:(const void *)bytes length:(size_t)length
-{
- return WebCFAutorelease(WKCreateAXTextMarker(bytes, length));
-}
-
-- (BOOL)getBytes:(void *)bytes fromTextMarker:(WebCoreTextMarker *)textMarker length:(size_t)length
-{
- return WKGetBytesFromAXTextMarker(textMarker, bytes, length);
-}
-
-- (WebCoreTextMarkerRange *)textMarkerRangeWithStart:(WebCoreTextMarker *)start end:(WebCoreTextMarker *)end
-{
- ASSERT(start != nil);
- ASSERT(end != nil);
- ASSERT(CFGetTypeID(start) == WKGetAXTextMarkerTypeID());
- ASSERT(CFGetTypeID(end) == WKGetAXTextMarkerTypeID());
- return WebCFAutorelease(WKCreateAXTextMarkerRange(start, end));
-}
-
-- (WebCoreTextMarker *)startOfTextMarkerRange:(WebCoreTextMarkerRange *)range
-{
- ASSERT(range != nil);
- ASSERT(CFGetTypeID(range) == WKGetAXTextMarkerRangeTypeID());
- return WebCFAutorelease(WKCopyAXTextMarkerRangeStart(range));
-}
-
-- (WebCoreTextMarker *)endOfTextMarkerRange:(WebCoreTextMarkerRange *)range
-{
- ASSERT(range != nil);
- ASSERT(CFGetTypeID(range) == WKGetAXTextMarkerRangeTypeID());
- return WebCFAutorelease(WKCopyAXTextMarkerRangeEnd(range));
-}
-
-- (void)accessibilityHandleFocusChanged
-{
- WKAccessibilityHandleFocusChanged();
-}
-
-- (AXUIElementRef)AXUIElementForElement:(id)element
-{
- return WKCreateAXUIElementRef(element);
-}
-
-- (CGRect)accessibilityConvertScreenRect:(CGRect)bounds
-{
- NSArray *screens = [NSScreen screens];
- if ([screens count]) {
- CGFloat screenHeight = NSHeight([(NSScreen *)[screens objectAtIndex:0] frame]);
- bounds.origin.y = (screenHeight - (bounds.origin.y + bounds.size.height));
- } else
- bounds = CGRectZero;
-
- return bounds;
-}
-
-- (void)unregisterUniqueIdForUIElement:(id)element
-{
- WKUnregisterUniqueIdForElement(element);
-}
-
-@end
Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.mm (95129 => 95130)
--- trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2011-09-14 22:24:23 UTC (rev 95129)
+++ trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2011-09-14 22:31:40 UTC (rev 95130)
@@ -51,7 +51,6 @@
#import "WebPreferenceKeysPrivate.h"
#import "WebResourceInternal.h"
#import "WebSystemInterface.h"
-#import "WebViewFactory.h"
#import "WebViewInternal.h"
#import "WebViewPrivate.h"
#import <Foundation/NSURLRequest.h>
@@ -318,8 +317,6 @@
// Note: We also do this in WebHistoryItem's init method.
WebCore::notifyHistoryItemChanged = WKNotifyHistoryItemChanged;
- [WebViewFactory createSharedFactory];
-
// FIXME: Remove the NSAppKitVersionNumberWithDeferredWindowDisplaySupport check once
// once AppKit's Deferred Window Display support is available.
#if defined(BUILDING_ON_LEOPARD) || !defined(NSAppKitVersionNumberWithDeferredWindowDisplaySupport)
