Source/JavaScriptCore: JavaScriptCore part of [mac] WebKit contains Objective-C class...
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 19 Sep 2011 18:36:16 +0000 (18:36 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 19 Sep 2011 18:36:16 +0000 (18:36 +0000)
https://bugs.webkit.org/show_bug.cgi?id=68323

Reviewed by Sam Weinig.

Renamed WTFMainThreadCaller to JSWTFMainThreadCaller.

* wtf/mac/MainThreadMac.mm:
(WTF::initializeMainThreadPlatform):
(WTF::initializeMainThreadToProcessMainThreadPlatform):

Source/WebCore: WebCore part of [mac] WebKit contains Objective-C classes that are not prefixed with its standard prefixes
https://bugs.webkit.org/show_bug.cgi?id=68323

Reviewed by Sam Weinig.

Renamed AccessibilityObjectWrapper to WebAccessibilityObjectWrapper.
Renamed CascadeList to WebCascadeList.
Renamed CookieStorageObjCAdapter to WebCookieStorageObjCAdapter.
Renamed LanguageChangeObserver to WebLanguageChangeObserver.
Renamed ScrollAnimationHelperDelegate to WebScrollAnimationHelperDelegate.
Renamed ScrollbarPainterControllerDelegate to WebScrollbarPainterControllerDelegate.
Renamed ScrollbarPainterDelegate to WebScrollbarPainterDelegate.
Renamed ScrollbarPartAnimation to WebScrollbarPartAnimation.
Renamed ScrollbarPrefsObserver to WebScrollbarPrefsObserver.

* WebCore.gyp/WebCore.gyp: Updated for the renaming of CascadeList to WebCascadeList.
* WebCore.xcodeproj/project.pbxproj:
* accessibility/AccessibilityObject.h:
* accessibility/mac/AXObjectCacheMac.mm:
(WebCore::AXObjectCache::attachWrapper):
* accessibility/mac/AccessibilityObjectMac.mm:
* accessibility/mac/AccessibilityObjectWrapper.h: Removed.
* accessibility/mac/AccessibilityObjectWrapper.mm: Removed.
* accessibility/mac/WebAccessibilityObjectWrapper.h: Copied from Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.h.
* accessibility/mac/WebAccessibilityObjectWrapper.mm: Copied from Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm.
(convertToNSArray):
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]):
(-[WebAccessibilityObjectWrapper accessibilityIndexOfChild:]):
(-[WebAccessibilityObjectWrapper accessibilityArrayAttributeValues:index:maxCount:]):
* platform/graphics/mac/ComplexTextControllerCoreText.mm:
(WebCore::ComplexTextController::collectComplexTextRunsForCharactersCoreText):
* platform/mac/Language.mm:
(WebCore::platformDefaultLanguage):
* platform/mac/ScrollAnimatorMac.h:
* platform/mac/ScrollAnimatorMac.mm:
(-[WebScrollbarPainterDelegate setUpAnimation:scrollerPainter:part:WebCore::animateAlphaTo:duration:]):
(WebCore::ScrollAnimatorMac::ScrollAnimatorMac):
* platform/mac/ScrollbarThemeMac.mm:
(WebCore::ScrollbarThemeMac::ScrollbarThemeMac):
* platform/network/mac/CookieStorageMac.mm:
(WebCore::startObservingCookieChanges):

Source/WebKit: WebKit part of [mac] WebKit contains Objective-C classes that are not prefixed with its standard prefixes
https://bugs.webkit.org/show_bug.cgi?id=68323

Reviewed by Sam Weinig.

Updated for the renaming of NonBlockingPanel to WebNonBlockingPanel.

* English.lproj/WebJavaScriptTextInputPanel.nib/classes.nib: Removed.
* English.lproj/WebJavaScriptTextInputPanel.nib/designable.nib: Added.
* English.lproj/WebJavaScriptTextInputPanel.nib/info.nib: Removed.
* English.lproj/WebJavaScriptTextInputPanel.nib/keyedobjects.nib:

Source/WebKit/mac: WebKit part of [mac] WebKit contains Objective-C classes that are not prefixed with its standard prefixes
https://bugs.webkit.org/show_bug.cgi?id=68323

Reviewed by Sam Weinig.

Renamed NonBlockingPanel to WebNonBlockingPanel.
Renamed ThreadEnabler to WebCocoaThreadingEnabler.
Renamed PDFPrefUpdatingProxy to WebPDFPrefUpdatingProxy.

* Misc/WebIconDatabase.mm:
(+[WebCocoaThreadingEnabler enableThreading]):
(importToWebCoreFormat):
* Panels/English.lproj/WebAuthenticationPanel.nib/designable.nib:
* Panels/English.lproj/WebAuthenticationPanel.nib/keyedobjects.nib:
* Panels/WebAuthenticationPanel.h:
* Panels/WebAuthenticationPanel.m: Renamed NonBlockingPanel to
WebNonBlockingPanel. Because Safari 5.1 uses NonBlockingPanel, this will
cause nightly builds to log an error message when showing the Safari
HTTP authentication sheet and disable the Quit command while the sheet
is disaplyed.
* WebView/WebPDFView.mm:
(-[WebPDFView initWithFrame:]):
(-[WebPDFView _updatePreferencesSoon]):

Source/WebKit2: WebKit2 part of [mac] WebKit contains Objective-C classes that are not prefixed with its standard prefixes
https://bugs.webkit.org/show_bug.cgi?id=68323

Reviewed by Sam Weinig.

Renamed FullKeyboardAccessWatcher to WKFullKeyboardAccessWatcher.
Renamed AccessibilityWebPageObject to WKAccessibilityWebPageObject.

* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/mac/AccessibilityWebPageObject.h: Removed.
* WebProcess/WebPage/mac/AccessibilityWebPageObject.mm: Removed.
* WebProcess/WebPage/mac/WKAccessibilityWebPageObject.h: Copied from Source/WebKit2/WebProcess/WebPage/mac/AccessibilityWebPageObject.h.
* WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm: Copied from Source/WebKit2/WebProcess/WebPage/mac/AccessibilityWebPageObject.mm.
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::platformInitialize):
(WebKit::WebPage::accessibilityRemoteObject):
* WebProcess/mac/FullKeyboardAccessWatcher.h: Removed.
* WebProcess/mac/FullKeyboardAccessWatcher.mm: Removed.
* WebProcess/mac/WKFullKeyboardAccessWatcher.h: Copied from Source/WebKit2/WebProcess/mac/FullKeyboardAccessWatcher.h.
* WebProcess/mac/WKFullKeyboardAccessWatcher.mm: Copied from Source/WebKit2/WebProcess/mac/FullKeyboardAccessWatcher.mm.
(+[WKFullKeyboardAccessWatcher fullKeyboardAccessEnabled]):
* WebProcess/mac/WebProcessMac.mm:
(WebKit::WebProcess::fullKeyboardAccessEnabled):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@95448 268f45cc-cd09-0410-ab3c-d52691b4dbfc

37 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/wtf/mac/MainThreadMac.mm
Source/WebCore/ChangeLog
Source/WebCore/WebCore.gyp/WebCore.gyp
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/accessibility/AccessibilityObject.h
Source/WebCore/accessibility/mac/AXObjectCacheMac.mm
Source/WebCore/accessibility/mac/AccessibilityObjectMac.mm
Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.h [moved from Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.h with 91% similarity]
Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm [moved from Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm with 99% similarity]
Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm
Source/WebCore/platform/mac/Language.mm
Source/WebCore/platform/mac/ScrollAnimatorMac.h
Source/WebCore/platform/mac/ScrollAnimatorMac.mm
Source/WebCore/platform/mac/ScrollbarThemeMac.mm
Source/WebCore/platform/network/mac/CookieStorageMac.mm
Source/WebKit/ChangeLog
Source/WebKit/English.lproj/WebJavaScriptTextInputPanel.nib/classes.nib [deleted file]
Source/WebKit/English.lproj/WebJavaScriptTextInputPanel.nib/designable.nib [new file with mode: 0644]
Source/WebKit/English.lproj/WebJavaScriptTextInputPanel.nib/info.nib [deleted file]
Source/WebKit/English.lproj/WebJavaScriptTextInputPanel.nib/keyedobjects.nib
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Misc/WebIconDatabase.mm
Source/WebKit/mac/Panels/English.lproj/WebAuthenticationPanel.nib/designable.nib
Source/WebKit/mac/Panels/English.lproj/WebAuthenticationPanel.nib/keyedobjects.nib
Source/WebKit/mac/Panels/WebAuthenticationPanel.h
Source/WebKit/mac/Panels/WebAuthenticationPanel.m
Source/WebKit/mac/WebView/WebPDFView.mm
Source/WebKit2/ChangeLog
Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
Source/WebKit2/WebProcess/WebPage/WebPage.h
Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.h [moved from Source/WebKit2/WebProcess/WebPage/mac/AccessibilityWebPageObject.h with 90% similarity]
Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm [moved from Source/WebKit2/WebProcess/WebPage/mac/AccessibilityWebPageObject.mm with 98% similarity]
Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm
Source/WebKit2/WebProcess/mac/WKFullKeyboardAccessWatcher.h [moved from Source/WebKit2/WebProcess/mac/FullKeyboardAccessWatcher.h with 89% similarity]
Source/WebKit2/WebProcess/mac/WKFullKeyboardAccessWatcher.mm [moved from Source/WebKit2/WebProcess/mac/FullKeyboardAccessWatcher.mm with 93% similarity]
Source/WebKit2/WebProcess/mac/WebProcessMac.mm

index ac567c6213b9c8a5eb82ce8fd136f5f1fa313786..18bfcdc3e7c0f5c8eb3497745f17e17618be28d4 100644 (file)
@@ -1,3 +1,16 @@
+2011-09-19  Dan Bernstein  <mitz@apple.com>
+
+        JavaScriptCore part of [mac] WebKit contains Objective-C classes that are not prefixed with its standard prefixes
+        https://bugs.webkit.org/show_bug.cgi?id=68323
+
+        Reviewed by Sam Weinig.
+
+        Renamed WTFMainThreadCaller to JSWTFMainThreadCaller.
+
+        * wtf/mac/MainThreadMac.mm:
+        (WTF::initializeMainThreadPlatform):
+        (WTF::initializeMainThreadToProcessMainThreadPlatform):
+
 2011-09-19  Oliver Hunt  <oliver@apple.com>
 
         Remove direct property slot pointers from the instruction stream
index 82b9dcedfed5d72f829940f217f39215ba276ca1..69da3969ab35202b93103119c94c3890bdac5879 100644 (file)
 #import <wtf/Assertions.h>
 #import <wtf/Threading.h>
 
-@interface WTFMainThreadCaller : NSObject {
+@interface JSWTFMainThreadCaller : NSObject {
 }
 - (void)call;
 @end
 
-@implementation WTFMainThreadCaller
+@implementation JSWTFMainThreadCaller
 
 - (void)call
 {
     WTF::dispatchFunctionsFromMainThread();
 }
 
-@end // implementation WTFMainThreadCaller
+@end // implementation JSWTFMainThreadCaller
 
 namespace WTF {
 
-static WTFMainThreadCaller* staticMainThreadCaller;
+static JSWTFMainThreadCaller* staticMainThreadCaller;
 static bool isTimerPosted; // This is only accessed on the 'main' thread.
 static bool mainThreadEstablishedAsPthreadMain;
 static pthread_t mainThreadPthread;
@@ -60,7 +60,7 @@ static NSThread* mainThreadNSThread;
 void initializeMainThreadPlatform()
 {
     ASSERT(!staticMainThreadCaller);
-    staticMainThreadCaller = [[WTFMainThreadCaller alloc] init];
+    staticMainThreadCaller = [[JSWTFMainThreadCaller alloc] init];
 
     mainThreadEstablishedAsPthreadMain = false;
     mainThreadPthread = pthread_self();
@@ -73,7 +73,7 @@ void initializeMainThreadToProcessMainThreadPlatform()
         NSLog(@"WebKit Threading Violation - initial use of WebKit from a secondary thread.");
 
     ASSERT(!staticMainThreadCaller);
-    staticMainThreadCaller = [[WTFMainThreadCaller alloc] init];
+    staticMainThreadCaller = [[JSWTFMainThreadCaller alloc] init];
 
     mainThreadEstablishedAsPthreadMain = true;
     mainThreadPthread = 0;
index cf179c0c4dfbd6afa779cde2850d58fb26bbf936..bb4ffd7539bad6224f7234abc6a4f8fec85be815 100644 (file)
@@ -1,3 +1,47 @@
+2011-09-19  Dan Bernstein  <mitz@apple.com>
+
+        WebCore part of [mac] WebKit contains Objective-C classes that are not prefixed with its standard prefixes
+        https://bugs.webkit.org/show_bug.cgi?id=68323
+
+        Reviewed by Sam Weinig.
+
+        Renamed AccessibilityObjectWrapper to WebAccessibilityObjectWrapper.
+        Renamed CascadeList to WebCascadeList.
+        Renamed CookieStorageObjCAdapter to WebCookieStorageObjCAdapter.
+        Renamed LanguageChangeObserver to WebLanguageChangeObserver.
+        Renamed ScrollAnimationHelperDelegate to WebScrollAnimationHelperDelegate.
+        Renamed ScrollbarPainterControllerDelegate to WebScrollbarPainterControllerDelegate.
+        Renamed ScrollbarPainterDelegate to WebScrollbarPainterDelegate.
+        Renamed ScrollbarPartAnimation to WebScrollbarPartAnimation.
+        Renamed ScrollbarPrefsObserver to WebScrollbarPrefsObserver.
+
+        * WebCore.gyp/WebCore.gyp: Updated for the renaming of CascadeList to WebCascadeList.
+        * WebCore.xcodeproj/project.pbxproj:
+        * accessibility/AccessibilityObject.h:
+        * accessibility/mac/AXObjectCacheMac.mm:
+        (WebCore::AXObjectCache::attachWrapper):
+        * accessibility/mac/AccessibilityObjectMac.mm:
+        * accessibility/mac/AccessibilityObjectWrapper.h: Removed.
+        * accessibility/mac/AccessibilityObjectWrapper.mm: Removed.
+        * accessibility/mac/WebAccessibilityObjectWrapper.h: Copied from Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.h.
+        * accessibility/mac/WebAccessibilityObjectWrapper.mm: Copied from Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm.
+        (convertToNSArray):
+        (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]):
+        (-[WebAccessibilityObjectWrapper accessibilityIndexOfChild:]):
+        (-[WebAccessibilityObjectWrapper accessibilityArrayAttributeValues:index:maxCount:]):
+        * platform/graphics/mac/ComplexTextControllerCoreText.mm:
+        (WebCore::ComplexTextController::collectComplexTextRunsForCharactersCoreText):
+        * platform/mac/Language.mm:
+        (WebCore::platformDefaultLanguage):
+        * platform/mac/ScrollAnimatorMac.h:
+        * platform/mac/ScrollAnimatorMac.mm:
+        (-[WebScrollbarPainterDelegate setUpAnimation:scrollerPainter:part:WebCore::animateAlphaTo:duration:]):
+        (WebCore::ScrollAnimatorMac::ScrollAnimatorMac):
+        * platform/mac/ScrollbarThemeMac.mm:
+        (WebCore::ScrollbarThemeMac::ScrollbarThemeMac):
+        * platform/network/mac/CookieStorageMac.mm:
+        (WebCore::startObservingCookieChanges):
+
 2011-09-19  Cary Clark  <caryclark@google.com>
 
         Move fontDataForCombiningCharacterSequence to fix Skia on Mac build
index 7eea09f72f6ec3abf4d740f5d556049d0124d33a..28c47acb68f48c5a1a7c7cb66ce238599b5546e0 100644 (file)
               # If this is unhandled, the console will receive log messages
               # such as:
               # com.google.Chrome[] objc[]: Class ScrollbarPrefsObserver is implemented in both .../Google Chrome.app/Contents/Versions/.../Google Chrome Helper.app/Contents/MacOS/../../../Google Chrome Framework.framework/Google Chrome Framework and /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCore.framework/Versions/A/WebCore. One of the two will be used. Which one is undefined.
-              'CascadeList=ChromiumWebCoreObjCCascadeList',
+              'WebCascadeList=ChromiumWebCoreObjCWebCascadeList',
               'ScrollbarPrefsObserver=ChromiumWebCoreObjCScrollbarPrefsObserver',
               'WebCoreRenderThemeNotificationObserver=ChromiumWebCoreObjCWebCoreRenderThemeNotificationObserver',
               'WebFontCache=ChromiumWebCoreObjCWebFontCache',
index fefee184ea6ab60fec471301e52574be26d1ae8a..7371ef334f92ee830eb9daab655d825a0d3a75ff 100644 (file)
                29A812420FBB9C1D00510293 /* AccessibilityListBoxOption.h in Headers */ = {isa = PBXBuildFile; fileRef = 29A812240FBB9C1D00510293 /* AccessibilityListBoxOption.h */; };
                29A812430FBB9C1D00510293 /* AccessibilityListBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 29A812250FBB9C1D00510293 /* AccessibilityListBox.h */; };
                29A812480FBB9CA900510293 /* AccessibilityObjectMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29A812440FBB9CA900510293 /* AccessibilityObjectMac.mm */; };
-               29A812490FBB9CA900510293 /* AccessibilityObjectWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 29A812450FBB9CA900510293 /* AccessibilityObjectWrapper.h */; };
-               29A8124A0FBB9CA900510293 /* AccessibilityObjectWrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29A812460FBB9CA900510293 /* AccessibilityObjectWrapper.mm */; };
+               29A812490FBB9CA900510293 /* WebAccessibilityObjectWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 29A812450FBB9CA900510293 /* WebAccessibilityObjectWrapper.h */; };
+               29A8124A0FBB9CA900510293 /* WebAccessibilityObjectWrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29A812460FBB9CA900510293 /* WebAccessibilityObjectWrapper.mm */; };
                29A8124B0FBB9CA900510293 /* AXObjectCacheMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29A812470FBB9CA900510293 /* AXObjectCacheMac.mm */; };
                2BE8E2C712A589EC00FAD550 /* HTMLMetaCharsetParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BE8E2C612A589EC00FAD550 /* HTMLMetaCharsetParser.h */; };
                2BE8E2C912A58A0100FAD550 /* HTMLMetaCharsetParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BE8E2C812A58A0100FAD550 /* HTMLMetaCharsetParser.cpp */; };
                29A812240FBB9C1D00510293 /* AccessibilityListBoxOption.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityListBoxOption.h; sourceTree = "<group>"; };
                29A812250FBB9C1D00510293 /* AccessibilityListBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityListBox.h; sourceTree = "<group>"; };
                29A812440FBB9CA900510293 /* AccessibilityObjectMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AccessibilityObjectMac.mm; sourceTree = "<group>"; };
-               29A812450FBB9CA900510293 /* AccessibilityObjectWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityObjectWrapper.h; sourceTree = "<group>"; };
-               29A812460FBB9CA900510293 /* AccessibilityObjectWrapper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AccessibilityObjectWrapper.mm; sourceTree = "<group>"; };
+               29A812450FBB9CA900510293 /* WebAccessibilityObjectWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebAccessibilityObjectWrapper.h; sourceTree = "<group>"; };
+               29A812460FBB9CA900510293 /* WebAccessibilityObjectWrapper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebAccessibilityObjectWrapper.mm; sourceTree = "<group>"; };
                29A812470FBB9CA900510293 /* AXObjectCacheMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AXObjectCacheMac.mm; sourceTree = "<group>"; };
                2BE8E2C612A589EC00FAD550 /* HTMLMetaCharsetParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLMetaCharsetParser.h; path = parser/HTMLMetaCharsetParser.h; sourceTree = "<group>"; };
                2BE8E2C812A58A0100FAD550 /* HTMLMetaCharsetParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HTMLMetaCharsetParser.cpp; path = parser/HTMLMetaCharsetParser.cpp; sourceTree = "<group>"; };
                        isa = PBXGroup;
                        children = (
                                29A812440FBB9CA900510293 /* AccessibilityObjectMac.mm */,
-                               29A812450FBB9CA900510293 /* AccessibilityObjectWrapper.h */,
-                               29A812460FBB9CA900510293 /* AccessibilityObjectWrapper.mm */,
                                29A812470FBB9CA900510293 /* AXObjectCacheMac.mm */,
+                               29A812450FBB9CA900510293 /* WebAccessibilityObjectWrapper.h */,
+                               29A812460FBB9CA900510293 /* WebAccessibilityObjectWrapper.mm */,
                        );
                        path = mac;
                        sourceTree = "<group>";
                                76CDD2F71103DA6600680521 /* AccessibilityMenuListOption.h in Headers */,
                                76CDD2F51103DA6600680521 /* AccessibilityMenuListPopup.h in Headers */,
                                29A812360FBB9C1D00510293 /* AccessibilityObject.h in Headers */,
-                               29A812490FBB9CA900510293 /* AccessibilityObjectWrapper.h in Headers */,
+                               29A812490FBB9CA900510293 /* WebAccessibilityObjectWrapper.h in Headers */,
                                A409C985116D0DDD007197BD /* AccessibilityProgressIndicator.h in Headers */,
                                29A812390FBB9C1D00510293 /* AccessibilityRenderObject.h in Headers */,
                                93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */,
                                76CDD2F61103DA6600680521 /* AccessibilityMenuListOption.cpp in Sources */,
                                76CDD2F41103DA6600680521 /* AccessibilityMenuListPopup.cpp in Sources */,
                                29A812480FBB9CA900510293 /* AccessibilityObjectMac.mm in Sources */,
-                               29A8124A0FBB9CA900510293 /* AccessibilityObjectWrapper.mm in Sources */,
+                               29A8124A0FBB9CA900510293 /* WebAccessibilityObjectWrapper.mm in Sources */,
                                A409C984116D0DDD007197BD /* AccessibilityProgressIndicator.cpp in Sources */,
                                B5D31DFA11CF610B009F22B4 /* ActiveDOMCallback.cpp in Sources */,
                                E1C4DE6E0EA75C650023CCD6 /* ActiveDOMObject.cpp in Sources */,
index d114fe9e82963542df0eb5f00211ded60e47495f..3bc04df5ace52e9de9d44914457b622829bd2b64 100644 (file)
@@ -49,7 +49,6 @@
 typedef struct _NSRange NSRange;
 
 #ifdef __OBJC__
-@class AccessibilityObjectWrapper;
 @class NSArray;
 @class NSAttributedString;
 @class NSData;
@@ -57,6 +56,7 @@ typedef struct _NSRange NSRange;
 @class NSString;
 @class NSValue;
 @class NSView;
+@class WebAccessibilityObjectWrapper;
 #else
 class NSArray;
 class NSAttributedString;
@@ -68,11 +68,17 @@ class NSView;
 #if PLATFORM(GTK)
 typedef struct _AtkObject AtkObject;
 typedef struct _AtkObject AccessibilityObjectWrapper;
+#elif PLATFORM(MAC)
+class WebAccessibilityObjectWrapper;
 #else
 class AccessibilityObjectWrapper;
 #endif
 #endif
 
+#if PLATFORM(MAC)
+typedef WebAccessibilityObjectWrapper AccessibilityObjectWrapper;
+#endif
+
 namespace WebCore {
 
 class AccessibilityObject;
@@ -683,7 +689,7 @@ protected:
 #endif
 
 #if PLATFORM(MAC)
-    RetainPtr<AccessibilityObjectWrapper> m_wrapper;
+    RetainPtr<WebAccessibilityObjectWrapper> m_wrapper;
 #elif PLATFORM(WIN) && !OS(WINCE)
     COMPtr<AccessibilityObjectWrapper> m_wrapper;
 #elif PLATFORM(GTK)
index b2a89a0e65766fe99823d75aa0f9c75f74c401af..eca545c5ef0fa821b299b60adcea812ba7c842ea 100644 (file)
@@ -29,8 +29,8 @@
 #if HAVE(ACCESSIBILITY)
 
 #import "AccessibilityObject.h"
-#import "AccessibilityObjectWrapper.h"
 #import "RenderObject.h"
+#import "WebAccessibilityObjectWrapper.h"
 #import "WebCoreSystemInterface.h"
 
 #import <wtf/PassRefPtr.h>
@@ -51,7 +51,7 @@ void AXObjectCache::detachWrapper(AccessibilityObject* obj)
 
 void AXObjectCache::attachWrapper(AccessibilityObject* obj)
 {
-    RetainPtr<AccessibilityObjectWrapper> wrapper(AdoptNS, [[AccessibilityObjectWrapper alloc] initWithAccessibilityObject:obj]);
+    RetainPtr<WebAccessibilityObjectWrapper> wrapper(AdoptNS, [[WebAccessibilityObjectWrapper alloc] initWithAccessibilityObject:obj]);
     obj->setWrapper(wrapper.get());
 }
 
index 5c3ee39be2b61616096eb43881702ab7e6f301e2..169a2ee3c41377574e04e28934f3ae4520ceb193 100644 (file)
@@ -28,7 +28,7 @@
 
 #if HAVE(ACCESSIBILITY)
 
-#import "AccessibilityObjectWrapper.h"
+#import "WebAccessibilityObjectWrapper.h"
 #import "Widget.h"
 
 namespace WebCore {
similarity index 91%
rename from Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.h
rename to Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.h
index 2d29e1ed8afeddced40758ed43f29e0b83e141e6..984f7fa3f78d7d1aefa98f4536bd516d67db2fdc 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef AccessibilityObjectWrapper_h
-#define AccessibilityObjectWrapper_h
+#ifndef WebAccessibilityObjectWrapper_h
+#define WebAccessibilityObjectWrapper_h
 
 namespace WebCore {
 class AccessibilityObject;
 class VisiblePosition;
 }
 
-@interface AccessibilityObjectWrapper : NSObject {
+@interface WebAccessibilityObjectWrapper : NSObject {
     WebCore::AccessibilityObject* m_object;
 }
  
@@ -49,4 +49,4 @@ class VisiblePosition;
 
 @end
 
-#endif // AccessibilityObjectWrapper_h
+#endif // WebAccessibilityObjectWrapper_h
similarity index 99%
rename from Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
rename to Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm
index 03bb6b25848ee3b425c1fb16e97e6f73e9f0fa57..9d536c26d588e5476a7c226195a59783bcd27c82 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #import "config.h"
-#import "AccessibilityObjectWrapper.h"
+#import "WebAccessibilityObjectWrapper.h"
 
 #if HAVE(ACCESSIBILITY)
 
@@ -334,7 +334,7 @@ using namespace std;
 
 @end
 
-@implementation AccessibilityObjectWrapper
+@implementation WebAccessibilityObjectWrapper
 
 - (id)initWithAccessibilityObject:(AccessibilityObject*)axObject
 {
@@ -1347,7 +1347,7 @@ static NSMutableArray* convertToNSArray(const AccessibilityObject::Accessibility
     unsigned length = vector.size();
     NSMutableArray* array = [NSMutableArray arrayWithCapacity: length];
     for (unsigned i = 0; i < length; ++i) {
-        AccessibilityObjectWrapper* wrapper = vector[i]->wrapper();
+        WebAccessibilityObjectWrapper* wrapper = vector[i]->wrapper();
         ASSERT(wrapper);
         if (wrapper) {
             // we want to return the attachment view instead of the object representing the attachment.
@@ -2745,8 +2745,8 @@ static RenderObject* rendererForView(NSView* view)
     else if (AXObjectIsTextMarkerRange(parameter))
         textMarkerRange = parameter;
 
-    else if ([parameter isKindOfClass:[AccessibilityObjectWrapper self]])
-        uiElement = [(AccessibilityObjectWrapper*)parameter accessibilityObject];
+    else if ([parameter isKindOfClass:[WebAccessibilityObjectWrapper self]])
+        uiElement = [(WebAccessibilityObjectWrapper*)parameter accessibilityObject];
 
     else if ([parameter isKindOfClass:[NSNumber self]])
         number = parameter;
@@ -2772,8 +2772,8 @@ static RenderObject* rendererForView(NSView* view)
     // dispatch
     if ([attribute isEqualToString:NSAccessibilityUIElementsForSearchPredicateParameterizedAttribute]) {
         AccessibilityObject* axStartObject = 0;
-        if ([[dictionary objectForKey:@"AXStartElement"] isKindOfClass:[AccessibilityObjectWrapper self]])
-            axStartObject = [(AccessibilityObjectWrapper*)[dictionary objectForKey:@"AXStartElement"] accessibilityObject];
+        if ([[dictionary objectForKey:@"AXStartElement"] isKindOfClass:[WebAccessibilityObjectWrapper self]])
+            axStartObject = [(WebAccessibilityObjectWrapper*)[dictionary objectForKey:@"AXStartElement"] accessibilityObject];
         
         AccessibilitySearchDirection axSearchDirection = SearchDirectionNext;
         if ([[dictionary objectForKey:@"AXDirection"] isKindOfClass:[NSString self]])
@@ -3080,7 +3080,7 @@ static RenderObject* rendererForView(NSView* view)
     
     unsigned count = children.size();
     for (unsigned k = 0; k < count; ++k) {
-        AccessibilityObjectWrapper* wrapper = children[k]->wrapper();
+        WebAccessibilityObjectWrapper* wrapper = children[k]->wrapper();
         if (wrapper == child || (children[k]->isAttachment() && [wrapper attachmentView] == child)) 
             return k;
     }
@@ -3140,7 +3140,7 @@ static RenderObject* rendererForView(NSView* view)
         
         NSMutableArray *subarray = [NSMutableArray arrayWithCapacity:available];
         for (unsigned added = 0; added < available; ++index, ++added) {
-            AccessibilityObjectWrapper* wrapper = children[index]->wrapper();
+            WebAccessibilityObjectWrapper* wrapper = children[index]->wrapper();
             if (wrapper) {
                 // The attachment view should be returned, otherwise AX palindrome errors occur.
                 if (children[index]->isAttachment() && [wrapper attachmentView])
index df3573e3c70f37ad5fcfe0e69cc1350a9ddf8fca..f8a309b3323acf11a2fc997394fdf3bdcee0eef0 100644 (file)
@@ -48,7 +48,7 @@ extern const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel;
 }
 #endif
 
-@interface CascadeList : NSArray {
+@interface WebCascadeList : NSArray {
     @private
     const WebCore::Font* _font;
     UChar32 _character;
@@ -60,7 +60,7 @@ extern const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel;
 
 @end
 
-@implementation CascadeList
+@implementation WebCascadeList
 
 - (id)initWithFont:(const WebCore::Font*)font character:(UChar32)character
 {
@@ -193,7 +193,7 @@ void ComplexTextController::collectComplexTextRunsForCharactersCoreText(const UC
         U16_GET(cp, 0, 0, length, baseCharacter);
         fontData = m_font.fontDataAt(0)->fontDataForCharacter(baseCharacter);
 
-        RetainPtr<CascadeList> cascadeList(AdoptNS, [[CascadeList alloc] initWithFont:&m_font character:baseCharacter]);
+        RetainPtr<WebCascadeList> cascadeList(AdoptNS, [[WebCascadeList alloc] initWithFont:&m_font character:baseCharacter]);
 
         stringAttributes.adoptCF(CFDictionaryCreateMutableCopy(kCFAllocatorDefault, 0, fontData->getCFStringAttributes(m_font.typesettingFeatures(), fontData->platformData().orientation())));
         static const void* attributeKeys[] = { kCTFontCascadeListAttribute };
index c242e9e4e81cda97a56b974b2653bafa8d139ab6..6c5ce45539a87b5b667c472c15468e4e7023edba 100644 (file)
@@ -36,11 +36,11 @@ using namespace WebCore;
 
 static NSString *preferredLanguageCode;
 
-@interface LanguageChangeObserver : NSObject {
+@interface WebLanguageChangeObserver : NSObject {
 }
 @end
 
-@implementation LanguageChangeObserver
+@implementation WebLanguageChangeObserver
 
 + (void)_webkit_languagePreferencesDidChange
 {
@@ -104,7 +104,7 @@ String platformDefaultLanguage()
 
     static bool languageChangeObserverAdded;
     if (!languageChangeObserverAdded) {
-        [[NSDistributedNotificationCenter defaultCenter] addObserver:[LanguageChangeObserver self]
+        [[NSDistributedNotificationCenter defaultCenter] addObserver:[WebLanguageChangeObserver self]
                                                             selector:@selector(_webkit_languagePreferencesDidChange)
                                                                 name:@"AppleLanguagePreferencesChangedNotification"
                                                               object:nil];
index 34b8e8f9cde187a782aea497af21ab5c96880c46..7e00d310e608ff2926aca427e40b68840680f803 100644 (file)
 #include <wtf/RetainPtr.h>
 
 #ifdef __OBJC__
-@class ScrollAnimationHelperDelegate;
-@class ScrollbarPainterDelegate;
-@class ScrollbarPainterControllerDelegate;
-@class ScrollbarPainterDelegate;
+@class WebScrollAnimationHelperDelegate;
+@class WebScrollbarPainterControllerDelegate;
+@class WebScrollbarPainterDelegate;
 #else
-class ScrollAnimationHelperDelegate;
-class ScrollbarPainterDelegate;
-class ScrollbarPainterControllerDelegate;
-class ScrollbarPainterDelegate;
+class WebScrollAnimationHelperDelegate;
+class WebScrollbarPainterControllerDelegate;
+class WebScrollbarPainterDelegate;
 #endif
 
 #if USE(SCROLLBAR_PAINTER)
@@ -97,12 +95,12 @@ public:
 
 private:
     RetainPtr<id> m_scrollAnimationHelper;
-    RetainPtr<ScrollAnimationHelperDelegate> m_scrollAnimationHelperDelegate;
+    RetainPtr<WebScrollAnimationHelperDelegate> m_scrollAnimationHelperDelegate;
 
 #if USE(SCROLLBAR_PAINTER)
     RetainPtr<ScrollbarPainterController> m_scrollbarPainterController;
-    RetainPtr<ScrollbarPainterControllerDelegate> m_scrollbarPainterControllerDelegate;
-    RetainPtr<id> m_scrollbarPainterDelegate;
+    RetainPtr<WebScrollbarPainterControllerDelegate> m_scrollbarPainterControllerDelegate;
+    RetainPtr<WebScrollbarPainterDelegate> m_scrollbarPainterDelegate;
 
     void initialScrollbarPaintTimerFired(Timer<ScrollAnimatorMac>*);
     Timer<ScrollAnimatorMac> m_initialScrollbarPaintTimer;
index 86c5edfedf81a36e2ecb9d64e803022c70c829f4..c4935346556e18854b9ca0f91dcc0bd8e4afb486 100644 (file)
@@ -52,7 +52,7 @@ using namespace std;
 - (CGFloat)_progress;
 @end
 
-@interface ScrollAnimationHelperDelegate : NSObject
+@interface WebScrollAnimationHelperDelegate : NSObject
 {
     WebCore::ScrollAnimatorMac* _animator;
 }
@@ -69,7 +69,7 @@ static NSSize abs(NSSize size)
     return finalSize;    
 }
 
-@implementation ScrollAnimationHelperDelegate
+@implementation WebScrollAnimationHelperDelegate
 
 - (id)initWithScrollAnimator:(WebCore::ScrollAnimatorMac*)scrollAnimator
 {
@@ -150,14 +150,14 @@ static NSSize abs(NSSize size)
 
 #if USE(SCROLLBAR_PAINTER)
 
-@interface ScrollbarPainterControllerDelegate : NSObject
+@interface WebScrollbarPainterControllerDelegate : NSObject
 {
     WebCore::ScrollAnimatorMac* _animator;
 }
 - (id)initWithScrollAnimator:(WebCore::ScrollAnimatorMac*)scrollAnimator;
 @end
 
-@implementation ScrollbarPainterControllerDelegate
+@implementation WebScrollbarPainterControllerDelegate
 
 - (id)initWithScrollAnimator:(WebCore::ScrollAnimatorMac*)scrollAnimator
 {
@@ -242,7 +242,7 @@ static NSSize abs(NSSize size)
 
 @end
 
-@interface ScrollbarPartAnimation : NSAnimation
+@interface WebScrollbarPartAnimation : NSAnimation
 {
     RetainPtr<ScrollbarPainter> _scrollerPainter;
     WebCore::ScrollbarPart _part;
@@ -253,7 +253,7 @@ static NSSize abs(NSSize size)
 - (id)initWithScrollbarPainter:(ScrollbarPainter)scrollerPainter part:(WebCore::ScrollbarPart)part scrollAnimator:(WebCore::ScrollAnimatorMac*)scrollAnimator animateAlphaTo:(CGFloat)newAlpha duration:(NSTimeInterval)duration;
 @end
 
-@implementation ScrollbarPartAnimation
+@implementation WebScrollbarPartAnimation
 
 - (id)initWithScrollbarPainter:(ScrollbarPainter)scrollerPainter part:(WebCore::ScrollbarPart)part scrollAnimator:(WebCore::ScrollAnimatorMac*)scrollAnimator animateAlphaTo:(CGFloat)newAlpha duration:(NSTimeInterval)duration
 {
@@ -303,21 +303,21 @@ static NSSize abs(NSSize size)
 
 @end
 
-@interface ScrollbarPainterDelegate : NSObject<NSAnimationDelegate>
+@interface WebScrollbarPainterDelegate : NSObject<NSAnimationDelegate>
 {
     WebCore::ScrollAnimatorMac* _animator;
 
-    RetainPtr<ScrollbarPartAnimation> _verticalKnobAnimation;
-    RetainPtr<ScrollbarPartAnimation> _horizontalKnobAnimation;
+    RetainPtr<WebScrollbarPartAnimation> _verticalKnobAnimation;
+    RetainPtr<WebScrollbarPartAnimation> _horizontalKnobAnimation;
 
-    RetainPtr<ScrollbarPartAnimation> _verticalTrackAnimation;
-    RetainPtr<ScrollbarPartAnimation> _horizontalTrackAnimation;
+    RetainPtr<WebScrollbarPartAnimation> _verticalTrackAnimation;
+    RetainPtr<WebScrollbarPartAnimation> _horizontalTrackAnimation;
 }
 - (id)initWithScrollAnimator:(WebCore::ScrollAnimatorMac*)scrollAnimator;
 - (void)cancelAnimations;
 @end
 
-@implementation ScrollbarPainterDelegate
+@implementation WebScrollbarPainterDelegate
 
 - (id)initWithScrollAnimator:(WebCore::ScrollAnimatorMac*)scrollAnimator
 {
@@ -359,7 +359,7 @@ static NSSize abs(NSSize size)
     return dummyLayer;
 }
 
-- (void)setUpAnimation:(RetainPtr<ScrollbarPartAnimation>&)scrollbarPartAnimation scrollerPainter:(ScrollbarPainter)scrollerPainter part:(WebCore::ScrollbarPart)part animateAlphaTo:(CGFloat)newAlpha duration:(NSTimeInterval)duration
+- (void)setUpAnimation:(RetainPtr<WebScrollbarPartAnimation>&)scrollbarPartAnimation scrollerPainter:(ScrollbarPainter)scrollerPainter part:(WebCore::ScrollbarPart)part animateAlphaTo:(CGFloat)newAlpha duration:(NSTimeInterval)duration
 {
     // If the user has scrolled the page, then the scrollbars must be animated here. 
     // This overrides the early returns.
@@ -392,7 +392,7 @@ static NSSize abs(NSSize size)
 
     [NSAnimationContext beginGrouping];
     [[NSAnimationContext currentContext] setDuration:duration];
-    scrollbarPartAnimation.adoptNS([[ScrollbarPartAnimation alloc] initWithScrollbarPainter:scrollerPainter 
+    scrollbarPartAnimation.adoptNS([[WebScrollbarPartAnimation alloc] initWithScrollbarPainter:scrollerPainter 
                                                                     part:part
                                                                     scrollAnimator:_animator 
                                                                     animateAlphaTo:newAlpha 
@@ -469,16 +469,16 @@ ScrollAnimatorMac::ScrollAnimatorMac(ScrollableArea* scrollableArea)
     , m_haveScrolledSincePageLoad(false)
     , m_needsScrollerStyleUpdate(false)
 {
-    m_scrollAnimationHelperDelegate.adoptNS([[ScrollAnimationHelperDelegate alloc] initWithScrollAnimator:this]);
+    m_scrollAnimationHelperDelegate.adoptNS([[WebScrollAnimationHelperDelegate alloc] initWithScrollAnimator:this]);
     m_scrollAnimationHelper.adoptNS([[NSClassFromString(@"NSScrollAnimationHelper") alloc] initWithDelegate:m_scrollAnimationHelperDelegate.get()]);
 
 #if USE(SCROLLBAR_PAINTER)
-    m_scrollbarPainterControllerDelegate.adoptNS([[ScrollbarPainterControllerDelegate alloc] initWithScrollAnimator:this]);
+    m_scrollbarPainterControllerDelegate.adoptNS([[WebScrollbarPainterControllerDelegate alloc] initWithScrollAnimator:this]);
     m_scrollbarPainterController = [[[NSClassFromString(@"NSScrollerImpPair") alloc] init] autorelease];
     [m_scrollbarPainterController.get() setDelegate:m_scrollbarPainterControllerDelegate.get()];
     [m_scrollbarPainterController.get() setScrollerStyle:wkRecommendedScrollerStyle()];
 
-    m_scrollbarPainterDelegate.adoptNS([[ScrollbarPainterDelegate alloc] initWithScrollAnimator:this]);
+    m_scrollbarPainterDelegate.adoptNS([[WebScrollbarPainterDelegate alloc] initWithScrollAnimator:this]);
 #endif
 }
 
index eafaee2b8494fa65537c035917dbfb8b1421e8ba..348759836c602303cc295d0d407169fc60c334c0 100644 (file)
@@ -59,7 +59,7 @@ static ScrollbarPainterMap* scrollbarMap()
 
 }
 
-@interface ScrollbarPrefsObserver : NSObject
+@interface WebScrollbarPrefsObserver : NSObject
 {
 }
 
@@ -69,7 +69,7 @@ static ScrollbarPainterMap* scrollbarMap()
 
 @end
 
-@implementation ScrollbarPrefsObserver
+@implementation WebScrollbarPrefsObserver
 
 + (void)appearancePrefsChanged:(NSNotification*)unusedNotification
 {
@@ -192,7 +192,7 @@ ScrollbarThemeMac::ScrollbarThemeMac()
     static bool initialized;
     if (!initialized) {
         initialized = true;
-        [ScrollbarPrefsObserver registerAsObserver];
+        [WebScrollbarPrefsObserver registerAsObserver];
         preferencesChanged();
     }
 }
index c8a5a1f066a36cb2e7f0856cb2b33577254e49b9..25b4d44f2d2c0dac99ebb6d3f69eb69d93d11b1e 100644 (file)
 
 using namespace WebCore;
 
-@interface CookieStorageObjCAdapter : NSObject
+@interface WebCookieStorageObjCAdapter : NSObject
 -(void)notifyCookiesChangedOnMainThread;
 -(void)cookiesChangedNotificationHandler:(NSNotification *)notification;
 -(void)startListeningForCookieChangeNotifications;
 -(void)stopListeningForCookieChangeNotifications;
 @end
 
-@implementation CookieStorageObjCAdapter
+@implementation WebCookieStorageObjCAdapter
 
 -(void)notifyCookiesChangedOnMainThread
 {
@@ -96,12 +96,12 @@ void setCookieStoragePrivateBrowsingEnabled(bool enabled)
     wkSetCookieStoragePrivateBrowsingEnabled(enabled);
 }
 
-static CookieStorageObjCAdapter *cookieStorageAdapter;
+static WebCookieStorageObjCAdapter *cookieStorageAdapter;
 
 void startObservingCookieChanges()
 {
     if (!cookieStorageAdapter)
-        cookieStorageAdapter = [[CookieStorageObjCAdapter alloc] init];
+        cookieStorageAdapter = [[WebCookieStorageObjCAdapter alloc] init];
     [cookieStorageAdapter startListeningForCookieChangeNotifications];
 }
 
index 637eef528ac6fa1316c4229fa065dbacd7eb9232..4757408ff181b5be47c9717ef37c1cf00c6640c9 100644 (file)
@@ -1,3 +1,17 @@
+2011-09-19  Dan Bernstein  <mitz@apple.com>
+
+        WebKit part of [mac] WebKit contains Objective-C classes that are not prefixed with its standard prefixes
+        https://bugs.webkit.org/show_bug.cgi?id=68323
+
+        Reviewed by Sam Weinig.
+
+        Updated for the renaming of NonBlockingPanel to WebNonBlockingPanel.
+
+        * English.lproj/WebJavaScriptTextInputPanel.nib/classes.nib: Removed.
+        * English.lproj/WebJavaScriptTextInputPanel.nib/designable.nib: Added.
+        * English.lproj/WebJavaScriptTextInputPanel.nib/info.nib: Removed.
+        * English.lproj/WebJavaScriptTextInputPanel.nib/keyedobjects.nib:
+
 2011-09-16  Filip Pizlo  <fpizlo@apple.com>
 
         DFG JIT should inline Math.abs
diff --git a/Source/WebKit/English.lproj/WebJavaScriptTextInputPanel.nib/classes.nib b/Source/WebKit/English.lproj/WebJavaScriptTextInputPanel.nib/classes.nib
deleted file mode 100644 (file)
index 01cac38..0000000
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>IBClasses</key>
-       <array>
-               <dict>
-                       <key>CLASS</key>
-                       <string>NSControl</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSView</string>
-               </dict>
-               <dict>
-                       <key>ACTIONS</key>
-                       <dict>
-                               <key>webViewClose</key>
-                               <string>WebView</string>
-                               <key>webViewFocus</key>
-                               <string>WebView</string>
-                               <key>webViewRunModal</key>
-                               <string>WebView</string>
-                               <key>webViewShow</key>
-                               <string>WebView</string>
-                               <key>webViewUnfocus</key>
-                               <string>WebView</string>
-                       </dict>
-                       <key>CLASS</key>
-                       <string>NSObject</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>NSWindow</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSResponder</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>NonBlockingPanel</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSPanel</string>
-               </dict>
-               <dict>
-                       <key>ACTIONS</key>
-                       <dict>
-                               <key>_openFrameInNewWindowFromMenu</key>
-                               <string>NSMenuItem</string>
-                               <key>_searchWithGoogleFromMenu</key>
-                               <string>id</string>
-                               <key>_searchWithSpotlightFromMenu</key>
-                               <string>id</string>
-                               <key>alignCenter</key>
-                               <string>id</string>
-                               <key>alignJustified</key>
-                               <string>id</string>
-                               <key>alignLeft</key>
-                               <string>id</string>
-                               <key>alignRight</key>
-                               <string>id</string>
-                               <key>changeAttributes</key>
-                               <string>id</string>
-                               <key>changeColor</key>
-                               <string>id</string>
-                               <key>changeDocumentBackgroundColor</key>
-                               <string>id</string>
-                               <key>changeFont</key>
-                               <string>id</string>
-                               <key>checkSpelling</key>
-                               <string>id</string>
-                               <key>copy</key>
-                               <string>id</string>
-                               <key>copyFont</key>
-                               <string>id</string>
-                               <key>cut</key>
-                               <string>id</string>
-                               <key>delete</key>
-                               <string>id</string>
-                               <key>goBack</key>
-                               <string>id</string>
-                               <key>goForward</key>
-                               <string>id</string>
-                               <key>makeTextLarger</key>
-                               <string>id</string>
-                               <key>makeTextSmaller</key>
-                               <string>id</string>
-                               <key>makeTextStandardSize</key>
-                               <string>id</string>
-                               <key>moveToBeginningOfSentence</key>
-                               <string>id</string>
-                               <key>moveToBeginningOfSentenceAndModifySelection</key>
-                               <string>id</string>
-                               <key>moveToEndOfSentence</key>
-                               <string>id</string>
-                               <key>moveToEndOfSentenceAndModifySelection</key>
-                               <string>id</string>
-                               <key>outdent</key>
-                               <string>id</string>
-                               <key>paste</key>
-                               <string>id</string>
-                               <key>pasteAsPlainText</key>
-                               <string>id</string>
-                               <key>pasteAsRichText</key>
-                               <string>id</string>
-                               <key>pasteFont</key>
-                               <string>id</string>
-                               <key>performFindPanelAction</key>
-                               <string>id</string>
-                               <key>reload</key>
-                               <string>id</string>
-                               <key>resetPageZoom</key>
-                               <string>id</string>
-                               <key>selectSentence</key>
-                               <string>id</string>
-                               <key>showGuessPanel</key>
-                               <string>id</string>
-                               <key>startSpeaking</key>
-                               <string>id</string>
-                               <key>stopLoading</key>
-                               <string>id</string>
-                               <key>stopSpeaking</key>
-                               <string>id</string>
-                               <key>takeStringURLFrom</key>
-                               <string>id</string>
-                               <key>toggleContinuousSpellChecking</key>
-                               <string>id</string>
-                               <key>toggleGrammarChecking</key>
-                               <string>id</string>
-                               <key>toggleSmartInsertDelete</key>
-                               <string>id</string>
-                               <key>zoomPageIn</key>
-                               <string>id</string>
-                               <key>zoomPageOut</key>
-                               <string>id</string>
-                       </dict>
-                       <key>CLASS</key>
-                       <string>WebView</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSView</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>NSView</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSResponder</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>FirstResponder</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSObject</string>
-               </dict>
-               <dict>
-                       <key>ACTIONS</key>
-                       <dict>
-                               <key>pressedCancel</key>
-                               <string>id</string>
-                               <key>pressedOK</key>
-                               <string>id</string>
-                       </dict>
-                       <key>CLASS</key>
-                       <string>WebJavaScriptTextInputPanel</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>OUTLETS</key>
-                       <dict>
-                               <key>prompt</key>
-                               <string>NSTextField</string>
-                               <key>textInput</key>
-                               <string>NSTextField</string>
-                       </dict>
-                       <key>SUPERCLASS</key>
-                       <string>NSWindowController</string>
-               </dict>
-       </array>
-       <key>IBVersion</key>
-       <string>1</string>
-</dict>
-</plist>
diff --git a/Source/WebKit/English.lproj/WebJavaScriptTextInputPanel.nib/designable.nib b/Source/WebKit/English.lproj/WebJavaScriptTextInputPanel.nib/designable.nib
new file mode 100644 (file)
index 0000000..d6cb209
--- /dev/null
@@ -0,0 +1,440 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+       <data>
+               <int key="IBDocument.SystemTarget">1050</int>
+               <string key="IBDocument.SystemVersion">11C57</string>
+               <string key="IBDocument.InterfaceBuilderVersion">1938</string>
+               <string key="IBDocument.AppKitVersion">1138.21</string>
+               <string key="IBDocument.HIToolboxVersion">567.00</string>
+               <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                       <string key="NS.object.0">1938</string>
+               </object>
+               <array key="IBDocument.IntegratedClassDependencies">
+                       <string>NSTextField</string>
+                       <string>NSView</string>
+                       <string>NSWindowTemplate</string>
+                       <string>NSTextFieldCell</string>
+                       <string>NSButtonCell</string>
+                       <string>NSButton</string>
+                       <string>NSCustomObject</string>
+               </array>
+               <array key="IBDocument.PluginDependencies">
+                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+               </array>
+               <object class="NSMutableDictionary" key="IBDocument.Metadata">
+                       <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+                       <integer value="1" key="NS.object.0"/>
+               </object>
+               <array class="NSMutableArray" key="IBDocument.RootObjects" id="301070375">
+                       <object class="NSCustomObject" id="1016705975">
+                               <string key="NSClassName">WebJavaScriptTextInputPanel</string>
+                       </object>
+                       <object class="NSCustomObject" id="5139151">
+                               <string key="NSClassName">FirstResponder</string>
+                       </object>
+                       <object class="NSCustomObject" id="438418066">
+                               <string key="NSClassName">NSApplication</string>
+                       </object>
+                       <object class="NSWindowTemplate" id="9818130">
+                               <int key="NSWindowStyleMask">1</int>
+                               <int key="NSWindowBacking">2</int>
+                               <string key="NSWindowRect">{{531, 773}, {426, 161}}</string>
+                               <int key="NSWTFlags">1881669632</int>
+                               <string key="NSWindowTitle">JavaScript</string>
+                               <string key="NSWindowClass">WebNonBlockingPanel</string>
+                               <object class="NSMutableString" key="NSViewClass">
+                                       <characters key="NS.bytes">View</characters>
+                               </object>
+                               <nil key="NSUserInterfaceItemIdentifier"/>
+                               <string key="NSWindowContentMinSize">{94, 7}</string>
+                               <object class="NSView" key="NSWindowView" id="776027458">
+                                       <reference key="NSNextResponder"/>
+                                       <int key="NSvFlags">256</int>
+                                       <array class="NSMutableArray" key="NSSubviews">
+                                               <object class="NSButton" id="707055723">
+                                                       <reference key="NSNextResponder" ref="776027458"/>
+                                                       <int key="NSvFlags">289</int>
+                                                       <string key="NSFrame">{{232, 11}, {90, 34}}</string>
+                                                       <reference key="NSSuperview" ref="776027458"/>
+                                                       <reference key="NSWindow"/>
+                                                       <reference key="NSNextKeyView" ref="547100070"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSButtonCell" key="NSCell" id="629849992">
+                                                               <int key="NSCellFlags">67239424</int>
+                                                               <int key="NSCellFlags2">134217728</int>
+                                                               <string key="NSContents">Cancel</string>
+                                                               <object class="NSFont" key="NSSupport" id="843310790">
+                                                                       <string key="NSName">LucidaGrande</string>
+                                                                       <double key="NSSize">13</double>
+                                                                       <int key="NSfFlags">1558</int>
+                                                               </object>
+                                                               <reference key="NSControlView" ref="707055723"/>
+                                                               <int key="NSButtonFlags">-2038284033</int>
+                                                               <int key="NSButtonFlags2">1</int>
+                                                               <object class="NSFont" key="NSAlternateImage" id="371630585">
+                                                                       <string key="NSName">Helvetica</string>
+                                                                       <double key="NSSize">13</double>
+                                                                       <int key="NSfFlags">16</int>
+                                                               </object>
+                                                               <string key="NSAlternateContents"/>
+                                                               <string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+                                                               <int key="NSPeriodicDelay">200</int>
+                                                               <int key="NSPeriodicInterval">25</int>
+                                                       </object>
+                                               </object>
+                                               <object class="NSButton" id="547100070">
+                                                       <reference key="NSNextResponder" ref="776027458"/>
+                                                       <int key="NSvFlags">289</int>
+                                                       <string key="NSFrame">{{322, 11}, {90, 34}}</string>
+                                                       <reference key="NSSuperview" ref="776027458"/>
+                                                       <reference key="NSWindow"/>
+                                                       <reference key="NSNextKeyView"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSButtonCell" key="NSCell" id="970096139">
+                                                               <int key="NSCellFlags">67239424</int>
+                                                               <int key="NSCellFlags2">134217728</int>
+                                                               <string key="NSContents">OK</string>
+                                                               <reference key="NSSupport" ref="843310790"/>
+                                                               <reference key="NSControlView" ref="547100070"/>
+                                                               <int key="NSButtonFlags">-2035924737</int>
+                                                               <int key="NSButtonFlags2">1</int>
+                                                               <reference key="NSAlternateImage" ref="371630585"/>
+                                                               <string key="NSAlternateContents"/>
+                                                               <object class="NSMutableString" key="NSKeyEquivalent">
+                                                                       <bytes key="NS.bytes">DQ</bytes>
+                                                               </object>
+                                                               <int key="NSPeriodicDelay">200</int>
+                                                               <int key="NSPeriodicInterval">25</int>
+                                                       </object>
+                                               </object>
+                                               <object class="NSTextField" id="111931878">
+                                                       <reference key="NSNextResponder" ref="776027458"/>
+                                                       <int key="NSvFlags">266</int>
+                                                       <string key="NSFrame">{{17, 107}, {392, 34}}</string>
+                                                       <reference key="NSSuperview" ref="776027458"/>
+                                                       <reference key="NSWindow"/>
+                                                       <reference key="NSNextKeyView" ref="307071244"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSTextFieldCell" key="NSCell" id="881353084">
+                                                               <int key="NSCellFlags">69336577</int>
+                                                               <int key="NSCellFlags2">0</int>
+                                                               <string type="base64-UTF8" key="NSContents">QSBtZXNzYWdlIGZyb20gSmF2YVNjcmlwdCB3aWxsIGJlIGhlcmUuCkl0IGNhbiBiZSBhbnkgbnVtYmVy
+IG9mIGxpbmVzIGxvbmcuA</string>
+                                                               <object class="NSFont" key="NSSupport" id="419708836">
+                                                                       <string key="NSName">LucidaGrande</string>
+                                                                       <double key="NSSize">13</double>
+                                                                       <int key="NSfFlags">1044</int>
+                                                               </object>
+                                                               <reference key="NSControlView" ref="111931878"/>
+                                                               <object class="NSColor" key="NSBackgroundColor">
+                                                                       <int key="NSColorSpace">6</int>
+                                                                       <string key="NSCatalogName">System</string>
+                                                                       <string key="NSColorName">controlColor</string>
+                                                                       <object class="NSColor" key="NSColor">
+                                                                               <int key="NSColorSpace">3</int>
+                                                                               <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+                                                                       </object>
+                                                               </object>
+                                                               <object class="NSColor" key="NSTextColor">
+                                                                       <int key="NSColorSpace">6</int>
+                                                                       <string key="NSCatalogName">System</string>
+                                                                       <string key="NSColorName">controlTextColor</string>
+                                                                       <object class="NSColor" key="NSColor">
+                                                                               <int key="NSColorSpace">3</int>
+                                                                               <bytes key="NSWhite">MAA</bytes>
+                                                                       </object>
+                                                               </object>
+                                                       </object>
+                                               </object>
+                                               <object class="NSTextField" id="307071244">
+                                                       <reference key="NSNextResponder" ref="776027458"/>
+                                                       <int key="NSvFlags">290</int>
+                                                       <string key="NSFrame">{{20, 60}, {386, 39}}</string>
+                                                       <reference key="NSSuperview" ref="776027458"/>
+                                                       <reference key="NSWindow"/>
+                                                       <reference key="NSNextKeyView" ref="707055723"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSTextFieldCell" key="NSCell" id="587231059">
+                                                               <int key="NSCellFlags">341966337</int>
+                                                               <int key="NSCellFlags2">0</int>
+                                                               <string key="NSContents"/>
+                                                               <reference key="NSSupport" ref="419708836"/>
+                                                               <reference key="NSControlView" ref="307071244"/>
+                                                               <bool key="NSDrawsBackground">YES</bool>
+                                                               <object class="NSColor" key="NSBackgroundColor">
+                                                                       <int key="NSColorSpace">1</int>
+                                                                       <bytes key="NSRGB">MSAxIDEAA</bytes>
+                                                               </object>
+                                                               <object class="NSColor" key="NSTextColor">
+                                                                       <int key="NSColorSpace">1</int>
+                                                                       <bytes key="NSRGB">MCAwIDAAA</bytes>
+                                                               </object>
+                                                       </object>
+                                               </object>
+                                       </array>
+                                       <string key="NSFrameSize">{426, 161}</string>
+                                       <reference key="NSSuperview"/>
+                                       <reference key="NSWindow"/>
+                                       <reference key="NSNextKeyView" ref="111931878"/>
+                               </object>
+                               <string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+                               <string key="NSMinSize">{94, 29}</string>
+                               <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+                               <bool key="NSWindowIsRestorable">YES</bool>
+                       </object>
+               </array>
+               <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <array class="NSMutableArray" key="connectionRecords">
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">window</string>
+                                               <reference key="source" ref="1016705975"/>
+                                               <reference key="destination" ref="9818130"/>
+                                       </object>
+                                       <int key="connectionID">52</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">pressedCancel:</string>
+                                               <reference key="source" ref="1016705975"/>
+                                               <reference key="destination" ref="707055723"/>
+                                       </object>
+                                       <int key="connectionID">53</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">pressedOK:</string>
+                                               <reference key="source" ref="1016705975"/>
+                                               <reference key="destination" ref="547100070"/>
+                                       </object>
+                                       <int key="connectionID">54</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">prompt</string>
+                                               <reference key="source" ref="1016705975"/>
+                                               <reference key="destination" ref="111931878"/>
+                                       </object>
+                                       <int key="connectionID">51</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">textInput</string>
+                                               <reference key="source" ref="1016705975"/>
+                                               <reference key="destination" ref="307071244"/>
+                                       </object>
+                                       <int key="connectionID">50</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">nextKeyView</string>
+                                               <reference key="source" ref="707055723"/>
+                                               <reference key="destination" ref="547100070"/>
+                                       </object>
+                                       <int key="connectionID">42</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">initialFirstResponder</string>
+                                               <reference key="source" ref="9818130"/>
+                                               <reference key="destination" ref="307071244"/>
+                                       </object>
+                                       <int key="connectionID">48</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">delegate</string>
+                                               <reference key="source" ref="9818130"/>
+                                               <reference key="destination" ref="1016705975"/>
+                                       </object>
+                                       <int key="connectionID">23</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">nextKeyView</string>
+                                               <reference key="source" ref="307071244"/>
+                                               <reference key="destination" ref="707055723"/>
+                                       </object>
+                                       <int key="connectionID">49</int>
+                               </object>
+                       </array>
+                       <object class="IBMutableOrderedSet" key="objectRecords">
+                               <array key="orderedObjects">
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">0</int>
+                                               <array key="object" id="0"/>
+                                               <reference key="children" ref="301070375"/>
+                                               <nil key="parent"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">-2</int>
+                                               <reference key="object" ref="1016705975"/>
+                                               <reference key="parent" ref="0"/>
+                                               <string key="objectName">File's Owner</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">-1</int>
+                                               <reference key="object" ref="5139151"/>
+                                               <reference key="parent" ref="0"/>
+                                               <string key="objectName">First Responder</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">-3</int>
+                                               <reference key="object" ref="438418066"/>
+                                               <reference key="parent" ref="0"/>
+                                               <string key="objectName">Application</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">10</int>
+                                               <reference key="object" ref="9818130"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="776027458"/>
+                                               </array>
+                                               <reference key="parent" ref="0"/>
+                                               <string key="objectName">Panel1</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">7</int>
+                                               <reference key="object" ref="776027458"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="707055723"/>
+                                                       <reference ref="547100070"/>
+                                                       <reference ref="111931878"/>
+                                                       <reference ref="307071244"/>
+                                               </array>
+                                               <reference key="parent" ref="9818130"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">2</int>
+                                               <reference key="object" ref="707055723"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="629849992"/>
+                                               </array>
+                                               <reference key="parent" ref="776027458"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">12</int>
+                                               <reference key="object" ref="547100070"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="970096139"/>
+                                               </array>
+                                               <reference key="parent" ref="776027458"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">44</int>
+                                               <reference key="object" ref="111931878"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="881353084"/>
+                                               </array>
+                                               <reference key="parent" ref="776027458"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">47</int>
+                                               <reference key="object" ref="307071244"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="587231059"/>
+                                               </array>
+                                               <reference key="parent" ref="776027458"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">100002</int>
+                                               <reference key="object" ref="629849992"/>
+                                               <reference key="parent" ref="707055723"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">100012</int>
+                                               <reference key="object" ref="970096139"/>
+                                               <reference key="parent" ref="547100070"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">100044</int>
+                                               <reference key="object" ref="881353084"/>
+                                               <reference key="parent" ref="111931878"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">100047</int>
+                                               <reference key="object" ref="587231059"/>
+                                               <reference key="parent" ref="307071244"/>
+                                       </object>
+                               </array>
+                       </object>
+                       <dictionary class="NSMutableDictionary" key="flattenedProperties">
+                               <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="10.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="100002.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="100012.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="100044.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="100047.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="12.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="44.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="47.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                       </dictionary>
+                       <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+                       <nil key="activeLocalization"/>
+                       <dictionary class="NSMutableDictionary" key="localizations"/>
+                       <nil key="sourceID"/>
+                       <int key="maxID">100047</int>
+               </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes">
+                       <array class="NSMutableArray" key="referencedPartialClassDescriptions">
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">WebJavaScriptTextInputPanel</string>
+                                       <string key="superclassName">NSWindowController</string>
+                                       <dictionary class="NSMutableDictionary" key="actions">
+                                               <string key="pressedCancel:">id</string>
+                                               <string key="pressedOK:">id</string>
+                                       </dictionary>
+                                       <dictionary class="NSMutableDictionary" key="actionInfosByName">
+                                               <object class="IBActionInfo" key="pressedCancel:">
+                                                       <string key="name">pressedCancel:</string>
+                                                       <string key="candidateClassName">id</string>
+                                               </object>
+                                               <object class="IBActionInfo" key="pressedOK:">
+                                                       <string key="name">pressedOK:</string>
+                                                       <string key="candidateClassName">id</string>
+                                               </object>
+                                       </dictionary>
+                                       <dictionary class="NSMutableDictionary" key="outlets">
+                                               <string key="prompt">NSTextField</string>
+                                               <string key="textInput">NSTextField</string>
+                                       </dictionary>
+                                       <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+                                               <object class="IBToOneOutletInfo" key="prompt">
+                                                       <string key="name">prompt</string>
+                                                       <string key="candidateClassName">NSTextField</string>
+                                               </object>
+                                               <object class="IBToOneOutletInfo" key="textInput">
+                                                       <string key="name">textInput</string>
+                                                       <string key="candidateClassName">NSTextField</string>
+                                               </object>
+                                       </dictionary>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBProjectSource</string>
+                                               <string key="minorKey">./Classes/WebJavaScriptTextInputPanel.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">WebNonBlockingPanel</string>
+                                       <string key="superclassName">NSPanel</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBProjectSource</string>
+                                               <string key="minorKey">./Classes/WebNonBlockingPanel.h</string>
+                                       </object>
+                               </object>
+                       </array>
+               </object>
+               <int key="IBDocument.localizationMode">0</int>
+               <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+                       <integer value="1050" key="NS.object.0"/>
+               </object>
+               <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+               <int key="IBDocument.defaultPropertyAccessControl">3</int>
+       </data>
+</archive>
diff --git a/Source/WebKit/English.lproj/WebJavaScriptTextInputPanel.nib/info.nib b/Source/WebKit/English.lproj/WebJavaScriptTextInputPanel.nib/info.nib
deleted file mode 100644 (file)
index 23c8eb6..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>IBFramework Version</key>
-       <string>629</string>
-       <key>IBLastKnownRelativeProjectPath</key>
-       <string>../../WebKit.xcodeproj</string>
-       <key>IBOldestOS</key>
-       <integer>5</integer>
-       <key>IBOpenObjects</key>
-       <array/>
-       <key>IBSystem Version</key>
-       <string>9C7010</string>
-       <key>targetFramework</key>
-       <string>IBCocoaFramework</string>
-</dict>
-</plist>
index f4924f4c49a7d3196a8b4a1a69b60eb06f484e13..0c8d44287100c6a76b00725af9643529366ec690 100644 (file)
Binary files a/Source/WebKit/English.lproj/WebJavaScriptTextInputPanel.nib/keyedobjects.nib and b/Source/WebKit/English.lproj/WebJavaScriptTextInputPanel.nib/keyedobjects.nib differ
index f0cc133afad64eb448984edcffe25c45647c1aa7..d0d12aa96a7ac9eac9badafd11e7eb91b85a14e8 100644 (file)
@@ -1,3 +1,29 @@
+2011-09-19  Dan Bernstein  <mitz@apple.com>
+
+        WebKit part of [mac] WebKit contains Objective-C classes that are not prefixed with its standard prefixes
+        https://bugs.webkit.org/show_bug.cgi?id=68323
+
+        Reviewed by Sam Weinig.
+
+        Renamed NonBlockingPanel to WebNonBlockingPanel.
+        Renamed ThreadEnabler to WebCocoaThreadingEnabler.
+        Renamed PDFPrefUpdatingProxy to WebPDFPrefUpdatingProxy.
+
+        * Misc/WebIconDatabase.mm:
+        (+[WebCocoaThreadingEnabler enableThreading]):
+        (importToWebCoreFormat):
+        * Panels/English.lproj/WebAuthenticationPanel.nib/designable.nib:
+        * Panels/English.lproj/WebAuthenticationPanel.nib/keyedobjects.nib:
+        * Panels/WebAuthenticationPanel.h:
+        * Panels/WebAuthenticationPanel.m: Renamed NonBlockingPanel to
+        WebNonBlockingPanel. Because Safari 5.1 uses NonBlockingPanel, this will
+        cause nightly builds to log an error message when showing the Safari
+        HTTP authentication sheet and disable the Quit command while the sheet
+        is disaplyed.
+        * WebView/WebPDFView.mm:
+        (-[WebPDFView initWithFrame:]):
+        (-[WebPDFView _updatePreferencesSoon]):
+
 2011-09-17  Mihai Parparita  <mihaip@chromium.org>
 
         FrameLoaderClient BackForwardList-related methods are unsued
index 65c8c1f23f7e7865bd6ce79e0d1fe5e13562623b..62dd013ff75e55064d775f8889a51acea984f42d 100644 (file)
@@ -561,14 +561,14 @@ static NSData* iconDataFromPathForIconURL(NSString *databasePath, NSString *icon
 @implementation WebIconDatabasePrivate
 @end
 
-@interface ThreadEnabler : NSObject {
+@interface WebCocoaThreadingEnabler : NSObject {
 }
 + (void)enableThreading;
 
 - (void)threadEnablingSelector:(id)arg;
 @end
 
-@implementation ThreadEnabler
+@implementation WebCocoaThreadingEnabler
 
 - (void)threadEnablingSelector:(id)arg
 {
@@ -577,7 +577,7 @@ static NSData* iconDataFromPathForIconURL(NSString *databasePath, NSString *icon
 
 + (void)enableThreading
 {
-    ThreadEnabler *enabler = [[ThreadEnabler alloc] init];
+    WebCocoaThreadingEnabler *enabler = [[WebCocoaThreadingEnabler alloc] init];
     [NSThread detachNewThreadSelector:@selector(threadEnablingSelector:) toTarget:enabler withObject:nil];
     [enabler release];
 }
@@ -589,7 +589,7 @@ bool importToWebCoreFormat()
     // Since this is running on a secondary POSIX thread and Cocoa cannot be used multithreaded unless an NSThread has been detached,
     // make sure that happens here for all WebKit clients
     if (![NSThread isMultiThreaded])
-        [ThreadEnabler enableThreading];
+        [WebCocoaThreadingEnabler enableThreading];
     ASSERT([NSThread isMultiThreaded]);    
     
     // Get the directory the old icon database *should* be in
index d102a8957ffa0e06fd769e3878bf122cdbac93e0..ec2c72257401c5430d636a952097480974008667 100644 (file)
@@ -2,17 +2,25 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
        <data>
                <int key="IBDocument.SystemTarget">1050</int>
-               <string key="IBDocument.SystemVersion">10J567</string>
-               <string key="IBDocument.InterfaceBuilderVersion">823</string>
-               <string key="IBDocument.AppKitVersion">1038.35</string>
-               <string key="IBDocument.HIToolboxVersion">462.00</string>
+               <string key="IBDocument.SystemVersion">11C57</string>
+               <string key="IBDocument.InterfaceBuilderVersion">1938</string>
+               <string key="IBDocument.AppKitVersion">1138.21</string>
+               <string key="IBDocument.HIToolboxVersion">567.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                       <string key="NS.object.0">823</string>
+                       <string key="NS.object.0">1938</string>
                </object>
-               <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+               <object class="NSArray" key="IBDocument.IntegratedClassDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
-                       <integer value="6"/>
+                       <string>NSTextField</string>
+                       <string>NSView</string>
+                       <string>NSWindowTemplate</string>
+                       <string>NSTextFieldCell</string>
+                       <string>NSButtonCell</string>
+                       <string>NSImageCell</string>
+                       <string>NSImageView</string>
+                       <string>NSButton</string>
+                       <string>NSCustomObject</string>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
                                <string key="NSWindowRect">{{93, 97}, {424, 254}}</string>
                                <int key="NSWTFlags">1886912512</int>
                                <string key="NSWindowTitle">Log In</string>
-                               <string key="NSWindowClass">NonBlockingPanel</string>
+                               <string key="NSWindowClass">WebNonBlockingPanel</string>
                                <object class="NSMutableString" key="NSViewClass">
                                        <characters key="NS.bytes">View</characters>
                                </object>
-                               <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+                               <nil key="NSUserInterfaceItemIdentifier"/>
                                <object class="NSView" key="NSWindowView" id="327235052">
                                        <reference key="NSNextResponder"/>
                                        <int key="NSvFlags">256</int>
@@ -54,6 +62,8 @@
                                                        <int key="NSvFlags">266</int>
                                                        <string key="NSFrame">{{101, 200}, {306, 34}}</string>
                                                        <reference key="NSSuperview" ref="327235052"/>
+                                                       <reference key="NSWindow"/>
+                                                       <reference key="NSNextKeyView" ref="1000280557"/>
                                                        <int key="NSTag">1</int>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="240004773">
                                                        <int key="NSvFlags">290</int>
                                                        <string key="NSFrame">{{101, 147}, {306, 20}}</string>
                                                        <reference key="NSSuperview" ref="327235052"/>
+                                                       <reference key="NSWindow"/>
+                                                       <reference key="NSNextKeyView" ref="477300420"/>
                                                        <int key="NSTag">2</int>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="213641065">
                                                        <int key="NSvFlags">289</int>
                                                        <string key="NSFrame">{{326, 12}, {84, 32}}</string>
                                                        <reference key="NSSuperview" ref="327235052"/>
+                                                       <reference key="NSWindow"/>
+                                                       <reference key="NSNextKeyView"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSButtonCell" key="NSCell" id="568224179">
                                                                <int key="NSCellFlags">67239424</int>
                                                        <int key="NSvFlags">289</int>
                                                        <string key="NSFrame">{{242, 12}, {84, 32}}</string>
                                                        <reference key="NSSuperview" ref="327235052"/>
+                                                       <reference key="NSWindow"/>
+                                                       <reference key="NSNextKeyView" ref="305175176"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSButtonCell" key="NSCell" id="55525334">
                                                                <int key="NSCellFlags">67239424</int>
                                                        <int key="NSvFlags">290</int>
                                                        <string key="NSFrame">{{174, 117}, {230, 22}}</string>
                                                        <reference key="NSSuperview" ref="327235052"/>
+                                                       <reference key="NSWindow"/>
+                                                       <reference key="NSNextKeyView" ref="833115728"/>
                                                        <int key="NSTag">3</int>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="439646453">
                                                        <int key="NSvFlags">290</int>
                                                        <string key="NSFrame">{{174, 87}, {230, 22}}</string>
                                                        <reference key="NSSuperview" ref="327235052"/>
+                                                       <reference key="NSWindow"/>
+                                                       <reference key="NSNextKeyView" ref="657854151"/>
                                                        <int key="NSTag">4</int>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="743913118">
                                                        <int key="NSvFlags">292</int>
                                                        <string key="NSFrame">{{101, 119}, {68, 17}}</string>
                                                        <reference key="NSSuperview" ref="327235052"/>
+                                                       <reference key="NSWindow"/>
+                                                       <reference key="NSNextKeyView" ref="71972597"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="159596654">
                                                                <int key="NSCellFlags">67239424</int>
                                                        <int key="NSvFlags">292</int>
                                                        <string key="NSFrame">{{101, 89}, {68, 17}}</string>
                                                        <reference key="NSSuperview" ref="327235052"/>
+                                                       <reference key="NSWindow"/>
+                                                       <reference key="NSNextKeyView" ref="368270689"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="766878508">
                                                                <int key="NSCellFlags">67239424</int>
                                                        </object>
                                                        <string key="NSFrame">{{20, 170}, {64, 64}}</string>
                                                        <reference key="NSSuperview" ref="327235052"/>
+                                                       <reference key="NSWindow"/>
+                                                       <reference key="NSNextKeyView" ref="705333610"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSImageCell" key="NSCell" id="375502905">
                                                                <int key="NSCellFlags">130560</int>
                                                        <int key="NSvFlags">292</int>
                                                        <string key="NSFrame">{{102, 58}, {280, 18}}</string>
                                                        <reference key="NSSuperview" ref="327235052"/>
+                                                       <reference key="NSWindow"/>
+                                                       <reference key="NSNextKeyView" ref="494193237"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSButtonCell" key="NSCell" id="358614001">
                                                                <int key="NSCellFlags">67239424</int>
                                                        <int key="NSvFlags">290</int>
                                                        <string key="NSFrame">{{113, 175}, {282, 17}}</string>
                                                        <reference key="NSSuperview" ref="327235052"/>
+                                                       <reference key="NSWindow"/>
+                                                       <reference key="NSNextKeyView" ref="199018347"/>
                                                        <int key="NSTag">3</int>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="96725843">
                                        </object>
                                        <string key="NSFrameSize">{424, 254}</string>
                                        <reference key="NSSuperview"/>
+                                       <reference key="NSWindow"/>
+                                       <reference key="NSNextKeyView" ref="285173040"/>
                                </object>
-                               <string key="NSScreenRect">{{0, 0}, {2560, 1578}}</string>
-                               <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+                               <string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+                               <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
                                <string key="NSFrameAutosaveName">Authentication Panel</string>
+                               <bool key="NSWindowIsRestorable">YES</bool>
                        </object>
                </object>
                <object class="IBObjectContainer" key="IBDocument.Objects">
                        <object class="NSMutableArray" key="connectionRecords">
                                <bool key="EncodedWithXMLCoder">YES</bool>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">initialFirstResponder</string>
-                                               <reference key="source" ref="118512579"/>
-                                               <reference key="destination" ref="71972597"/>
-                                       </object>
-                                       <int key="connectionID">26</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">panel</string>
                                        </object>
                                        <int key="connectionID">100057</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">initialFirstResponder</string>
+                                               <reference key="source" ref="118512579"/>
+                                               <reference key="destination" ref="71972597"/>
+                                       </object>
+                                       <int key="connectionID">26</int>
+                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">nextKeyView</string>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">nextKeyView</string>
-                                               <reference key="source" ref="1000280557"/>
-                                               <reference key="destination" ref="199018347"/>
+                                               <reference key="source" ref="199018347"/>
+                                               <reference key="destination" ref="477300420"/>
                                        </object>
-                                       <int key="connectionID">100059</int>
+                                       <int key="connectionID">100060</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">nextKeyView</string>
-                                               <reference key="source" ref="199018347"/>
-                                               <reference key="destination" ref="477300420"/>
+                                               <reference key="source" ref="305175176"/>
+                                               <reference key="destination" ref="705333610"/>
                                        </object>
-                                       <int key="connectionID">100060</int>
+                                       <int key="connectionID">100067</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">nextKeyView</string>
-                                               <reference key="source" ref="477300420"/>
-                                               <reference key="destination" ref="71972597"/>
+                                               <reference key="source" ref="494193237"/>
+                                               <reference key="destination" ref="305175176"/>
                                        </object>
-                                       <int key="connectionID">100061</int>
+                                       <int key="connectionID">100066</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">nextKeyView</string>
-                                               <reference key="source" ref="833115728"/>
-                                               <reference key="destination" ref="368270689"/>
+                                               <reference key="source" ref="368270689"/>
+                                               <reference key="destination" ref="657854151"/>
                                        </object>
-                                       <int key="connectionID">100063</int>
+                                       <int key="connectionID">100064</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">nextKeyView</string>
-                                               <reference key="source" ref="368270689"/>
-                                               <reference key="destination" ref="657854151"/>
+                                               <reference key="source" ref="477300420"/>
+                                               <reference key="destination" ref="71972597"/>
                                        </object>
-                                       <int key="connectionID">100064</int>
+                                       <int key="connectionID">100061</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">nextKeyView</string>
-                                               <reference key="source" ref="657854151"/>
-                                               <reference key="destination" ref="494193237"/>
+                                               <reference key="source" ref="833115728"/>
+                                               <reference key="destination" ref="368270689"/>
                                        </object>
-                                       <int key="connectionID">100065</int>
+                                       <int key="connectionID">100063</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">nextKeyView</string>
-                                               <reference key="source" ref="494193237"/>
-                                               <reference key="destination" ref="305175176"/>
+                                               <reference key="source" ref="657854151"/>
+                                               <reference key="destination" ref="494193237"/>
                                        </object>
-                                       <int key="connectionID">100066</int>
+                                       <int key="connectionID">100065</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">nextKeyView</string>
-                                               <reference key="source" ref="305175176"/>
-                                               <reference key="destination" ref="705333610"/>
+                                               <reference key="source" ref="1000280557"/>
+                                               <reference key="destination" ref="199018347"/>
                                        </object>
-                                       <int key="connectionID">100067</int>
+                                       <int key="connectionID">100059</int>
                                </object>
                        </object>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <bool key="EncodedWithXMLCoder">YES</bool>
                                <object class="NSArray" key="dict.sortedKeys">
                                        <bool key="EncodedWithXMLCoder">YES</bool>
+                                       <string>-1.IBPluginDependency</string>
+                                       <string>-2.IBPluginDependency</string>
                                        <string>-3.IBPluginDependency</string>
-                                       <string>-3.ImportedFromIB2</string>
                                        <string>10.IBPluginDependency</string>
-                                       <string>10.ImportedFromIB2</string>
                                        <string>100010.IBPluginDependency</string>
                                        <string>100011.IBPluginDependency</string>
                                        <string>100012.IBPluginDependency</string>
                                        <string>100019.IBPluginDependency</string>
                                        <string>100039.IBPluginDependency</string>
                                        <string>100047.IBPluginDependency</string>
-                                       <string>100047.ImportedFromIB2</string>
                                        <string>100050.IBPluginDependency</string>
                                        <string>11.IBPluginDependency</string>
-                                       <string>11.ImportedFromIB2</string>
                                        <string>12.IBPluginDependency</string>
-                                       <string>12.ImportedFromIB2</string>
                                        <string>13.IBPluginDependency</string>
-                                       <string>13.ImportedFromIB2</string>
                                        <string>14.IBPluginDependency</string>
-                                       <string>14.ImportedFromIB2</string>
                                        <string>15.CustomClassName</string>
                                        <string>15.IBPluginDependency</string>
-                                       <string>15.ImportedFromIB2</string>
                                        <string>16.IBPluginDependency</string>
-                                       <string>16.ImportedFromIB2</string>
                                        <string>17.IBPluginDependency</string>
-                                       <string>17.ImportedFromIB2</string>
                                        <string>19.IBPluginDependency</string>
-                                       <string>19.ImportedFromIB2</string>
                                        <string>39.IBPluginDependency</string>
-                                       <string>39.ImportedFromIB2</string>
-                                       <string>5.IBEditorWindowLastContentRect</string>
                                        <string>5.IBPluginDependency</string>
-                                       <string>5.IBViewEditorWindowController.showingLayoutRectangles</string>
                                        <string>5.IBWindowTemplateEditedContentRect</string>
-                                       <string>5.ImportedFromIB2</string>
-                                       <string>5.windowTemplate.hasMaxSize</string>
-                                       <string>5.windowTemplate.hasMinSize</string>
-                                       <string>5.windowTemplate.maxSize</string>
-                                       <string>5.windowTemplate.minSize</string>
                                        <string>6.IBPluginDependency</string>
-                                       <string>6.ImportedFromIB2</string>
                                </object>
                                <object class="NSMutableArray" key="dict.values">
                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <integer value="1"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>NSSecureTextField</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <integer value="1"/>
-                                       <string>{{288, 843}, {424, 254}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <integer value="1"/>
                                        <string>{{288, 843}, {424, 254}}</string>
-                                       <integer value="1"/>
-                                       <integer value="0"/>
-                                       <integer value="0"/>
-                                       <string>{424, 282}</string>
-                                       <string>{424, 282}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <integer value="1"/>
                                </object>
                        </object>
                        <object class="NSMutableDictionary" key="unlocalizedProperties">
                                <bool key="EncodedWithXMLCoder">YES</bool>
                                <reference key="dict.sortedKeys" ref="498544300"/>
-                               <object class="NSMutableArray" key="dict.values">
-                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                               </object>
+                               <reference key="dict.values" ref="498544300"/>
                        </object>
                        <nil key="activeLocalization"/>
                        <object class="NSMutableDictionary" key="localizations">
                                <bool key="EncodedWithXMLCoder">YES</bool>
                                <reference key="dict.sortedKeys" ref="498544300"/>
-                               <object class="NSMutableArray" key="dict.values">
-                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                               </object>
+                               <reference key="dict.values" ref="498544300"/>
                        </object>
                        <nil key="sourceID"/>
                        <int key="maxID">100067</int>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">
                                <bool key="EncodedWithXMLCoder">YES</bool>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">FirstResponder</string>
-                                       <string key="superclassName">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBUserSource</string>
-                                               <string key="minorKey"/>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSControl</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/Misc/WebNSControlExtras.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSControl</string>
-                                       <string key="superclassName">NSView</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBUserSource</string>
-                                               <string key="minorKey"/>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/Misc/WebDownload.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/Misc/WebIconDatabaseDelegate.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/Misc/WebNSObjectExtras.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/Plugins/WebJavaPlugIn.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/Plugins/WebPlugin.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/Plugins/WebPluginContainer.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/Plugins/WebPluginContainerPrivate.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/Plugins/WebPluginDatabase.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/Plugins/WebPluginPrivate.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/WebInspector/WebNodeHighlight.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/WebView/WebEditingDelegate.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/WebView/WebEditingDelegatePrivate.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/WebView/WebFrameInternal.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/WebView/WebFrameLoadDelegate.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/WebView/WebFrameLoadDelegatePrivate.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/WebView/WebHistoryDelegate.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/WebView/WebPolicyDelegate.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/WebView/WebPolicyDelegatePrivate.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/WebView/WebResourceLoadDelegate.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/WebView/WebResourceLoadDelegatePrivate.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/WebView/WebScriptDebugDelegate.h</string>
-                                       </object>
-                               </object>
                                <object class="IBPartialClassDescription">
                                        <string key="className">NSObject</string>
                                        <object class="NSMutableDictionary" key="actions">
                                        </object>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/WebView/WebUIDelegate.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/WebView/WebUIDelegatePrivate.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier" id="153972132">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/WebView/WebViewPrivate.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBUserSource</string>
-                                               <string key="minorKey"/>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSView</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/Misc/WebNSViewExtras.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSView</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/Plugins/WebBaseNetscapePluginView.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSView</string>
-                                       <string key="superclassName">NSResponder</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBUserSource</string>
-                                               <string key="minorKey"/>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSWindow</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/Misc/WebNSWindowExtras.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSWindow</string>
-                                       <string key="superclassName">NSResponder</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBUserSource</string>
-                                               <string key="minorKey"/>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NonBlockingPanel</string>
-                                       <string key="superclassName">NSPanel</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier" id="1064703436">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/Panels/WebAuthenticationPanel.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NonBlockingPanel</string>
-                                       <string key="superclassName">NSPanel</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBUserSource</string>
-                                               <string key="minorKey"/>
+                                               <string key="minorKey">./Classes/NSObject.h</string>
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">
                                                        </object>
                                                </object>
                                        </object>
-                                       <reference key="sourceIdentifier" ref="1064703436"/>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBProjectSource</string>
+                                               <string key="minorKey">./Classes/WebAuthenticationPanel.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">WebNonBlockingPanel</string>
+                                       <string key="superclassName">NSPanel</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBProjectSource</string>
+                                               <string key="minorKey">./Classes/WebNonBlockingPanel.h</string>
+                                       </object>
                                </object>
                                <object class="IBPartialClassDescription">
                                        <string key="className">WebView</string>
-                                       <string key="superclassName">NSView</string>
                                        <object class="NSMutableDictionary" key="actions">
                                                <bool key="EncodedWithXMLCoder">YES</bool>
                                                <object class="NSArray" key="dict.sortedKeys">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>_openFrameInNewWindowFromMenu:</string>
+                                                       <string>_searchWithGoogleFromMenu:</string>
+                                                       <string>_searchWithSpotlightFromMenu:</string>
                                                        <string>alignCenter:</string>
                                                        <string>alignJustified:</string>
                                                        <string>alignLeft:</string>
                                                        <string>copyFont:</string>
                                                        <string>cut:</string>
                                                        <string>delete:</string>
-                                                       <string>goBack:</string>
-                                                       <string>goForward:</string>
-                                                       <string>makeTextLarger:</string>
-                                                       <string>makeTextSmaller:</string>
-                                                       <string>makeTextStandardSize:</string>
                                                        <string>moveToBeginningOfSentence:</string>
                                                        <string>moveToBeginningOfSentenceAndModifySelection:</string>
                                                        <string>moveToEndOfSentence:</string>
                                                        <string>moveToEndOfSentenceAndModifySelection:</string>
+                                                       <string>outdent:</string>
                                                        <string>paste:</string>
                                                        <string>pasteAsPlainText:</string>
                                                        <string>pasteAsRichText:</string>
                                                        <string>pasteFont:</string>
                                                        <string>performFindPanelAction:</string>
-                                                       <string>reload:</string>
                                                        <string>reloadFromOrigin:</string>
+                                                       <string>resetPageZoom:</string>
                                                        <string>selectSentence:</string>
                                                        <string>showGuessPanel:</string>
                                                        <string>startSpeaking:</string>
-                                                       <string>stopLoading:</string>
                                                        <string>stopSpeaking:</string>
-                                                       <string>takeStringURLFrom:</string>
-                                                       <string>toggleContinuousSpellChecking:</string>
-                                                       <string>toggleSmartInsertDelete:</string>
+                                                       <string>toggleAutomaticDashSubstitution:</string>
+                                                       <string>toggleAutomaticLinkDetection:</string>
+                                                       <string>toggleAutomaticQuoteSubstitution:</string>
+                                                       <string>toggleAutomaticSpellingCorrection:</string>
+                                                       <string>toggleAutomaticTextReplacement:</string>
+                                                       <string>toggleGrammarChecking:</string>
+                                                       <string>zoomPageIn:</string>
+                                                       <string>zoomPageOut:</string>
                                                </object>
                                                <object class="NSMutableArray" key="dict.values">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>NSMenuItem</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
                                                        <string>id</string>
                                                        <string>id</string>
                                                        <string>id</string>
                                                <bool key="EncodedWithXMLCoder">YES</bool>
                                                <object class="NSArray" key="dict.sortedKeys">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>_openFrameInNewWindowFromMenu:</string>
+                                                       <string>_searchWithGoogleFromMenu:</string>
+                                                       <string>_searchWithSpotlightFromMenu:</string>
                                                        <string>alignCenter:</string>
                                                        <string>alignJustified:</string>
                                                        <string>alignLeft:</string>
                                                        <string>copyFont:</string>
                                                        <string>cut:</string>
                                                        <string>delete:</string>
-                                                       <string>goBack:</string>
-                                                       <string>goForward:</string>
-                                                       <string>makeTextLarger:</string>
-                                                       <string>makeTextSmaller:</string>
-                                                       <string>makeTextStandardSize:</string>
                                                        <string>moveToBeginningOfSentence:</string>
                                                        <string>moveToBeginningOfSentenceAndModifySelection:</string>
                                                        <string>moveToEndOfSentence:</string>
                                                        <string>moveToEndOfSentenceAndModifySelection:</string>
+                                                       <string>outdent:</string>
                                                        <string>paste:</string>
                                                        <string>pasteAsPlainText:</string>
                                                        <string>pasteAsRichText:</string>
                                                        <string>pasteFont:</string>
                                                        <string>performFindPanelAction:</string>
-                                                       <string>reload:</string>
                                                        <string>reloadFromOrigin:</string>
+                                                       <string>resetPageZoom:</string>
                                                        <string>selectSentence:</string>
                                                        <string>showGuessPanel:</string>
                                                        <string>startSpeaking:</string>
-                                                       <string>stopLoading:</string>
                                                        <string>stopSpeaking:</string>
-                                                       <string>takeStringURLFrom:</string>
-                                                       <string>toggleContinuousSpellChecking:</string>
-                                                       <string>toggleSmartInsertDelete:</string>
+                                                       <string>toggleAutomaticDashSubstitution:</string>
+                                                       <string>toggleAutomaticLinkDetection:</string>
+                                                       <string>toggleAutomaticQuoteSubstitution:</string>
+                                                       <string>toggleAutomaticSpellingCorrection:</string>
+                                                       <string>toggleAutomaticTextReplacement:</string>
+                                                       <string>toggleGrammarChecking:</string>
+                                                       <string>zoomPageIn:</string>
+                                                       <string>zoomPageOut:</string>
                                                </object>
                                                <object class="NSMutableArray" key="dict.values">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">_openFrameInNewWindowFromMenu:</string>
+                                                               <string key="candidateClassName">NSMenuItem</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">_searchWithGoogleFromMenu:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">_searchWithSpotlightFromMenu:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
                                                        <object class="IBActionInfo">
                                                                <string key="name">alignCenter:</string>
                                                                <string key="candidateClassName">id</string>
                                                                <string key="name">delete:</string>
                                                                <string key="candidateClassName">id</string>
                                                        </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">goBack:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">goForward:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">makeTextLarger:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">makeTextSmaller:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">makeTextStandardSize:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
                                                        <object class="IBActionInfo">
                                                                <string key="name">moveToBeginningOfSentence:</string>
                                                                <string key="candidateClassName">id</string>
                                                                <string key="name">moveToEndOfSentenceAndModifySelection:</string>
                                                                <string key="candidateClassName">id</string>
                                                        </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">outdent:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
                                                        <object class="IBActionInfo">
                                                                <string key="name">paste:</string>
                                                                <string key="candidateClassName">id</string>
                                                                <string key="candidateClassName">id</string>
                                                        </object>
                                                        <object class="IBActionInfo">
-                                                               <string key="name">reload:</string>
+                                                               <string key="name">reloadFromOrigin:</string>
                                                                <string key="candidateClassName">id</string>
                                                        </object>
                                                        <object class="IBActionInfo">
-                                                               <string key="name">reloadFromOrigin:</string>
+                                                               <string key="name">resetPageZoom:</string>
                                                                <string key="candidateClassName">id</string>
                                                        </object>
                                                        <object class="IBActionInfo">
                                                                <string key="name">startSpeaking:</string>
                                                                <string key="candidateClassName">id</string>
                                                        </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">stopLoading:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
                                                        <object class="IBActionInfo">
                                                                <string key="name">stopSpeaking:</string>
                                                                <string key="candidateClassName">id</string>
                                                        </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">takeStringURLFrom:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">toggleContinuousSpellChecking:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">toggleSmartInsertDelete:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                               </object>
-                                       </object>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/WebView/WebView.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">WebView</string>
-                                       <object class="NSMutableDictionary" key="actions">
-                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSArray" key="dict.sortedKeys">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>_openFrameInNewWindowFromMenu:</string>
-                                                       <string>_searchWithGoogleFromMenu:</string>
-                                                       <string>_searchWithSpotlightFromMenu:</string>
-                                               </object>
-                                               <object class="NSMutableArray" key="dict.values">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>NSMenuItem</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                               </object>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="actionInfosByName">
-                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSArray" key="dict.sortedKeys">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>_openFrameInNewWindowFromMenu:</string>
-                                                       <string>_searchWithGoogleFromMenu:</string>
-                                                       <string>_searchWithSpotlightFromMenu:</string>
-                                               </object>
-                                               <object class="NSMutableArray" key="dict.values">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">_openFrameInNewWindowFromMenu:</string>
-                                                               <string key="candidateClassName">NSMenuItem</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">_searchWithGoogleFromMenu:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">_searchWithSpotlightFromMenu:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                               </object>
-                                       </object>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">mac/WebView/WebViewInternal.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">WebView</string>
-                                       <object class="NSMutableDictionary" key="actions">
-                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSArray" key="dict.sortedKeys">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>outdent:</string>
-                                                       <string>resetPageZoom:</string>
-                                                       <string>toggleAutomaticDashSubstitution:</string>
-                                                       <string>toggleAutomaticLinkDetection:</string>
-                                                       <string>toggleAutomaticQuoteSubstitution:</string>
-                                                       <string>toggleAutomaticSpellingCorrection:</string>
-                                                       <string>toggleAutomaticTextReplacement:</string>
-                                                       <string>toggleGrammarChecking:</string>
-                                                       <string>zoomPageIn:</string>
-                                                       <string>zoomPageOut:</string>
-                                               </object>
-                                               <object class="NSMutableArray" key="dict.values">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                               </object>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="actionInfosByName">
-                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSArray" key="dict.sortedKeys">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>outdent:</string>
-                                                       <string>resetPageZoom:</string>
-                                                       <string>toggleAutomaticDashSubstitution:</string>
-                                                       <string>toggleAutomaticLinkDetection:</string>
-                                                       <string>toggleAutomaticQuoteSubstitution:</string>
-                                                       <string>toggleAutomaticSpellingCorrection:</string>
-                                                       <string>toggleAutomaticTextReplacement:</string>
-                                                       <string>toggleGrammarChecking:</string>
-                                                       <string>zoomPageIn:</string>
-                                                       <string>zoomPageOut:</string>
-                                               </object>
-                                               <object class="NSMutableArray" key="dict.values">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">outdent:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">resetPageZoom:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
                                                        <object class="IBActionInfo">
                                                                <string key="name">toggleAutomaticDashSubstitution:</string>
                                                                <string key="candidateClassName">id</string>
                                                        </object>
                                                </object>
                                        </object>
-                                       <reference key="sourceIdentifier" ref="153972132"/>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">WebView</string>
-                                       <string key="superclassName">NSView</string>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBUserSource</string>
-                                               <string key="minorKey"/>
-                                       </object>
-                               </object>
-                       </object>
-                       <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">QuartzCore.framework/Headers/CIImageProvider.h</string>
+                                               <string key="majorKey">IBProjectSource</string>
+                                               <string key="minorKey">./Classes/WebView.h</string>
                                        </object>
                                </object>
                        </object>
                        <integer value="3000" key="NS.object.0"/>
                </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-               <string key="IBDocument.LastKnownRelativeProjectPath">../../../WebKit.xcodeproj</string>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
        </data>
 </archive>
index 42a4b1d216377f6a01e21dc1d09ba48dd6d67c41..d6d591baf61fa4ca58f74c6c2dd3dc355b073a2a 100644 (file)
Binary files a/Source/WebKit/mac/Panels/English.lproj/WebAuthenticationPanel.nib/keyedobjects.nib and b/Source/WebKit/mac/Panels/English.lproj/WebAuthenticationPanel.nib/keyedobjects.nib differ
index 6e945d24daf862765a1596d9175473a37e1064ba..8f04f17c5054c45294901e3892890e7ebc0f1995 100644 (file)
@@ -64,6 +64,6 @@
 @end
 
 // This is in the header so it can be used from the nib file
-@interface NonBlockingPanel : NSPanel
+@interface WebNonBlockingPanel : NSPanel
 @end
 
index 6bdbfd2c286205077783a2cc20f516d7ef3c49a5..e2f483e0f2805e691430b9d76ade16b23bc5d5ee 100644 (file)
 
 @end
 
-@implementation NonBlockingPanel
+@implementation WebNonBlockingPanel
 
 - (BOOL)_blocksActionWhenModal:(SEL)theAction
 {
index 352bd6de87d4cfc8f68d750469ce962b32a9136f..1dfeb03f544ab030fdd37ccf0c02ddb73a10af5d 100644 (file)
@@ -98,9 +98,9 @@ extern "C" NSString *_NSPathForSystemFramework(NSString *framework);
 - (NSSet *)_visiblePDFPages;
 @end;
 
-// PDFPrefUpdatingProxy is a class that forwards everything it gets to a target and updates the PDF viewing prefs
+// WebPDFPrefUpdatingProxy is a class that forwards everything it gets to a target and updates the PDF viewing prefs
 // after each of those messages.  We use it as a way to hook all the places that the PDF viewing attrs change.
-@interface PDFPrefUpdatingProxy : NSProxy {
+@interface WebPDFPrefUpdatingProxy : NSProxy {
     WebPDFView *view;
 }
 - (id)initWithView:(WebPDFView *)view;
@@ -338,7 +338,7 @@ static BOOL _PDFSelectionsAreEqual(PDFSelection *selectionA, PDFSelection *selec
         written = NO;
         // Messaging this proxy is the same as messaging PDFSubview, with the side effect that the
         // PDF viewing defaults are updated afterwards
-        PDFSubviewProxy = (PDFView *)[[PDFPrefUpdatingProxy alloc] initWithView:self];
+        PDFSubviewProxy = (PDFView *)[[WebPDFPrefUpdatingProxy alloc] initWithView:self];
     }
     
     return self;
@@ -1439,7 +1439,7 @@ static BOOL isFrameInRange(WebFrame *frame, DOMRange *range)
 
 - (void)_updatePreferencesSoon
 {   
-    // Consolidate calls; due to the PDFPrefUpdatingProxy method, this can be called multiple times with a single user action
+    // Consolidate calls; due to the WebPDFPrefUpdatingProxy method, this can be called multiple times with a single user action
     // such as showing the context menu.
     if (_willUpdatePreferencesSoon)
         return;
@@ -1488,7 +1488,7 @@ static BOOL isFrameInRange(WebFrame *frame, DOMRange *range)
 
 @end
 
-@implementation PDFPrefUpdatingProxy
+@implementation WebPDFPrefUpdatingProxy
 
 - (id)initWithView:(WebPDFView *)aView
 {
index 66038d687458e02441d464d34db226059f89fc37..55da5c7d27ea268a459cc5895a25024e4c2360d5 100644 (file)
@@ -1,3 +1,30 @@
+2011-09-19  Dan Bernstein  <mitz@apple.com>
+
+        WebKit2 part of [mac] WebKit contains Objective-C classes that are not prefixed with its standard prefixes
+        https://bugs.webkit.org/show_bug.cgi?id=68323
+
+        Reviewed by Sam Weinig.
+
+        Renamed FullKeyboardAccessWatcher to WKFullKeyboardAccessWatcher.
+        Renamed AccessibilityWebPageObject to WKAccessibilityWebPageObject.
+
+        * WebKit2.xcodeproj/project.pbxproj:
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/mac/AccessibilityWebPageObject.h: Removed.
+        * WebProcess/WebPage/mac/AccessibilityWebPageObject.mm: Removed.
+        * WebProcess/WebPage/mac/WKAccessibilityWebPageObject.h: Copied from Source/WebKit2/WebProcess/WebPage/mac/AccessibilityWebPageObject.h.
+        * WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm: Copied from Source/WebKit2/WebProcess/WebPage/mac/AccessibilityWebPageObject.mm.
+        * WebProcess/WebPage/mac/WebPageMac.mm:
+        (WebKit::WebPage::platformInitialize):
+        (WebKit::WebPage::accessibilityRemoteObject):
+        * WebProcess/mac/FullKeyboardAccessWatcher.h: Removed.
+        * WebProcess/mac/FullKeyboardAccessWatcher.mm: Removed.
+        * WebProcess/mac/WKFullKeyboardAccessWatcher.h: Copied from Source/WebKit2/WebProcess/mac/FullKeyboardAccessWatcher.h.
+        * WebProcess/mac/WKFullKeyboardAccessWatcher.mm: Copied from Source/WebKit2/WebProcess/mac/FullKeyboardAccessWatcher.mm.
+        (+[WKFullKeyboardAccessWatcher fullKeyboardAccessEnabled]):
+        * WebProcess/mac/WebProcessMac.mm:
+        (WebKit::WebProcess::fullKeyboardAccessEnabled):
+
 2011-09-14  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
 
         [Qt] [WK2] Implement popup menus in QDesktopWebView using QComboBox
index 27290e6ec396aa7725aece08e921756ff726344a..22158d14e9bfe2564ad7484b8c0fcad60d74a2a2 100644 (file)
                1CA8B945127C882A00576C2B /* WebInspectorProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CA8B943127C882A00576C2B /* WebInspectorProxyMessageReceiver.cpp */; };
                1CA8B946127C882A00576C2B /* WebInspectorProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CA8B944127C882A00576C2B /* WebInspectorProxyMessages.h */; };
                1CA8B954127C891500576C2B /* WebInspectorMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1C8E2DAD1278C5B200BC7BD0 /* WebInspectorMac.mm */; };
-               29CD55AA128E294F00133C85 /* AccessibilityWebPageObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 29CD55A8128E294F00133C85 /* AccessibilityWebPageObject.h */; };
-               29CD55AB128E294F00133C85 /* AccessibilityWebPageObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29CD55A9128E294F00133C85 /* AccessibilityWebPageObject.mm */; };
+               29CD55AA128E294F00133C85 /* WKAccessibilityWebPageObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 29CD55A8128E294F00133C85 /* WKAccessibilityWebPageObject.h */; };
+               29CD55AB128E294F00133C85 /* WKAccessibilityWebPageObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29CD55A9128E294F00133C85 /* WKAccessibilityWebPageObject.mm */; };
                31EA25D2134F78C0005B1452 /* NativeWebMouseEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 31EA25D0134F78B2005B1452 /* NativeWebMouseEventMac.mm */; };
                330934471315B9220097A7BC /* WebCookieManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 330934431315B9220097A7BC /* WebCookieManagerMessageReceiver.cpp */; };
                330934481315B9220097A7BC /* WebCookieManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 330934441315B9220097A7BC /* WebCookieManagerMessages.h */; };
                E18C92F412DB9E7100CF2AEB /* PrintInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E18C92F312DB9E7100CF2AEB /* PrintInfo.cpp */; };
                E1A31732134CEA6C007C9A4F /* AttributedString.h in Headers */ = {isa = PBXBuildFile; fileRef = E1A31731134CEA6C007C9A4F /* AttributedString.h */; };
                E1A31735134CEA80007C9A4F /* AttributedString.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1A31734134CEA80007C9A4F /* AttributedString.mm */; };
-               E1BB16A413201B9B00F49431 /* FullKeyboardAccessWatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = E1BB1688132018BA00F49431 /* FullKeyboardAccessWatcher.h */; };
-               E1BB16A513201B9B00F49431 /* FullKeyboardAccessWatcher.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1BB1689132018BA00F49431 /* FullKeyboardAccessWatcher.mm */; };
+               E1BB16A413201B9B00F49431 /* WKFullKeyboardAccessWatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = E1BB1688132018BA00F49431 /* WKFullKeyboardAccessWatcher.h */; };
+               E1BB16A513201B9B00F49431 /* WKFullKeyboardAccessWatcher.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1BB1689132018BA00F49431 /* WKFullKeyboardAccessWatcher.mm */; };
                E1CC1B9012D7EADF00625838 /* PrintInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = E1CC1B8E12D7EADF00625838 /* PrintInfo.h */; };
                E1CC1B9112D7EADF00625838 /* PrintInfoMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1CC1B8F12D7EADF00625838 /* PrintInfoMac.mm */; };
                E1EE53E311F8CFC000CCBEE4 /* InjectedBundlePageEditorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EE53DC11F8CF9F00CCBEE4 /* InjectedBundlePageEditorClient.h */; };
                1CA8B935127C774E00576C2B /* WebInspectorProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebInspectorProxyMac.mm; sourceTree = "<group>"; };
                1CA8B943127C882A00576C2B /* WebInspectorProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebInspectorProxyMessageReceiver.cpp; sourceTree = "<group>"; };
                1CA8B944127C882A00576C2B /* WebInspectorProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebInspectorProxyMessages.h; sourceTree = "<group>"; };
-               29CD55A8128E294F00133C85 /* AccessibilityWebPageObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityWebPageObject.h; sourceTree = "<group>"; };
-               29CD55A9128E294F00133C85 /* AccessibilityWebPageObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AccessibilityWebPageObject.mm; sourceTree = "<group>"; };
+               29CD55A8128E294F00133C85 /* WKAccessibilityWebPageObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKAccessibilityWebPageObject.h; sourceTree = "<group>"; };
+               29CD55A9128E294F00133C85 /* WKAccessibilityWebPageObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKAccessibilityWebPageObject.mm; sourceTree = "<group>"; };
                31EA25D0134F78B2005B1452 /* NativeWebMouseEventMac.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = NativeWebMouseEventMac.mm; sourceTree = "<group>"; };
                31EA25D3134F78D6005B1452 /* NativeWebMouseEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeWebMouseEvent.h; sourceTree = "<group>"; };
                32DBCF5E0370ADEE00C91783 /* WebKit2Prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit2Prefix.h; sourceTree = "<group>"; };
                E18C92F312DB9E7100CF2AEB /* PrintInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PrintInfo.cpp; sourceTree = "<group>"; };
                E1A31731134CEA6C007C9A4F /* AttributedString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AttributedString.h; sourceTree = "<group>"; };
                E1A31734134CEA80007C9A4F /* AttributedString.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AttributedString.mm; sourceTree = "<group>"; };
-               E1BB1688132018BA00F49431 /* FullKeyboardAccessWatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FullKeyboardAccessWatcher.h; sourceTree = "<group>"; };
-               E1BB1689132018BA00F49431 /* FullKeyboardAccessWatcher.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = FullKeyboardAccessWatcher.mm; sourceTree = "<group>"; };
+               E1BB1688132018BA00F49431 /* WKFullKeyboardAccessWatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFullKeyboardAccessWatcher.h; sourceTree = "<group>"; };
+               E1BB1689132018BA00F49431 /* WKFullKeyboardAccessWatcher.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = WKFullKeyboardAccessWatcher.mm; sourceTree = "<group>"; };
                E1CC1B8E12D7EADF00625838 /* PrintInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrintInfo.h; sourceTree = "<group>"; };
                E1CC1B8F12D7EADF00625838 /* PrintInfoMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PrintInfoMac.mm; sourceTree = "<group>"; };
                E1EE53DC11F8CF9F00CCBEE4 /* InjectedBundlePageEditorClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageEditorClient.h; sourceTree = "<group>"; };
                        children = (
                                93C01DAA139AC91700ED51D7 /* CoreIPCClientRunLoop.h */,
                                93C01DAB139AC91700ED51D7 /* CoreIPCClientRunLoop.mm */,
-                               E1BB1688132018BA00F49431 /* FullKeyboardAccessWatcher.h */,
-                               E1BB1689132018BA00F49431 /* FullKeyboardAccessWatcher.mm */,
                                512DF6D6138C181A00A22FC6 /* KeychainItemShimMethods.h */,
                                512DF6D7138C181A00A22FC6 /* KeychainItemShimMethods.mm */,
                                511F8A7D138B46FE00A95F44 /* SecItemShimMethods.h */,
                                511F8A7E138B46FE00A95F44 /* SecItemShimMethods.mm */,
-                               1A6FA01D11E1526300DB1371 /* WebProcessMainMac.mm */,
                                BC3065C312592F8900E71278 /* WebProcessMac.mm */,
+                               1A6FA01D11E1526300DB1371 /* WebProcessMainMac.mm */,
                                511F8A77138B460900A95F44 /* WebProcessShim.h */,
                                511F8A78138B460900A95F44 /* WebProcessShim.mm */,
+                               E1BB1688132018BA00F49431 /* WKFullKeyboardAccessWatcher.h */,
+                               E1BB1689132018BA00F49431 /* WKFullKeyboardAccessWatcher.mm */,
                        );
                        path = mac;
                        sourceTree = "<group>";
                BC963D6C113DD19500574BE2 /* mac */ = {
                        isa = PBXGroup;
                        children = (
-                               29CD55A8128E294F00133C85 /* AccessibilityWebPageObject.h */,
-                               29CD55A9128E294F00133C85 /* AccessibilityWebPageObject.mm */,
                                1C8E2DAD1278C5B200BC7BD0 /* WebInspectorMac.mm */,
                                BC963D6D113DD1A500574BE2 /* WebPageMac.mm */,
+                               29CD55A8128E294F00133C85 /* WKAccessibilityWebPageObject.h */,
+                               29CD55A9128E294F00133C85 /* WKAccessibilityWebPageObject.mm */,
                        );
                        path = mac;
                        sourceTree = "<group>";
                                BCEE7DC5128B645D009827DA /* InjectedBundleClient.h in Headers */,
                                ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */,
                                1CA8B946127C882A00576C2B /* WebInspectorProxyMessages.h in Headers */,
-                               29CD55AA128E294F00133C85 /* AccessibilityWebPageObject.h in Headers */,
+                               29CD55AA128E294F00133C85 /* WKAccessibilityWebPageObject.h in Headers */,
                                5153569D1291B1D2000749DC /* WebPageContextMenuClient.h in Headers */,
                                1AAB4A8D1296F0A20023952F /* SandboxExtension.h in Headers */,
                                BC7B6206129A0A6700D174A4 /* WebPageGroup.h in Headers */,
                                BCE81D8D1319F7EF00241910 /* FontInfo.h in Headers */,
                                BCE81D99131AE02100241910 /* DictionaryPopupInfo.h in Headers */,
                                37C4E9F6131C6E7E0029BD5A /* config.h in Headers */,
-                               E1BB16A413201B9B00F49431 /* FullKeyboardAccessWatcher.h in Headers */,
+                               E1BB16A413201B9B00F49431 /* WKFullKeyboardAccessWatcher.h in Headers */,
                                33AA1067131F060000D4A575 /* WebCookieManagerProxyClient.h in Headers */,
                                CDCA85C9132ABA4E00E961DF /* WKFullScreenWindowController.h in Headers */,
                                BCFD548C132D82680055D816 /* WKErrorCF.h in Headers */,
                                1CA8B945127C882A00576C2B /* WebInspectorProxyMessageReceiver.cpp in Sources */,
                                1CA8B954127C891500576C2B /* WebInspectorMac.mm in Sources */,
                                EDCA71B7128DDA8C00201B26 /* WKBundlePageOverlay.cpp in Sources */,
-                               29CD55AB128E294F00133C85 /* AccessibilityWebPageObject.mm in Sources */,
+                               29CD55AB128E294F00133C85 /* WKAccessibilityWebPageObject.mm in Sources */,
                                5153569C1291B1D2000749DC /* WebPageContextMenuClient.cpp in Sources */,
                                1AAB4AAA1296F1540023952F /* SandboxExtensionMac.mm in Sources */,
                                BC7B6207129A0A6700D174A4 /* WebPageGroup.cpp in Sources */,
                                3309345A1315B9980097A7BC /* WKCookieManager.cpp in Sources */,
                                BCE81D8C1319F7EF00241910 /* FontInfo.cpp in Sources */,
                                BCE81D98131AE02100241910 /* DictionaryPopupInfo.cpp in Sources */,
-                               E1BB16A513201B9B00F49431 /* FullKeyboardAccessWatcher.mm in Sources */,
+                               E1BB16A513201B9B00F49431 /* WKFullKeyboardAccessWatcher.mm in Sources */,
                                33AA1066131F060000D4A575 /* WebCookieManagerProxyClient.cpp in Sources */,
                                CD73BA47131ACC9A00EEDED2 /* WebFullScreenManagerProxyMessageReceiver.cpp in Sources */,
                                CD73BA4E131ACDB700EEDED2 /* WebFullScreenManagerMessageReceiver.cpp in Sources */,
index 623da39b9c3c27c05f580143c5388208f78039ef..ff65981b5b9e06edb9af73606edf10f437504266 100644 (file)
@@ -67,9 +67,9 @@
 #if PLATFORM(MAC)
 #include "DictionaryPopupInfo.h"
 #include <wtf/RetainPtr.h>
-OBJC_CLASS AccessibilityWebPageObject;
 OBJC_CLASS NSDictionary;
 OBJC_CLASS NSObject;
+OBJC_CLASS WKAccessibilityWebPageObject;
 #endif
 
 namespace CoreIPC {
@@ -330,7 +330,7 @@ public:
 
 #if PLATFORM(MAC)
     void registerUIProcessAccessibilityTokens(const CoreIPC::DataReference& elemenToken, const CoreIPC::DataReference& windowToken);
-    AccessibilityWebPageObject* accessibilityRemoteObject();
+    WKAccessibilityWebPageObject* accessibilityRemoteObject();
     WebCore::IntPoint accessibilityPosition() const { return m_accessibilityPosition; }    
     
     void sendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, const String& textInput);
@@ -605,7 +605,7 @@ private:
     // All plug-in views on this web page.
     HashSet<PluginView*> m_pluginViews;
 
-    RetainPtr<AccessibilityWebPageObject> m_mockAccessibilityElement;
+    RetainPtr<WKAccessibilityWebPageObject> m_mockAccessibilityElement;
 
     WebCore::KeyboardEvent* m_keyboardEventBeingInterpreted;
 
similarity index 90%
rename from Source/WebKit2/WebProcess/WebPage/mac/AccessibilityWebPageObject.h
rename to Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.h
index 3b331b97cb0e5296ebd7780f82fbe46bba0ff5cb..2772ad0e1a5c42afc1c043340b11ff4bdb031259 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef AccessibilityWebPageObject_h
-#define AccessibilityWebPageObject_h
+#ifndef WKAccessibilityWebPageObject_h
+#define WKAccessibilityWebPageObject_h
 
 namespace WebKit {
 class WebPage;
 }
 
-@interface AccessibilityWebPageObject : NSObject {
+@interface WKAccessibilityWebPageObject : NSObject {
     WebKit::WebPage* m_page;
     
     id m_parent;
@@ -44,4 +44,4 @@ class WebPage;
 
 @end
 
-#endif // AccessibilityWebPageObject_h
+#endif // WKAccessibilityWebPageObject_h
similarity index 98%
rename from Source/WebKit2/WebProcess/WebPage/mac/AccessibilityWebPageObject.mm
rename to Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm
index 9ecb3407823c84f7b6d30c38560802c768690bb3..7cf5b4b74d82f03bd2acecbf9ae65f366b0477ab 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import "config.h"
-#import "AccessibilityWebPageObject.h"
+#import "WKAccessibilityWebPageObject.h"
 
 #import "WebFrame.h"
 #import "WebPage.h"
@@ -39,7 +39,7 @@
 using namespace WebCore;
 using namespace WebKit;
 
-@implementation AccessibilityWebPageObject
+@implementation WKAccessibilityWebPageObject
 
 - (id)accessibilityRootObjectWrapper
 {
index af35a97e4a5810246661a2fae95d8dfc622e8a68..4369b0e401e4d64537f6bae2c7689152eefd1a97 100644 (file)
 #import "config.h"
 #import "WebPage.h"
 
-#import "AccessibilityWebPageObject.h"
 #import "AttributedString.h"
 #import "DataReference.h"
 #import "EditorState.h"
 #import "PluginView.h"
+#import "WKAccessibilityWebPageObject.h"
 #import "WebCoreArgumentCoders.h"
 #import "WebEvent.h"
 #import "WebEventConversion.h"
@@ -69,7 +69,7 @@ void WebPage::platformInitialize()
     m_page->addSchedulePair(SchedulePair::create([NSRunLoop currentRunLoop], kCFRunLoopCommonModes));
 #endif
 
-    AccessibilityWebPageObject* mockAccessibilityElement = [[[AccessibilityWebPageObject alloc] init] autorelease];
+    WKAccessibilityWebPageObject* mockAccessibilityElement = [[[WKAccessibilityWebPageObject alloc] init] autorelease];
 
     // Get the pid for the starting process.
     pid_t pid = WebProcess::shared().presenterApplicationPid();    
@@ -621,7 +621,7 @@ void WebPage::readSelectionFromPasteboard(const String& pasteboardName, bool& re
     result = true;
 }
     
-AccessibilityWebPageObject* WebPage::accessibilityRemoteObject()
+WKAccessibilityWebPageObject* WebPage::accessibilityRemoteObject()
 {
     return m_mockAccessibilityElement.get();
 }
similarity index 89%
rename from Source/WebKit2/WebProcess/mac/FullKeyboardAccessWatcher.h
rename to Source/WebKit2/WebProcess/mac/WKFullKeyboardAccessWatcher.h
index d6212b2c0334cf1ef386856ec007b67b0089702a..8b9e81dbc2a8e1ea6041db698c1b944ad69d1eca 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef FullKeyboardAccessWatcher_h
-#define FullKeyboardAccessWatcher_h
+#ifndef WKFullKeyboardAccessWatcher_h
+#define WKFullKeyboardAccessWatcher_h
 
 #import <Cocoa/Cocoa.h>
 
-@interface FullKeyboardAccessWatcher : NSObject {
+@interface WKFullKeyboardAccessWatcher : NSObject {
 @private
     BOOL fullKeyboardAccessEnabled;
 }
@@ -37,4 +37,4 @@
 
 @end;
 
-#endif // FullKeyboardAccessWatcher_h
+#endif // WKFullKeyboardAccessWatcher_h
similarity index 93%
rename from Source/WebKit2/WebProcess/mac/FullKeyboardAccessWatcher.mm
rename to Source/WebKit2/WebProcess/mac/WKFullKeyboardAccessWatcher.mm
index db19e951cc3de3b5b471e937b8f0568dc0ecf517..31dbaf36b69e246d97ad015491b0bd236f8d7e86 100644 (file)
  */
 
 #import "config.h"
-#import "FullKeyboardAccessWatcher.h"
+#import "WKFullKeyboardAccessWatcher.h"
 
 NSString * const KeyboardUIModeDidChangeNotification = @"com.apple.KeyboardUIModeDidChange";
 const CFStringRef AppleKeyboardUIMode = CFSTR("AppleKeyboardUIMode");
 const CFStringRef UniversalAccessDomain = CFSTR("com.apple.universalaccess");
 
-@implementation FullKeyboardAccessWatcher
+@implementation WKFullKeyboardAccessWatcher
 
 - (void)retrieveKeyboardUIModeFromPreferences:(NSNotification *)notification
 {
@@ -63,7 +63,7 @@ const CFStringRef UniversalAccessDomain = CFSTR("com.apple.universalaccess");
 
 + (BOOL)fullKeyboardAccessEnabled
 {
-    static FullKeyboardAccessWatcher *watcher = [[FullKeyboardAccessWatcher alloc] init];
+    static WKFullKeyboardAccessWatcher *watcher = [[WKFullKeyboardAccessWatcher alloc] init];
     return watcher->fullKeyboardAccessEnabled;
 }
 
index acd4abed7fe09f9644d41d56bd9059805ac9b435..803ccf782624b48450dc4bc71605836184d4da63 100644 (file)
@@ -26,8 +26,8 @@
 #import "config.h"
 #import "WebProcess.h"
 
-#import "FullKeyboardAccessWatcher.h"
 #import "SandboxExtension.h"
+#import "WKFullKeyboardAccessWatcher.h"
 #import "WebPage.h"
 #import "WebProcessCreationParameters.h"
 #import "WebProcessProxyMessages.h"
@@ -134,7 +134,7 @@ void WebProcess::platformClearResourceCaches(ResourceCachesToClear cachesToClear
 
 bool WebProcess::fullKeyboardAccessEnabled()
 {
-    return [FullKeyboardAccessWatcher fullKeyboardAccessEnabled];
+    return [WKFullKeyboardAccessWatcher fullKeyboardAccessEnabled];
 }
 
 #if ENABLE(WEB_PROCESS_SANDBOX)