Changeset 95448 in webkit
- Timestamp:
- Sep 19, 2011 11:36:16 AM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 1 added
- 2 deleted
- 28 edited
- 6 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r95447 r95448 1 2011-09-19 Dan Bernstein <mitz@apple.com> 2 3 JavaScriptCore part of [mac] WebKit contains Objective-C classes that are not prefixed with its standard prefixes 4 https://bugs.webkit.org/show_bug.cgi?id=68323 5 6 Reviewed by Sam Weinig. 7 8 Renamed WTFMainThreadCaller to JSWTFMainThreadCaller. 9 10 * wtf/mac/MainThreadMac.mm: 11 (WTF::initializeMainThreadPlatform): 12 (WTF::initializeMainThreadToProcessMainThreadPlatform): 13 1 14 2011-09-19 Oliver Hunt <oliver@apple.com> 2 15 -
trunk/Source/JavaScriptCore/wtf/mac/MainThreadMac.mm
r85265 r95448 36 36 #import <wtf/Threading.h> 37 37 38 @interface WTFMainThreadCaller : NSObject {38 @interface JSWTFMainThreadCaller : NSObject { 39 39 } 40 40 - (void)call; 41 41 @end 42 42 43 @implementation WTFMainThreadCaller43 @implementation JSWTFMainThreadCaller 44 44 45 45 - (void)call … … 48 48 } 49 49 50 @end // implementation WTFMainThreadCaller50 @end // implementation JSWTFMainThreadCaller 51 51 52 52 namespace WTF { 53 53 54 static WTFMainThreadCaller* staticMainThreadCaller;54 static JSWTFMainThreadCaller* staticMainThreadCaller; 55 55 static bool isTimerPosted; // This is only accessed on the 'main' thread. 56 56 static bool mainThreadEstablishedAsPthreadMain; … … 61 61 { 62 62 ASSERT(!staticMainThreadCaller); 63 staticMainThreadCaller = [[ WTFMainThreadCaller alloc] init];63 staticMainThreadCaller = [[JSWTFMainThreadCaller alloc] init]; 64 64 65 65 mainThreadEstablishedAsPthreadMain = false; … … 74 74 75 75 ASSERT(!staticMainThreadCaller); 76 staticMainThreadCaller = [[ WTFMainThreadCaller alloc] init];76 staticMainThreadCaller = [[JSWTFMainThreadCaller alloc] init]; 77 77 78 78 mainThreadEstablishedAsPthreadMain = true; -
trunk/Source/WebCore/ChangeLog
r95445 r95448 1 2011-09-19 Dan Bernstein <mitz@apple.com> 2 3 WebCore part of [mac] WebKit contains Objective-C classes that are not prefixed with its standard prefixes 4 https://bugs.webkit.org/show_bug.cgi?id=68323 5 6 Reviewed by Sam Weinig. 7 8 Renamed AccessibilityObjectWrapper to WebAccessibilityObjectWrapper. 9 Renamed CascadeList to WebCascadeList. 10 Renamed CookieStorageObjCAdapter to WebCookieStorageObjCAdapter. 11 Renamed LanguageChangeObserver to WebLanguageChangeObserver. 12 Renamed ScrollAnimationHelperDelegate to WebScrollAnimationHelperDelegate. 13 Renamed ScrollbarPainterControllerDelegate to WebScrollbarPainterControllerDelegate. 14 Renamed ScrollbarPainterDelegate to WebScrollbarPainterDelegate. 15 Renamed ScrollbarPartAnimation to WebScrollbarPartAnimation. 16 Renamed ScrollbarPrefsObserver to WebScrollbarPrefsObserver. 17 18 * WebCore.gyp/WebCore.gyp: Updated for the renaming of CascadeList to WebCascadeList. 19 * WebCore.xcodeproj/project.pbxproj: 20 * accessibility/AccessibilityObject.h: 21 * accessibility/mac/AXObjectCacheMac.mm: 22 (WebCore::AXObjectCache::attachWrapper): 23 * accessibility/mac/AccessibilityObjectMac.mm: 24 * accessibility/mac/AccessibilityObjectWrapper.h: Removed. 25 * accessibility/mac/AccessibilityObjectWrapper.mm: Removed. 26 * accessibility/mac/WebAccessibilityObjectWrapper.h: Copied from Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.h. 27 * accessibility/mac/WebAccessibilityObjectWrapper.mm: Copied from Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm. 28 (convertToNSArray): 29 (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]): 30 (-[WebAccessibilityObjectWrapper accessibilityIndexOfChild:]): 31 (-[WebAccessibilityObjectWrapper accessibilityArrayAttributeValues:index:maxCount:]): 32 * platform/graphics/mac/ComplexTextControllerCoreText.mm: 33 (WebCore::ComplexTextController::collectComplexTextRunsForCharactersCoreText): 34 * platform/mac/Language.mm: 35 (WebCore::platformDefaultLanguage): 36 * platform/mac/ScrollAnimatorMac.h: 37 * platform/mac/ScrollAnimatorMac.mm: 38 (-[WebScrollbarPainterDelegate setUpAnimation:scrollerPainter:part:WebCore::animateAlphaTo:duration:]): 39 (WebCore::ScrollAnimatorMac::ScrollAnimatorMac): 40 * platform/mac/ScrollbarThemeMac.mm: 41 (WebCore::ScrollbarThemeMac::ScrollbarThemeMac): 42 * platform/network/mac/CookieStorageMac.mm: 43 (WebCore::startObservingCookieChanges): 44 1 45 2011-09-19 Cary Clark <caryclark@google.com> 2 46 -
trunk/Source/WebCore/WebCore.gyp/WebCore.gyp
r95396 r95448 1193 1193 # such as: 1194 1194 # 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. 1195 ' CascadeList=ChromiumWebCoreObjCCascadeList',1195 'WebCascadeList=ChromiumWebCoreObjCWebCascadeList', 1196 1196 'ScrollbarPrefsObserver=ChromiumWebCoreObjCScrollbarPrefsObserver', 1197 1197 'WebCoreRenderThemeNotificationObserver=ChromiumWebCoreObjCWebCoreRenderThemeNotificationObserver', -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r95394 r95448 667 667 29A812430FBB9C1D00510293 /* AccessibilityListBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 29A812250FBB9C1D00510293 /* AccessibilityListBox.h */; }; 668 668 29A812480FBB9CA900510293 /* AccessibilityObjectMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29A812440FBB9CA900510293 /* AccessibilityObjectMac.mm */; }; 669 29A812490FBB9CA900510293 /* AccessibilityObjectWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 29A812450FBB9CA900510293 /*AccessibilityObjectWrapper.h */; };670 29A8124A0FBB9CA900510293 /* AccessibilityObjectWrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29A812460FBB9CA900510293 /*AccessibilityObjectWrapper.mm */; };669 29A812490FBB9CA900510293 /* WebAccessibilityObjectWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 29A812450FBB9CA900510293 /* WebAccessibilityObjectWrapper.h */; }; 670 29A8124A0FBB9CA900510293 /* WebAccessibilityObjectWrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29A812460FBB9CA900510293 /* WebAccessibilityObjectWrapper.mm */; }; 671 671 29A8124B0FBB9CA900510293 /* AXObjectCacheMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29A812470FBB9CA900510293 /* AXObjectCacheMac.mm */; }; 672 672 2BE8E2C712A589EC00FAD550 /* HTMLMetaCharsetParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BE8E2C612A589EC00FAD550 /* HTMLMetaCharsetParser.h */; }; … … 7220 7220 29A812250FBB9C1D00510293 /* AccessibilityListBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityListBox.h; sourceTree = "<group>"; }; 7221 7221 29A812440FBB9CA900510293 /* AccessibilityObjectMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AccessibilityObjectMac.mm; sourceTree = "<group>"; }; 7222 29A812450FBB9CA900510293 /* AccessibilityObjectWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =AccessibilityObjectWrapper.h; sourceTree = "<group>"; };7223 29A812460FBB9CA900510293 /* AccessibilityObjectWrapper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path =AccessibilityObjectWrapper.mm; sourceTree = "<group>"; };7222 29A812450FBB9CA900510293 /* WebAccessibilityObjectWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebAccessibilityObjectWrapper.h; sourceTree = "<group>"; }; 7223 29A812460FBB9CA900510293 /* WebAccessibilityObjectWrapper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebAccessibilityObjectWrapper.mm; sourceTree = "<group>"; }; 7224 7224 29A812470FBB9CA900510293 /* AXObjectCacheMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AXObjectCacheMac.mm; sourceTree = "<group>"; }; 7225 7225 2BE8E2C612A589EC00FAD550 /* HTMLMetaCharsetParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLMetaCharsetParser.h; path = parser/HTMLMetaCharsetParser.h; sourceTree = "<group>"; }; … … 13771 13771 children = ( 13772 13772 29A812440FBB9CA900510293 /* AccessibilityObjectMac.mm */, 13773 29A812450FBB9CA900510293 /* AccessibilityObjectWrapper.h */,13774 29A812460FBB9CA900510293 /* AccessibilityObjectWrapper.mm */,13775 13773 29A812470FBB9CA900510293 /* AXObjectCacheMac.mm */, 13774 29A812450FBB9CA900510293 /* WebAccessibilityObjectWrapper.h */, 13775 29A812460FBB9CA900510293 /* WebAccessibilityObjectWrapper.mm */, 13776 13776 ); 13777 13777 path = mac; … … 20480 20480 76CDD2F51103DA6600680521 /* AccessibilityMenuListPopup.h in Headers */, 20481 20481 29A812360FBB9C1D00510293 /* AccessibilityObject.h in Headers */, 20482 29A812490FBB9CA900510293 /* AccessibilityObjectWrapper.h in Headers */,20482 29A812490FBB9CA900510293 /* WebAccessibilityObjectWrapper.h in Headers */, 20483 20483 A409C985116D0DDD007197BD /* AccessibilityProgressIndicator.h in Headers */, 20484 20484 29A812390FBB9C1D00510293 /* AccessibilityRenderObject.h in Headers */, … … 23837 23837 76CDD2F41103DA6600680521 /* AccessibilityMenuListPopup.cpp in Sources */, 23838 23838 29A812480FBB9CA900510293 /* AccessibilityObjectMac.mm in Sources */, 23839 29A8124A0FBB9CA900510293 /* AccessibilityObjectWrapper.mm in Sources */,23839 29A8124A0FBB9CA900510293 /* WebAccessibilityObjectWrapper.mm in Sources */, 23840 23840 A409C984116D0DDD007197BD /* AccessibilityProgressIndicator.cpp in Sources */, 23841 23841 B5D31DFA11CF610B009F22B4 /* ActiveDOMCallback.cpp in Sources */, -
trunk/Source/WebCore/accessibility/AccessibilityObject.h
r94716 r95448 50 50 51 51 #ifdef __OBJC__ 52 @class AccessibilityObjectWrapper;53 52 @class NSArray; 54 53 @class NSAttributedString; … … 58 57 @class NSValue; 59 58 @class NSView; 59 @class WebAccessibilityObjectWrapper; 60 60 #else 61 61 class NSArray; … … 69 69 typedef struct _AtkObject AtkObject; 70 70 typedef struct _AtkObject AccessibilityObjectWrapper; 71 #elif PLATFORM(MAC) 72 class WebAccessibilityObjectWrapper; 71 73 #else 72 74 class AccessibilityObjectWrapper; 73 75 #endif 76 #endif 77 78 #if PLATFORM(MAC) 79 typedef WebAccessibilityObjectWrapper AccessibilityObjectWrapper; 74 80 #endif 75 81 … … 684 690 685 691 #if PLATFORM(MAC) 686 RetainPtr< AccessibilityObjectWrapper> m_wrapper;692 RetainPtr<WebAccessibilityObjectWrapper> m_wrapper; 687 693 #elif PLATFORM(WIN) && !OS(WINCE) 688 694 COMPtr<AccessibilityObjectWrapper> m_wrapper; -
trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm
r85263 r95448 30 30 31 31 #import "AccessibilityObject.h" 32 #import "AccessibilityObjectWrapper.h"33 32 #import "RenderObject.h" 33 #import "WebAccessibilityObjectWrapper.h" 34 34 #import "WebCoreSystemInterface.h" 35 35 … … 52 52 void AXObjectCache::attachWrapper(AccessibilityObject* obj) 53 53 { 54 RetainPtr< AccessibilityObjectWrapper> wrapper(AdoptNS, [[AccessibilityObjectWrapper alloc] initWithAccessibilityObject:obj]);54 RetainPtr<WebAccessibilityObjectWrapper> wrapper(AdoptNS, [[WebAccessibilityObjectWrapper alloc] initWithAccessibilityObject:obj]); 55 55 obj->setWrapper(wrapper.get()); 56 56 } -
trunk/Source/WebCore/accessibility/mac/AccessibilityObjectMac.mm
r75031 r95448 29 29 #if HAVE(ACCESSIBILITY) 30 30 31 #import " AccessibilityObjectWrapper.h"31 #import "WebAccessibilityObjectWrapper.h" 32 32 #import "Widget.h" 33 33 -
trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.h
r95445 r95448 27 27 */ 28 28 29 #ifndef AccessibilityObjectWrapper_h30 #define AccessibilityObjectWrapper_h29 #ifndef WebAccessibilityObjectWrapper_h 30 #define WebAccessibilityObjectWrapper_h 31 31 32 32 namespace WebCore { … … 35 35 } 36 36 37 @interface AccessibilityObjectWrapper : NSObject {37 @interface WebAccessibilityObjectWrapper : NSObject { 38 38 WebCore::AccessibilityObject* m_object; 39 39 } … … 50 50 @end 51 51 52 #endif // AccessibilityObjectWrapper_h52 #endif // WebAccessibilityObjectWrapper_h -
trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm
r95445 r95448 28 28 29 29 #import "config.h" 30 #import " AccessibilityObjectWrapper.h"30 #import "WebAccessibilityObjectWrapper.h" 31 31 32 32 #if HAVE(ACCESSIBILITY) … … 335 335 @end 336 336 337 @implementation AccessibilityObjectWrapper337 @implementation WebAccessibilityObjectWrapper 338 338 339 339 - (id)initWithAccessibilityObject:(AccessibilityObject*)axObject … … 1348 1348 NSMutableArray* array = [NSMutableArray arrayWithCapacity: length]; 1349 1349 for (unsigned i = 0; i < length; ++i) { 1350 AccessibilityObjectWrapper* wrapper = vector[i]->wrapper();1350 WebAccessibilityObjectWrapper* wrapper = vector[i]->wrapper(); 1351 1351 ASSERT(wrapper); 1352 1352 if (wrapper) { … … 2746 2746 textMarkerRange = parameter; 2747 2747 2748 else if ([parameter isKindOfClass:[ AccessibilityObjectWrapper self]])2749 uiElement = [( AccessibilityObjectWrapper*)parameter accessibilityObject];2748 else if ([parameter isKindOfClass:[WebAccessibilityObjectWrapper self]]) 2749 uiElement = [(WebAccessibilityObjectWrapper*)parameter accessibilityObject]; 2750 2750 2751 2751 else if ([parameter isKindOfClass:[NSNumber self]]) … … 2773 2773 if ([attribute isEqualToString:NSAccessibilityUIElementsForSearchPredicateParameterizedAttribute]) { 2774 2774 AccessibilityObject* axStartObject = 0; 2775 if ([[dictionary objectForKey:@"AXStartElement"] isKindOfClass:[ AccessibilityObjectWrapper self]])2776 axStartObject = [( AccessibilityObjectWrapper*)[dictionary objectForKey:@"AXStartElement"] accessibilityObject];2775 if ([[dictionary objectForKey:@"AXStartElement"] isKindOfClass:[WebAccessibilityObjectWrapper self]]) 2776 axStartObject = [(WebAccessibilityObjectWrapper*)[dictionary objectForKey:@"AXStartElement"] accessibilityObject]; 2777 2777 2778 2778 AccessibilitySearchDirection axSearchDirection = SearchDirectionNext; … … 3081 3081 unsigned count = children.size(); 3082 3082 for (unsigned k = 0; k < count; ++k) { 3083 AccessibilityObjectWrapper* wrapper = children[k]->wrapper();3083 WebAccessibilityObjectWrapper* wrapper = children[k]->wrapper(); 3084 3084 if (wrapper == child || (children[k]->isAttachment() && [wrapper attachmentView] == child)) 3085 3085 return k; … … 3141 3141 NSMutableArray *subarray = [NSMutableArray arrayWithCapacity:available]; 3142 3142 for (unsigned added = 0; added < available; ++index, ++added) { 3143 AccessibilityObjectWrapper* wrapper = children[index]->wrapper();3143 WebAccessibilityObjectWrapper* wrapper = children[index]->wrapper(); 3144 3144 if (wrapper) { 3145 3145 // The attachment view should be returned, otherwise AX palindrome errors occur. -
trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm
r95394 r95448 49 49 #endif 50 50 51 @interface CascadeList : NSArray {51 @interface WebCascadeList : NSArray { 52 52 @private 53 53 const WebCore::Font* _font; … … 61 61 @end 62 62 63 @implementation CascadeList63 @implementation WebCascadeList 64 64 65 65 - (id)initWithFont:(const WebCore::Font*)font character:(UChar32)character … … 194 194 fontData = m_font.fontDataAt(0)->fontDataForCharacter(baseCharacter); 195 195 196 RetainPtr< CascadeList> cascadeList(AdoptNS, [[CascadeList alloc] initWithFont:&m_font character:baseCharacter]);196 RetainPtr<WebCascadeList> cascadeList(AdoptNS, [[WebCascadeList alloc] initWithFont:&m_font character:baseCharacter]); 197 197 198 198 stringAttributes.adoptCF(CFDictionaryCreateMutableCopy(kCFAllocatorDefault, 0, fontData->getCFStringAttributes(m_font.typesettingFeatures(), fontData->platformData().orientation()))); -
trunk/Source/WebCore/platform/mac/Language.mm
r71271 r95448 37 37 static NSString *preferredLanguageCode; 38 38 39 @interface LanguageChangeObserver : NSObject {39 @interface WebLanguageChangeObserver : NSObject { 40 40 } 41 41 @end 42 42 43 @implementation LanguageChangeObserver43 @implementation WebLanguageChangeObserver 44 44 45 45 + (void)_webkit_languagePreferencesDidChange … … 105 105 static bool languageChangeObserverAdded; 106 106 if (!languageChangeObserverAdded) { 107 [[NSDistributedNotificationCenter defaultCenter] addObserver:[ LanguageChangeObserver self]107 [[NSDistributedNotificationCenter defaultCenter] addObserver:[WebLanguageChangeObserver self] 108 108 selector:@selector(_webkit_languagePreferencesDidChange) 109 109 name:@"AppleLanguagePreferencesChangedNotification" -
trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h
r93445 r95448 37 37 38 38 #ifdef __OBJC__ 39 @class ScrollAnimationHelperDelegate; 40 @class ScrollbarPainterDelegate; 41 @class ScrollbarPainterControllerDelegate; 42 @class ScrollbarPainterDelegate; 39 @class WebScrollAnimationHelperDelegate; 40 @class WebScrollbarPainterControllerDelegate; 41 @class WebScrollbarPainterDelegate; 43 42 #else 44 class ScrollAnimationHelperDelegate; 45 class ScrollbarPainterDelegate; 46 class ScrollbarPainterControllerDelegate; 47 class ScrollbarPainterDelegate; 43 class WebScrollAnimationHelperDelegate; 44 class WebScrollbarPainterControllerDelegate; 45 class WebScrollbarPainterDelegate; 48 46 #endif 49 47 … … 98 96 private: 99 97 RetainPtr<id> m_scrollAnimationHelper; 100 RetainPtr< ScrollAnimationHelperDelegate> m_scrollAnimationHelperDelegate;98 RetainPtr<WebScrollAnimationHelperDelegate> m_scrollAnimationHelperDelegate; 101 99 102 100 #if USE(SCROLLBAR_PAINTER) 103 101 RetainPtr<ScrollbarPainterController> m_scrollbarPainterController; 104 RetainPtr< ScrollbarPainterControllerDelegate> m_scrollbarPainterControllerDelegate;105 RetainPtr< id> m_scrollbarPainterDelegate;102 RetainPtr<WebScrollbarPainterControllerDelegate> m_scrollbarPainterControllerDelegate; 103 RetainPtr<WebScrollbarPainterDelegate> m_scrollbarPainterDelegate; 106 104 107 105 void initialScrollbarPaintTimerFired(Timer<ScrollAnimatorMac>*); -
trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm
r94214 r95448 53 53 @end 54 54 55 @interface ScrollAnimationHelperDelegate : NSObject55 @interface WebScrollAnimationHelperDelegate : NSObject 56 56 { 57 57 WebCore::ScrollAnimatorMac* _animator; … … 70 70 } 71 71 72 @implementation ScrollAnimationHelperDelegate72 @implementation WebScrollAnimationHelperDelegate 73 73 74 74 - (id)initWithScrollAnimator:(WebCore::ScrollAnimatorMac*)scrollAnimator … … 151 151 #if USE(SCROLLBAR_PAINTER) 152 152 153 @interface ScrollbarPainterControllerDelegate : NSObject153 @interface WebScrollbarPainterControllerDelegate : NSObject 154 154 { 155 155 WebCore::ScrollAnimatorMac* _animator; … … 158 158 @end 159 159 160 @implementation ScrollbarPainterControllerDelegate160 @implementation WebScrollbarPainterControllerDelegate 161 161 162 162 - (id)initWithScrollAnimator:(WebCore::ScrollAnimatorMac*)scrollAnimator … … 243 243 @end 244 244 245 @interface ScrollbarPartAnimation : NSAnimation245 @interface WebScrollbarPartAnimation : NSAnimation 246 246 { 247 247 RetainPtr<ScrollbarPainter> _scrollerPainter; … … 254 254 @end 255 255 256 @implementation ScrollbarPartAnimation256 @implementation WebScrollbarPartAnimation 257 257 258 258 - (id)initWithScrollbarPainter:(ScrollbarPainter)scrollerPainter part:(WebCore::ScrollbarPart)part scrollAnimator:(WebCore::ScrollAnimatorMac*)scrollAnimator animateAlphaTo:(CGFloat)newAlpha duration:(NSTimeInterval)duration … … 304 304 @end 305 305 306 @interface ScrollbarPainterDelegate : NSObject<NSAnimationDelegate>306 @interface WebScrollbarPainterDelegate : NSObject<NSAnimationDelegate> 307 307 { 308 308 WebCore::ScrollAnimatorMac* _animator; 309 309 310 RetainPtr< ScrollbarPartAnimation> _verticalKnobAnimation;311 RetainPtr< ScrollbarPartAnimation> _horizontalKnobAnimation;312 313 RetainPtr< ScrollbarPartAnimation> _verticalTrackAnimation;314 RetainPtr< ScrollbarPartAnimation> _horizontalTrackAnimation;310 RetainPtr<WebScrollbarPartAnimation> _verticalKnobAnimation; 311 RetainPtr<WebScrollbarPartAnimation> _horizontalKnobAnimation; 312 313 RetainPtr<WebScrollbarPartAnimation> _verticalTrackAnimation; 314 RetainPtr<WebScrollbarPartAnimation> _horizontalTrackAnimation; 315 315 } 316 316 - (id)initWithScrollAnimator:(WebCore::ScrollAnimatorMac*)scrollAnimator; … … 318 318 @end 319 319 320 @implementation ScrollbarPainterDelegate320 @implementation WebScrollbarPainterDelegate 321 321 322 322 - (id)initWithScrollAnimator:(WebCore::ScrollAnimatorMac*)scrollAnimator … … 360 360 } 361 361 362 - (void)setUpAnimation:(RetainPtr< ScrollbarPartAnimation>&)scrollbarPartAnimation scrollerPainter:(ScrollbarPainter)scrollerPainter part:(WebCore::ScrollbarPart)part animateAlphaTo:(CGFloat)newAlpha duration:(NSTimeInterval)duration362 - (void)setUpAnimation:(RetainPtr<WebScrollbarPartAnimation>&)scrollbarPartAnimation scrollerPainter:(ScrollbarPainter)scrollerPainter part:(WebCore::ScrollbarPart)part animateAlphaTo:(CGFloat)newAlpha duration:(NSTimeInterval)duration 363 363 { 364 364 // If the user has scrolled the page, then the scrollbars must be animated here. … … 393 393 [NSAnimationContext beginGrouping]; 394 394 [[NSAnimationContext currentContext] setDuration:duration]; 395 scrollbarPartAnimation.adoptNS([[ ScrollbarPartAnimation alloc] initWithScrollbarPainter:scrollerPainter395 scrollbarPartAnimation.adoptNS([[WebScrollbarPartAnimation alloc] initWithScrollbarPainter:scrollerPainter 396 396 part:part 397 397 scrollAnimator:_animator … … 470 470 , m_needsScrollerStyleUpdate(false) 471 471 { 472 m_scrollAnimationHelperDelegate.adoptNS([[ ScrollAnimationHelperDelegate alloc] initWithScrollAnimator:this]);472 m_scrollAnimationHelperDelegate.adoptNS([[WebScrollAnimationHelperDelegate alloc] initWithScrollAnimator:this]); 473 473 m_scrollAnimationHelper.adoptNS([[NSClassFromString(@"NSScrollAnimationHelper") alloc] initWithDelegate:m_scrollAnimationHelperDelegate.get()]); 474 474 475 475 #if USE(SCROLLBAR_PAINTER) 476 m_scrollbarPainterControllerDelegate.adoptNS([[ ScrollbarPainterControllerDelegate alloc] initWithScrollAnimator:this]);476 m_scrollbarPainterControllerDelegate.adoptNS([[WebScrollbarPainterControllerDelegate alloc] initWithScrollAnimator:this]); 477 477 m_scrollbarPainterController = [[[NSClassFromString(@"NSScrollerImpPair") alloc] init] autorelease]; 478 478 [m_scrollbarPainterController.get() setDelegate:m_scrollbarPainterControllerDelegate.get()]; 479 479 [m_scrollbarPainterController.get() setScrollerStyle:wkRecommendedScrollerStyle()]; 480 480 481 m_scrollbarPainterDelegate.adoptNS([[ ScrollbarPainterDelegate alloc] initWithScrollAnimator:this]);481 m_scrollbarPainterDelegate.adoptNS([[WebScrollbarPainterDelegate alloc] initWithScrollAnimator:this]); 482 482 #endif 483 483 } -
trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm
r93445 r95448 60 60 } 61 61 62 @interface ScrollbarPrefsObserver : NSObject62 @interface WebScrollbarPrefsObserver : NSObject 63 63 { 64 64 } … … 70 70 @end 71 71 72 @implementation ScrollbarPrefsObserver72 @implementation WebScrollbarPrefsObserver 73 73 74 74 + (void)appearancePrefsChanged:(NSNotification*)unusedNotification … … 193 193 if (!initialized) { 194 194 initialized = true; 195 [ ScrollbarPrefsObserver registerAsObserver];195 [WebScrollbarPrefsObserver registerAsObserver]; 196 196 preferencesChanged(); 197 197 } -
trunk/Source/WebCore/platform/network/mac/CookieStorageMac.mm
r94428 r95448 41 41 using namespace WebCore; 42 42 43 @interface CookieStorageObjCAdapter : NSObject43 @interface WebCookieStorageObjCAdapter : NSObject 44 44 -(void)notifyCookiesChangedOnMainThread; 45 45 -(void)cookiesChangedNotificationHandler:(NSNotification *)notification; … … 48 48 @end 49 49 50 @implementation CookieStorageObjCAdapter50 @implementation WebCookieStorageObjCAdapter 51 51 52 52 -(void)notifyCookiesChangedOnMainThread … … 97 97 } 98 98 99 static CookieStorageObjCAdapter *cookieStorageAdapter;99 static WebCookieStorageObjCAdapter *cookieStorageAdapter; 100 100 101 101 void startObservingCookieChanges() 102 102 { 103 103 if (!cookieStorageAdapter) 104 cookieStorageAdapter = [[ CookieStorageObjCAdapter alloc] init];104 cookieStorageAdapter = [[WebCookieStorageObjCAdapter alloc] init]; 105 105 [cookieStorageAdapter startListeningForCookieChangeNotifications]; 106 106 } -
trunk/Source/WebKit/ChangeLog
r95310 r95448 1 2011-09-19 Dan Bernstein <mitz@apple.com> 2 3 WebKit part of [mac] WebKit contains Objective-C classes that are not prefixed with its standard prefixes 4 https://bugs.webkit.org/show_bug.cgi?id=68323 5 6 Reviewed by Sam Weinig. 7 8 Updated for the renaming of NonBlockingPanel to WebNonBlockingPanel. 9 10 * English.lproj/WebJavaScriptTextInputPanel.nib/classes.nib: Removed. 11 * English.lproj/WebJavaScriptTextInputPanel.nib/designable.nib: Added. 12 * English.lproj/WebJavaScriptTextInputPanel.nib/info.nib: Removed. 13 * English.lproj/WebJavaScriptTextInputPanel.nib/keyedobjects.nib: 14 1 15 2011-09-16 Filip Pizlo <fpizlo@apple.com> 2 16 -
trunk/Source/WebKit/mac/ChangeLog
r95387 r95448 1 2011-09-19 Dan Bernstein <mitz@apple.com> 2 3 WebKit part of [mac] WebKit contains Objective-C classes that are not prefixed with its standard prefixes 4 https://bugs.webkit.org/show_bug.cgi?id=68323 5 6 Reviewed by Sam Weinig. 7 8 Renamed NonBlockingPanel to WebNonBlockingPanel. 9 Renamed ThreadEnabler to WebCocoaThreadingEnabler. 10 Renamed PDFPrefUpdatingProxy to WebPDFPrefUpdatingProxy. 11 12 * Misc/WebIconDatabase.mm: 13 (+[WebCocoaThreadingEnabler enableThreading]): 14 (importToWebCoreFormat): 15 * Panels/English.lproj/WebAuthenticationPanel.nib/designable.nib: 16 * Panels/English.lproj/WebAuthenticationPanel.nib/keyedobjects.nib: 17 * Panels/WebAuthenticationPanel.h: 18 * Panels/WebAuthenticationPanel.m: Renamed NonBlockingPanel to 19 WebNonBlockingPanel. Because Safari 5.1 uses NonBlockingPanel, this will 20 cause nightly builds to log an error message when showing the Safari 21 HTTP authentication sheet and disable the Quit command while the sheet 22 is disaplyed. 23 * WebView/WebPDFView.mm: 24 (-[WebPDFView initWithFrame:]): 25 (-[WebPDFView _updatePreferencesSoon]): 26 1 27 2011-09-17 Mihai Parparita <mihaip@chromium.org> 2 28 -
trunk/Source/WebKit/mac/Misc/WebIconDatabase.mm
r92068 r95448 562 562 @end 563 563 564 @interface ThreadEnabler : NSObject {564 @interface WebCocoaThreadingEnabler : NSObject { 565 565 } 566 566 + (void)enableThreading; … … 569 569 @end 570 570 571 @implementation ThreadEnabler571 @implementation WebCocoaThreadingEnabler 572 572 573 573 - (void)threadEnablingSelector:(id)arg … … 578 578 + (void)enableThreading 579 579 { 580 ThreadEnabler *enabler = [[ThreadEnabler alloc] init];580 WebCocoaThreadingEnabler *enabler = [[WebCocoaThreadingEnabler alloc] init]; 581 581 [NSThread detachNewThreadSelector:@selector(threadEnablingSelector:) toTarget:enabler withObject:nil]; 582 582 [enabler release]; … … 590 590 // make sure that happens here for all WebKit clients 591 591 if (![NSThread isMultiThreaded]) 592 [ ThreadEnabler enableThreading];592 [WebCocoaThreadingEnabler enableThreading]; 593 593 ASSERT([NSThread isMultiThreaded]); 594 594 -
trunk/Source/WebKit/mac/Panels/English.lproj/WebAuthenticationPanel.nib/designable.nib
r76300 r95448 3 3 <data> 4 4 <int key="IBDocument.SystemTarget">1050</int> 5 <string key="IBDocument.SystemVersion">1 0J567</string>6 <string key="IBDocument.InterfaceBuilderVersion"> 823</string>7 <string key="IBDocument.AppKitVersion">1 038.35</string>8 <string key="IBDocument.HIToolboxVersion"> 462.00</string>5 <string key="IBDocument.SystemVersion">11C57</string> 6 <string key="IBDocument.InterfaceBuilderVersion">1938</string> 7 <string key="IBDocument.AppKitVersion">1138.21</string> 8 <string key="IBDocument.HIToolboxVersion">567.00</string> 9 9 <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> 10 10 <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> 11 <string key="NS.object.0"> 823</string>11 <string key="NS.object.0">1938</string> 12 12 </object> 13 <object class="NS MutableArray" key="IBDocument.EditedObjectIDs">13 <object class="NSArray" key="IBDocument.IntegratedClassDependencies"> 14 14 <bool key="EncodedWithXMLCoder">YES</bool> 15 <integer value="6"/> 15 <string>NSTextField</string> 16 <string>NSView</string> 17 <string>NSWindowTemplate</string> 18 <string>NSTextFieldCell</string> 19 <string>NSButtonCell</string> 20 <string>NSImageCell</string> 21 <string>NSImageView</string> 22 <string>NSButton</string> 23 <string>NSCustomObject</string> 16 24 </object> 17 25 <object class="NSArray" key="IBDocument.PluginDependencies"> … … 40 48 <int key="NSWTFlags">1886912512</int> 41 49 <string key="NSWindowTitle">Log In</string> 42 <string key="NSWindowClass"> NonBlockingPanel</string>50 <string key="NSWindowClass">WebNonBlockingPanel</string> 43 51 <object class="NSMutableString" key="NSViewClass"> 44 52 <characters key="NS.bytes">View</characters> 45 53 </object> 46 < string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>54 <nil key="NSUserInterfaceItemIdentifier"/> 47 55 <object class="NSView" key="NSWindowView" id="327235052"> 48 56 <reference key="NSNextResponder"/> … … 55 63 <string key="NSFrame">{{101, 200}, {306, 34}}</string> 56 64 <reference key="NSSuperview" ref="327235052"/> 65 <reference key="NSWindow"/> 66 <reference key="NSNextKeyView" ref="1000280557"/> 57 67 <int key="NSTag">1</int> 58 68 <bool key="NSEnabled">YES</bool> … … 93 103 <string key="NSFrame">{{101, 147}, {306, 20}}</string> 94 104 <reference key="NSSuperview" ref="327235052"/> 105 <reference key="NSWindow"/> 106 <reference key="NSNextKeyView" ref="477300420"/> 95 107 <int key="NSTag">2</int> 96 108 <bool key="NSEnabled">YES</bool> … … 115 127 <string key="NSFrame">{{326, 12}, {84, 32}}</string> 116 128 <reference key="NSSuperview" ref="327235052"/> 129 <reference key="NSWindow"/> 130 <reference key="NSNextKeyView"/> 117 131 <bool key="NSEnabled">YES</bool> 118 132 <object class="NSButtonCell" key="NSCell" id="568224179"> … … 140 154 <string key="NSFrame">{{242, 12}, {84, 32}}</string> 141 155 <reference key="NSSuperview" ref="327235052"/> 156 <reference key="NSWindow"/> 157 <reference key="NSNextKeyView" ref="305175176"/> 142 158 <bool key="NSEnabled">YES</bool> 143 159 <object class="NSButtonCell" key="NSCell" id="55525334"> … … 161 177 <string key="NSFrame">{{174, 117}, {230, 22}}</string> 162 178 <reference key="NSSuperview" ref="327235052"/> 179 <reference key="NSWindow"/> 180 <reference key="NSNextKeyView" ref="833115728"/> 163 181 <int key="NSTag">3</int> 164 182 <bool key="NSEnabled">YES</bool> … … 193 211 <string key="NSFrame">{{174, 87}, {230, 22}}</string> 194 212 <reference key="NSSuperview" ref="327235052"/> 213 <reference key="NSWindow"/> 214 <reference key="NSNextKeyView" ref="657854151"/> 195 215 <int key="NSTag">4</int> 196 216 <bool key="NSEnabled">YES</bool> … … 212 232 <string key="NSFrame">{{101, 119}, {68, 17}}</string> 213 233 <reference key="NSSuperview" ref="327235052"/> 234 <reference key="NSWindow"/> 235 <reference key="NSNextKeyView" ref="71972597"/> 214 236 <bool key="NSEnabled">YES</bool> 215 237 <object class="NSTextFieldCell" key="NSCell" id="159596654"> … … 228 250 <string key="NSFrame">{{101, 89}, {68, 17}}</string> 229 251 <reference key="NSSuperview" ref="327235052"/> 252 <reference key="NSWindow"/> 253 <reference key="NSNextKeyView" ref="368270689"/> 230 254 <bool key="NSEnabled">YES</bool> 231 255 <object class="NSTextFieldCell" key="NSCell" id="766878508"> … … 256 280 <string key="NSFrame">{{20, 170}, {64, 64}}</string> 257 281 <reference key="NSSuperview" ref="327235052"/> 282 <reference key="NSWindow"/> 283 <reference key="NSNextKeyView" ref="705333610"/> 258 284 <bool key="NSEnabled">YES</bool> 259 285 <object class="NSImageCell" key="NSCell" id="375502905"> … … 272 298 <string key="NSFrame">{{102, 58}, {280, 18}}</string> 273 299 <reference key="NSSuperview" ref="327235052"/> 300 <reference key="NSWindow"/> 301 <reference key="NSNextKeyView" ref="494193237"/> 274 302 <bool key="NSEnabled">YES</bool> 275 303 <object class="NSButtonCell" key="NSCell" id="358614001"> … … 295 323 <string key="NSFrame">{{113, 175}, {282, 17}}</string> 296 324 <reference key="NSSuperview" ref="327235052"/> 325 <reference key="NSWindow"/> 326 <reference key="NSNextKeyView" ref="199018347"/> 297 327 <int key="NSTag">3</int> 298 328 <bool key="NSEnabled">YES</bool> … … 315 345 <string key="NSFrameSize">{424, 254}</string> 316 346 <reference key="NSSuperview"/> 317 </object> 318 <string key="NSScreenRect">{{0, 0}, {2560, 1578}}</string> 319 <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> 347 <reference key="NSWindow"/> 348 <reference key="NSNextKeyView" ref="285173040"/> 349 </object> 350 <string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string> 351 <string key="NSMaxSize">{10000000000000, 10000000000000}</string> 320 352 <string key="NSFrameAutosaveName">Authentication Panel</string> 353 <bool key="NSWindowIsRestorable">YES</bool> 321 354 </object> 322 355 </object> … … 326 359 <object class="IBConnectionRecord"> 327 360 <object class="IBOutletConnection" key="connection"> 328 <string key="label">initialFirstResponder</string>329 <reference key="source" ref="118512579"/>330 <reference key="destination" ref="71972597"/>331 </object>332 <int key="connectionID">26</int>333 </object>334 <object class="IBConnectionRecord">335 <object class="IBOutletConnection" key="connection">336 361 <string key="label">panel</string> 337 362 <reference key="source" ref="238662661"/> … … 414 439 <object class="IBConnectionRecord"> 415 440 <object class="IBOutletConnection" key="connection"> 441 <string key="label">initialFirstResponder</string> 442 <reference key="source" ref="118512579"/> 443 <reference key="destination" ref="71972597"/> 444 </object> 445 <int key="connectionID">26</int> 446 </object> 447 <object class="IBConnectionRecord"> 448 <object class="IBOutletConnection" key="connection"> 416 449 <string key="label">nextKeyView</string> 417 450 <reference key="source" ref="705333610"/> … … 423 456 <object class="IBOutletConnection" key="connection"> 424 457 <string key="label">nextKeyView</string> 425 <reference key="source" ref="1000280557"/>426 <reference key="destination" ref="199018347"/>427 </object>428 <int key="connectionID">100059</int>429 </object>430 <object class="IBConnectionRecord">431 <object class="IBOutletConnection" key="connection">432 <string key="label">nextKeyView</string>433 458 <reference key="source" ref="199018347"/> 434 459 <reference key="destination" ref="477300420"/> 435 460 </object> 436 461 <int key="connectionID">100060</int> 462 </object> 463 <object class="IBConnectionRecord"> 464 <object class="IBOutletConnection" key="connection"> 465 <string key="label">nextKeyView</string> 466 <reference key="source" ref="305175176"/> 467 <reference key="destination" ref="705333610"/> 468 </object> 469 <int key="connectionID">100067</int> 470 </object> 471 <object class="IBConnectionRecord"> 472 <object class="IBOutletConnection" key="connection"> 473 <string key="label">nextKeyView</string> 474 <reference key="source" ref="494193237"/> 475 <reference key="destination" ref="305175176"/> 476 </object> 477 <int key="connectionID">100066</int> 478 </object> 479 <object class="IBConnectionRecord"> 480 <object class="IBOutletConnection" key="connection"> 481 <string key="label">nextKeyView</string> 482 <reference key="source" ref="71972597"/> 483 <reference key="destination" ref="833115728"/> 484 </object> 485 <int key="connectionID">100062</int> 486 </object> 487 <object class="IBConnectionRecord"> 488 <object class="IBOutletConnection" key="connection"> 489 <string key="label">nextKeyView</string> 490 <reference key="source" ref="368270689"/> 491 <reference key="destination" ref="657854151"/> 492 </object> 493 <int key="connectionID">100064</int> 437 494 </object> 438 495 <object class="IBConnectionRecord"> … … 447 504 <object class="IBOutletConnection" key="connection"> 448 505 <string key="label">nextKeyView</string> 449 <reference key="source" ref="71972597"/>450 <reference key="destination" ref="833115728"/>451 </object>452 <int key="connectionID">100062</int>453 </object>454 <object class="IBConnectionRecord">455 <object class="IBOutletConnection" key="connection">456 <string key="label">nextKeyView</string>457 506 <reference key="source" ref="833115728"/> 458 507 <reference key="destination" ref="368270689"/> 459 508 </object> 460 509 <int key="connectionID">100063</int> 461 </object>462 <object class="IBConnectionRecord">463 <object class="IBOutletConnection" key="connection">464 <string key="label">nextKeyView</string>465 <reference key="source" ref="368270689"/>466 <reference key="destination" ref="657854151"/>467 </object>468 <int key="connectionID">100064</int>469 510 </object> 470 511 <object class="IBConnectionRecord"> … … 479 520 <object class="IBOutletConnection" key="connection"> 480 521 <string key="label">nextKeyView</string> 481 <reference key="source" ref="494193237"/> 482 <reference key="destination" ref="305175176"/> 483 </object> 484 <int key="connectionID">100066</int> 485 </object> 486 <object class="IBConnectionRecord"> 487 <object class="IBOutletConnection" key="connection"> 488 <string key="label">nextKeyView</string> 489 <reference key="source" ref="305175176"/> 490 <reference key="destination" ref="705333610"/> 491 </object> 492 <int key="connectionID">100067</int> 522 <reference key="source" ref="1000280557"/> 523 <reference key="destination" ref="199018347"/> 524 </object> 525 <int key="connectionID">100059</int> 493 526 </object> 494 527 </object> … … 711 744 <object class="NSArray" key="dict.sortedKeys"> 712 745 <bool key="EncodedWithXMLCoder">YES</bool> 746 <string>-1.IBPluginDependency</string> 747 <string>-2.IBPluginDependency</string> 713 748 <string>-3.IBPluginDependency</string> 714 <string>-3.ImportedFromIB2</string>715 749 <string>10.IBPluginDependency</string> 716 <string>10.ImportedFromIB2</string>717 750 <string>100010.IBPluginDependency</string> 718 751 <string>100011.IBPluginDependency</string> … … 726 759 <string>100039.IBPluginDependency</string> 727 760 <string>100047.IBPluginDependency</string> 728 <string>100047.ImportedFromIB2</string>729 761 <string>100050.IBPluginDependency</string> 730 762 <string>11.IBPluginDependency</string> 731 <string>11.ImportedFromIB2</string>732 763 <string>12.IBPluginDependency</string> 733 <string>12.ImportedFromIB2</string>734 764 <string>13.IBPluginDependency</string> 735 <string>13.ImportedFromIB2</string>736 765 <string>14.IBPluginDependency</string> 737 <string>14.ImportedFromIB2</string>738 766 <string>15.CustomClassName</string> 739 767 <string>15.IBPluginDependency</string> 740 <string>15.ImportedFromIB2</string>741 768 <string>16.IBPluginDependency</string> 742 <string>16.ImportedFromIB2</string>743 769 <string>17.IBPluginDependency</string> 744 <string>17.ImportedFromIB2</string>745 770 <string>19.IBPluginDependency</string> 746 <string>19.ImportedFromIB2</string>747 771 <string>39.IBPluginDependency</string> 748 <string>39.ImportedFromIB2</string>749 <string>5.IBEditorWindowLastContentRect</string>750 772 <string>5.IBPluginDependency</string> 751 <string>5.IBViewEditorWindowController.showingLayoutRectangles</string>752 773 <string>5.IBWindowTemplateEditedContentRect</string> 753 <string>5.ImportedFromIB2</string>754 <string>5.windowTemplate.hasMaxSize</string>755 <string>5.windowTemplate.hasMinSize</string>756 <string>5.windowTemplate.maxSize</string>757 <string>5.windowTemplate.minSize</string>758 774 <string>6.IBPluginDependency</string> 759 <string>6.ImportedFromIB2</string>760 775 </object> 761 776 <object class="NSMutableArray" key="dict.values"> 762 777 <bool key="EncodedWithXMLCoder">YES</bool> 763 778 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 764 <integer value="1"/> 765 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 766 <integer value="1"/> 767 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 768 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 769 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 770 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 771 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 772 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 773 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 774 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 775 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 776 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 777 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 778 <integer value="1"/> 779 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 780 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 781 <integer value="1"/> 782 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 783 <integer value="1"/> 784 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 785 <integer value="1"/> 786 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 787 <integer value="1"/> 779 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 780 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 781 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 782 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 783 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 784 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 785 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 786 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 787 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 788 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 789 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 790 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 791 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 792 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 793 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 794 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 795 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 796 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 797 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 788 798 <string>NSSecureTextField</string> 789 799 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 790 <integer value="1"/> 791 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 792 <integer value="1"/> 793 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 794 <integer value="1"/> 795 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 796 <integer value="1"/> 797 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 798 <integer value="1"/> 800 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 801 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 802 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 803 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 804 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 799 805 <string>{{288, 843}, {424, 254}}</string> 800 806 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 801 <integer value="1"/>802 <string>{{288, 843}, {424, 254}}</string>803 <integer value="1"/>804 <integer value="0"/>805 <integer value="0"/>806 <string>{424, 282}</string>807 <string>{424, 282}</string>808 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>809 <integer value="1"/>810 807 </object> 811 808 </object> … … 813 810 <bool key="EncodedWithXMLCoder">YES</bool> 814 811 <reference key="dict.sortedKeys" ref="498544300"/> 815 <object class="NSMutableArray" key="dict.values"> 816 <bool key="EncodedWithXMLCoder">YES</bool> 817 </object> 812 <reference key="dict.values" ref="498544300"/> 818 813 </object> 819 814 <nil key="activeLocalization"/> … … 821 816 <bool key="EncodedWithXMLCoder">YES</bool> 822 817 <reference key="dict.sortedKeys" ref="498544300"/> 823 <object class="NSMutableArray" key="dict.values"> 824 <bool key="EncodedWithXMLCoder">YES</bool> 825 </object> 818 <reference key="dict.values" ref="498544300"/> 826 819 </object> 827 820 <nil key="sourceID"/> … … 832 825 <bool key="EncodedWithXMLCoder">YES</bool> 833 826 <object class="IBPartialClassDescription"> 834 <string key="className">FirstResponder</string>835 <string key="superclassName">NSObject</string>836 <object class="IBClassDescriptionSource" key="sourceIdentifier">837 <string key="majorKey">IBUserSource</string>838 <string key="minorKey"/>839 </object>840 </object>841 <object class="IBPartialClassDescription">842 <string key="className">NSControl</string>843 <object class="IBClassDescriptionSource" key="sourceIdentifier">844 <string key="majorKey">IBProjectSource</string>845 <string key="minorKey">mac/Misc/WebNSControlExtras.h</string>846 </object>847 </object>848 <object class="IBPartialClassDescription">849 <string key="className">NSControl</string>850 <string key="superclassName">NSView</string>851 <object class="IBClassDescriptionSource" key="sourceIdentifier">852 <string key="majorKey">IBUserSource</string>853 <string key="minorKey"/>854 </object>855 </object>856 <object class="IBPartialClassDescription">857 <string key="className">NSObject</string>858 <object class="IBClassDescriptionSource" key="sourceIdentifier">859 <string key="majorKey">IBProjectSource</string>860 <string key="minorKey">mac/Misc/WebDownload.h</string>861 </object>862 </object>863 <object class="IBPartialClassDescription">864 <string key="className">NSObject</string>865 <object class="IBClassDescriptionSource" key="sourceIdentifier">866 <string key="majorKey">IBProjectSource</string>867 <string key="minorKey">mac/Misc/WebIconDatabaseDelegate.h</string>868 </object>869 </object>870 <object class="IBPartialClassDescription">871 <string key="className">NSObject</string>872 <object class="IBClassDescriptionSource" key="sourceIdentifier">873 <string key="majorKey">IBProjectSource</string>874 <string key="minorKey">mac/Misc/WebNSObjectExtras.h</string>875 </object>876 </object>877 <object class="IBPartialClassDescription">878 <string key="className">NSObject</string>879 <object class="IBClassDescriptionSource" key="sourceIdentifier">880 <string key="majorKey">IBProjectSource</string>881 <string key="minorKey">mac/Plugins/WebJavaPlugIn.h</string>882 </object>883 </object>884 <object class="IBPartialClassDescription">885 <string key="className">NSObject</string>886 <object class="IBClassDescriptionSource" key="sourceIdentifier">887 <string key="majorKey">IBProjectSource</string>888 <string key="minorKey">mac/Plugins/WebPlugin.h</string>889 </object>890 </object>891 <object class="IBPartialClassDescription">892 <string key="className">NSObject</string>893 <object class="IBClassDescriptionSource" key="sourceIdentifier">894 <string key="majorKey">IBProjectSource</string>895 <string key="minorKey">mac/Plugins/WebPluginContainer.h</string>896 </object>897 </object>898 <object class="IBPartialClassDescription">899 <string key="className">NSObject</string>900 <object class="IBClassDescriptionSource" key="sourceIdentifier">901 <string key="majorKey">IBProjectSource</string>902 <string key="minorKey">mac/Plugins/WebPluginContainerPrivate.h</string>903 </object>904 </object>905 <object class="IBPartialClassDescription">906 <string key="className">NSObject</string>907 <object class="IBClassDescriptionSource" key="sourceIdentifier">908 <string key="majorKey">IBProjectSource</string>909 <string key="minorKey">mac/Plugins/WebPluginDatabase.h</string>910 </object>911 </object>912 <object class="IBPartialClassDescription">913 <string key="className">NSObject</string>914 <object class="IBClassDescriptionSource" key="sourceIdentifier">915 <string key="majorKey">IBProjectSource</string>916 <string key="minorKey">mac/Plugins/WebPluginPrivate.h</string>917 </object>918 </object>919 <object class="IBPartialClassDescription">920 <string key="className">NSObject</string>921 <object class="IBClassDescriptionSource" key="sourceIdentifier">922 <string key="majorKey">IBProjectSource</string>923 <string key="minorKey">mac/WebInspector/WebNodeHighlight.h</string>924 </object>925 </object>926 <object class="IBPartialClassDescription">927 <string key="className">NSObject</string>928 <object class="IBClassDescriptionSource" key="sourceIdentifier">929 <string key="majorKey">IBProjectSource</string>930 <string key="minorKey">mac/WebView/WebEditingDelegate.h</string>931 </object>932 </object>933 <object class="IBPartialClassDescription">934 <string key="className">NSObject</string>935 <object class="IBClassDescriptionSource" key="sourceIdentifier">936 <string key="majorKey">IBProjectSource</string>937 <string key="minorKey">mac/WebView/WebEditingDelegatePrivate.h</string>938 </object>939 </object>940 <object class="IBPartialClassDescription">941 <string key="className">NSObject</string>942 <object class="IBClassDescriptionSource" key="sourceIdentifier">943 <string key="majorKey">IBProjectSource</string>944 <string key="minorKey">mac/WebView/WebFrameInternal.h</string>945 </object>946 </object>947 <object class="IBPartialClassDescription">948 <string key="className">NSObject</string>949 <object class="IBClassDescriptionSource" key="sourceIdentifier">950 <string key="majorKey">IBProjectSource</string>951 <string key="minorKey">mac/WebView/WebFrameLoadDelegate.h</string>952 </object>953 </object>954 <object class="IBPartialClassDescription">955 <string key="className">NSObject</string>956 <object class="IBClassDescriptionSource" key="sourceIdentifier">957 <string key="majorKey">IBProjectSource</string>958 <string key="minorKey">mac/WebView/WebFrameLoadDelegatePrivate.h</string>959 </object>960 </object>961 <object class="IBPartialClassDescription">962 <string key="className">NSObject</string>963 <object class="IBClassDescriptionSource" key="sourceIdentifier">964 <string key="majorKey">IBProjectSource</string>965 <string key="minorKey">mac/WebView/WebHistoryDelegate.h</string>966 </object>967 </object>968 <object class="IBPartialClassDescription">969 <string key="className">NSObject</string>970 <object class="IBClassDescriptionSource" key="sourceIdentifier">971 <string key="majorKey">IBProjectSource</string>972 <string key="minorKey">mac/WebView/WebPolicyDelegate.h</string>973 </object>974 </object>975 <object class="IBPartialClassDescription">976 <string key="className">NSObject</string>977 <object class="IBClassDescriptionSource" key="sourceIdentifier">978 <string key="majorKey">IBProjectSource</string>979 <string key="minorKey">mac/WebView/WebPolicyDelegatePrivate.h</string>980 </object>981 </object>982 <object class="IBPartialClassDescription">983 <string key="className">NSObject</string>984 <object class="IBClassDescriptionSource" key="sourceIdentifier">985 <string key="majorKey">IBProjectSource</string>986 <string key="minorKey">mac/WebView/WebResourceLoadDelegate.h</string>987 </object>988 </object>989 <object class="IBPartialClassDescription">990 <string key="className">NSObject</string>991 <object class="IBClassDescriptionSource" key="sourceIdentifier">992 <string key="majorKey">IBProjectSource</string>993 <string key="minorKey">mac/WebView/WebResourceLoadDelegatePrivate.h</string>994 </object>995 </object>996 <object class="IBPartialClassDescription">997 <string key="className">NSObject</string>998 <object class="IBClassDescriptionSource" key="sourceIdentifier">999 <string key="majorKey">IBProjectSource</string>1000 <string key="minorKey">mac/WebView/WebScriptDebugDelegate.h</string>1001 </object>1002 </object>1003 <object class="IBPartialClassDescription">1004 827 <string key="className">NSObject</string> 1005 828 <object class="NSMutableDictionary" key="actions"> … … 1058 881 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1059 882 <string key="majorKey">IBProjectSource</string> 1060 <string key="minorKey">mac/WebView/WebUIDelegate.h</string> 1061 </object> 1062 </object> 1063 <object class="IBPartialClassDescription"> 1064 <string key="className">NSObject</string> 1065 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1066 <string key="majorKey">IBProjectSource</string> 1067 <string key="minorKey">mac/WebView/WebUIDelegatePrivate.h</string> 1068 </object> 1069 </object> 1070 <object class="IBPartialClassDescription"> 1071 <string key="className">NSObject</string> 1072 <object class="IBClassDescriptionSource" key="sourceIdentifier" id="153972132"> 1073 <string key="majorKey">IBProjectSource</string> 1074 <string key="minorKey">mac/WebView/WebViewPrivate.h</string> 1075 </object> 1076 </object> 1077 <object class="IBPartialClassDescription"> 1078 <string key="className">NSObject</string> 1079 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1080 <string key="majorKey">IBUserSource</string> 1081 <string key="minorKey"/> 1082 </object> 1083 </object> 1084 <object class="IBPartialClassDescription"> 1085 <string key="className">NSView</string> 1086 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1087 <string key="majorKey">IBProjectSource</string> 1088 <string key="minorKey">mac/Misc/WebNSViewExtras.h</string> 1089 </object> 1090 </object> 1091 <object class="IBPartialClassDescription"> 1092 <string key="className">NSView</string> 1093 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1094 <string key="majorKey">IBProjectSource</string> 1095 <string key="minorKey">mac/Plugins/WebBaseNetscapePluginView.h</string> 1096 </object> 1097 </object> 1098 <object class="IBPartialClassDescription"> 1099 <string key="className">NSView</string> 1100 <string key="superclassName">NSResponder</string> 1101 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1102 <string key="majorKey">IBUserSource</string> 1103 <string key="minorKey"/> 1104 </object> 1105 </object> 1106 <object class="IBPartialClassDescription"> 1107 <string key="className">NSWindow</string> 1108 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1109 <string key="majorKey">IBProjectSource</string> 1110 <string key="minorKey">mac/Misc/WebNSWindowExtras.h</string> 1111 </object> 1112 </object> 1113 <object class="IBPartialClassDescription"> 1114 <string key="className">NSWindow</string> 1115 <string key="superclassName">NSResponder</string> 1116 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1117 <string key="majorKey">IBUserSource</string> 1118 <string key="minorKey"/> 1119 </object> 1120 </object> 1121 <object class="IBPartialClassDescription"> 1122 <string key="className">NonBlockingPanel</string> 1123 <string key="superclassName">NSPanel</string> 1124 <object class="IBClassDescriptionSource" key="sourceIdentifier" id="1064703436"> 1125 <string key="majorKey">IBProjectSource</string> 1126 <string key="minorKey">mac/Panels/WebAuthenticationPanel.h</string> 1127 </object> 1128 </object> 1129 <object class="IBPartialClassDescription"> 1130 <string key="className">NonBlockingPanel</string> 1131 <string key="superclassName">NSPanel</string> 1132 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1133 <string key="majorKey">IBUserSource</string> 1134 <string key="minorKey"/> 883 <string key="minorKey">./Classes/NSObject.h</string> 1135 884 </object> 1136 885 </object> … … 1251 1000 </object> 1252 1001 </object> 1253 <reference key="sourceIdentifier" ref="1064703436"/> 1002 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1003 <string key="majorKey">IBProjectSource</string> 1004 <string key="minorKey">./Classes/WebAuthenticationPanel.h</string> 1005 </object> 1006 </object> 1007 <object class="IBPartialClassDescription"> 1008 <string key="className">WebNonBlockingPanel</string> 1009 <string key="superclassName">NSPanel</string> 1010 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1011 <string key="majorKey">IBProjectSource</string> 1012 <string key="minorKey">./Classes/WebNonBlockingPanel.h</string> 1013 </object> 1254 1014 </object> 1255 1015 <object class="IBPartialClassDescription"> 1256 1016 <string key="className">WebView</string> 1257 <string key="superclassName">NSView</string>1258 1017 <object class="NSMutableDictionary" key="actions"> 1259 1018 <bool key="EncodedWithXMLCoder">YES</bool> 1260 1019 <object class="NSArray" key="dict.sortedKeys"> 1261 1020 <bool key="EncodedWithXMLCoder">YES</bool> 1021 <string>_openFrameInNewWindowFromMenu:</string> 1022 <string>_searchWithGoogleFromMenu:</string> 1023 <string>_searchWithSpotlightFromMenu:</string> 1262 1024 <string>alignCenter:</string> 1263 1025 <string>alignJustified:</string> … … 1273 1035 <string>cut:</string> 1274 1036 <string>delete:</string> 1275 <string>goBack:</string>1276 <string>goForward:</string>1277 <string>makeTextLarger:</string>1278 <string>makeTextSmaller:</string>1279 <string>makeTextStandardSize:</string>1280 1037 <string>moveToBeginningOfSentence:</string> 1281 1038 <string>moveToBeginningOfSentenceAndModifySelection:</string> 1282 1039 <string>moveToEndOfSentence:</string> 1283 1040 <string>moveToEndOfSentenceAndModifySelection:</string> 1041 <string>outdent:</string> 1284 1042 <string>paste:</string> 1285 1043 <string>pasteAsPlainText:</string> … … 1287 1045 <string>pasteFont:</string> 1288 1046 <string>performFindPanelAction:</string> 1289 <string>reload:</string>1290 1047 <string>reloadFromOrigin:</string> 1048 <string>resetPageZoom:</string> 1291 1049 <string>selectSentence:</string> 1292 1050 <string>showGuessPanel:</string> 1293 1051 <string>startSpeaking:</string> 1294 <string>stopLoading:</string>1295 1052 <string>stopSpeaking:</string> 1296 <string>takeStringURLFrom:</string> 1297 <string>toggleContinuousSpellChecking:</string> 1298 <string>toggleSmartInsertDelete:</string> 1053 <string>toggleAutomaticDashSubstitution:</string> 1054 <string>toggleAutomaticLinkDetection:</string> 1055 <string>toggleAutomaticQuoteSubstitution:</string> 1056 <string>toggleAutomaticSpellingCorrection:</string> 1057 <string>toggleAutomaticTextReplacement:</string> 1058 <string>toggleGrammarChecking:</string> 1059 <string>zoomPageIn:</string> 1060 <string>zoomPageOut:</string> 1299 1061 </object> 1300 1062 <object class="NSMutableArray" key="dict.values"> 1301 1063 <bool key="EncodedWithXMLCoder">YES</bool> 1064 <string>NSMenuItem</string> 1065 <string>id</string> 1066 <string>id</string> 1302 1067 <string>id</string> 1303 1068 <string>id</string> … … 1343 1108 <object class="NSArray" key="dict.sortedKeys"> 1344 1109 <bool key="EncodedWithXMLCoder">YES</bool> 1110 <string>_openFrameInNewWindowFromMenu:</string> 1111 <string>_searchWithGoogleFromMenu:</string> 1112 <string>_searchWithSpotlightFromMenu:</string> 1345 1113 <string>alignCenter:</string> 1346 1114 <string>alignJustified:</string> … … 1356 1124 <string>cut:</string> 1357 1125 <string>delete:</string> 1358 <string>goBack:</string>1359 <string>goForward:</string>1360 <string>makeTextLarger:</string>1361 <string>makeTextSmaller:</string>1362 <string>makeTextStandardSize:</string>1363 1126 <string>moveToBeginningOfSentence:</string> 1364 1127 <string>moveToBeginningOfSentenceAndModifySelection:</string> 1365 1128 <string>moveToEndOfSentence:</string> 1366 1129 <string>moveToEndOfSentenceAndModifySelection:</string> 1130 <string>outdent:</string> 1367 1131 <string>paste:</string> 1368 1132 <string>pasteAsPlainText:</string> … … 1370 1134 <string>pasteFont:</string> 1371 1135 <string>performFindPanelAction:</string> 1372 <string>reload:</string>1373 1136 <string>reloadFromOrigin:</string> 1137 <string>resetPageZoom:</string> 1374 1138 <string>selectSentence:</string> 1375 1139 <string>showGuessPanel:</string> 1376 1140 <string>startSpeaking:</string> 1377 <string>stopLoading:</string>1378 1141 <string>stopSpeaking:</string> 1379 <string>takeStringURLFrom:</string>1380 <string>toggleContinuousSpellChecking:</string>1381 <string>toggleSmartInsertDelete:</string>1382 </object>1383 <object class="NSMutableArray" key="dict.values">1384 <bool key="EncodedWithXMLCoder">YES</bool>1385 <object class="IBActionInfo">1386 <string key="name">alignCenter:</string>1387 <string key="candidateClassName">id</string>1388 </object>1389 <object class="IBActionInfo">1390 <string key="name">alignJustified:</string>1391 <string key="candidateClassName">id</string>1392 </object>1393 <object class="IBActionInfo">1394 <string key="name">alignLeft:</string>1395 <string key="candidateClassName">id</string>1396 </object>1397 <object class="IBActionInfo">1398 <string key="name">alignRight:</string>1399 <string key="candidateClassName">id</string>1400 </object>1401 <object class="IBActionInfo">1402 <string key="name">changeAttributes:</string>1403 <string key="candidateClassName">id</string>1404 </object>1405 <object class="IBActionInfo">1406 <string key="name">changeColor:</string>1407 <string key="candidateClassName">id</string>1408 </object>1409 <object class="IBActionInfo">1410 <string key="name">changeDocumentBackgroundColor:</string>1411 <string key="candidateClassName">id</string>1412 </object>1413 <object class="IBActionInfo">1414 <string key="name">changeFont:</string>1415 <string key="candidateClassName">id</string>1416 </object>1417 <object class="IBActionInfo">1418 <string key="name">checkSpelling:</string>1419 <string key="candidateClassName">id</string>1420 </object>1421 <object class="IBActionInfo">1422 <string key="name">copy:</string>1423 <string key="candidateClassName">id</string>1424 </object>1425 <object class="IBActionInfo">1426 <string key="name">copyFont:</string>1427 <string key="candidateClassName">id</string>1428 </object>1429 <object class="IBActionInfo">1430 <string key="name">cut:</string>1431 <string key="candidateClassName">id</string>1432 </object>1433 <object class="IBActionInfo">1434 <string key="name">delete:</string>1435 <string key="candidateClassName">id</string>1436 </object>1437 <object class="IBActionInfo">1438 <string key="name">goBack:</string>1439 <string key="candidateClassName">id</string>1440 </object>1441 <object class="IBActionInfo">1442 <string key="name">goForward:</string>1443 <string key="candidateClassName">id</string>1444 </object>1445 <object class="IBActionInfo">1446 <string key="name">makeTextLarger:</string>1447 <string key="candidateClassName">id</string>1448 </object>1449 <object class="IBActionInfo">1450 <string key="name">makeTextSmaller:</string>1451 <string key="candidateClassName">id</string>1452 </object>1453 <object class="IBActionInfo">1454 <string key="name">makeTextStandardSize:</string>1455 <string key="candidateClassName">id</string>1456 </object>1457 <object class="IBActionInfo">1458 <string key="name">moveToBeginningOfSentence:</string>1459 <string key="candidateClassName">id</string>1460 </object>1461 <object class="IBActionInfo">1462 <string key="name">moveToBeginningOfSentenceAndModifySelection:</string>1463 <string key="candidateClassName">id</string>1464 </object>1465 <object class="IBActionInfo">1466 <string key="name">moveToEndOfSentence:</string>1467 <string key="candidateClassName">id</string>1468 </object>1469 <object class="IBActionInfo">1470 <string key="name">moveToEndOfSentenceAndModifySelection:</string>1471 <string key="candidateClassName">id</string>1472 </object>1473 <object class="IBActionInfo">1474 <string key="name">paste:</string>1475 <string key="candidateClassName">id</string>1476 </object>1477 <object class="IBActionInfo">1478 <string key="name">pasteAsPlainText:</string>1479 <string key="candidateClassName">id</string>1480 </object>1481 <object class="IBActionInfo">1482 <string key="name">pasteAsRichText:</string>1483 <string key="candidateClassName">id</string>1484 </object>1485 <object class="IBActionInfo">1486 <string key="name">pasteFont:</string>1487 <string key="candidateClassName">id</string>1488 </object>1489 <object class="IBActionInfo">1490 <string key="name">performFindPanelAction:</string>1491 <string key="candidateClassName">id</string>1492 </object>1493 <object class="IBActionInfo">1494 <string key="name">reload:</string>1495 <string key="candidateClassName">id</string>1496 </object>1497 <object class="IBActionInfo">1498 <string key="name">reloadFromOrigin:</string>1499 <string key="candidateClassName">id</string>1500 </object>1501 <object class="IBActionInfo">1502 <string key="name">selectSentence:</string>1503 <string key="candidateClassName">id</string>1504 </object>1505 <object class="IBActionInfo">1506 <string key="name">showGuessPanel:</string>1507 <string key="candidateClassName">id</string>1508 </object>1509 <object class="IBActionInfo">1510 <string key="name">startSpeaking:</string>1511 <string key="candidateClassName">id</string>1512 </object>1513 <object class="IBActionInfo">1514 <string key="name">stopLoading:</string>1515 <string key="candidateClassName">id</string>1516 </object>1517 <object class="IBActionInfo">1518 <string key="name">stopSpeaking:</string>1519 <string key="candidateClassName">id</string>1520 </object>1521 <object class="IBActionInfo">1522 <string key="name">takeStringURLFrom:</string>1523 <string key="candidateClassName">id</string>1524 </object>1525 <object class="IBActionInfo">1526 <string key="name">toggleContinuousSpellChecking:</string>1527 <string key="candidateClassName">id</string>1528 </object>1529 <object class="IBActionInfo">1530 <string key="name">toggleSmartInsertDelete:</string>1531 <string key="candidateClassName">id</string>1532 </object>1533 </object>1534 </object>1535 <object class="IBClassDescriptionSource" key="sourceIdentifier">1536 <string key="majorKey">IBProjectSource</string>1537 <string key="minorKey">mac/WebView/WebView.h</string>1538 </object>1539 </object>1540 <object class="IBPartialClassDescription">1541 <string key="className">WebView</string>1542 <object class="NSMutableDictionary" key="actions">1543 <bool key="EncodedWithXMLCoder">YES</bool>1544 <object class="NSArray" key="dict.sortedKeys">1545 <bool key="EncodedWithXMLCoder">YES</bool>1546 <string>_openFrameInNewWindowFromMenu:</string>1547 <string>_searchWithGoogleFromMenu:</string>1548 <string>_searchWithSpotlightFromMenu:</string>1549 </object>1550 <object class="NSMutableArray" key="dict.values">1551 <bool key="EncodedWithXMLCoder">YES</bool>1552 <string>NSMenuItem</string>1553 <string>id</string>1554 <string>id</string>1555 </object>1556 </object>1557 <object class="NSMutableDictionary" key="actionInfosByName">1558 <bool key="EncodedWithXMLCoder">YES</bool>1559 <object class="NSArray" key="dict.sortedKeys">1560 <bool key="EncodedWithXMLCoder">YES</bool>1561 <string>_openFrameInNewWindowFromMenu:</string>1562 <string>_searchWithGoogleFromMenu:</string>1563 <string>_searchWithSpotlightFromMenu:</string>1564 </object>1565 <object class="NSMutableArray" key="dict.values">1566 <bool key="EncodedWithXMLCoder">YES</bool>1567 <object class="IBActionInfo">1568 <string key="name">_openFrameInNewWindowFromMenu:</string>1569 <string key="candidateClassName">NSMenuItem</string>1570 </object>1571 <object class="IBActionInfo">1572 <string key="name">_searchWithGoogleFromMenu:</string>1573 <string key="candidateClassName">id</string>1574 </object>1575 <object class="IBActionInfo">1576 <string key="name">_searchWithSpotlightFromMenu:</string>1577 <string key="candidateClassName">id</string>1578 </object>1579 </object>1580 </object>1581 <object class="IBClassDescriptionSource" key="sourceIdentifier">1582 <string key="majorKey">IBProjectSource</string>1583 <string key="minorKey">mac/WebView/WebViewInternal.h</string>1584 </object>1585 </object>1586 <object class="IBPartialClassDescription">1587 <string key="className">WebView</string>1588 <object class="NSMutableDictionary" key="actions">1589 <bool key="EncodedWithXMLCoder">YES</bool>1590 <object class="NSArray" key="dict.sortedKeys">1591 <bool key="EncodedWithXMLCoder">YES</bool>1592 <string>outdent:</string>1593 <string>resetPageZoom:</string>1594 1142 <string>toggleAutomaticDashSubstitution:</string> 1595 1143 <string>toggleAutomaticLinkDetection:</string> … … 1603 1151 <object class="NSMutableArray" key="dict.values"> 1604 1152 <bool key="EncodedWithXMLCoder">YES</bool> 1605 <string>id</string> 1606 <string>id</string> 1607 <string>id</string> 1608 <string>id</string> 1609 <string>id</string> 1610 <string>id</string> 1611 <string>id</string> 1612 <string>id</string> 1613 <string>id</string> 1614 <string>id</string> 1615 </object> 1616 </object> 1617 <object class="NSMutableDictionary" key="actionInfosByName"> 1618 <bool key="EncodedWithXMLCoder">YES</bool> 1619 <object class="NSArray" key="dict.sortedKeys"> 1620 <bool key="EncodedWithXMLCoder">YES</bool> 1621 <string>outdent:</string> 1622 <string>resetPageZoom:</string> 1623 <string>toggleAutomaticDashSubstitution:</string> 1624 <string>toggleAutomaticLinkDetection:</string> 1625 <string>toggleAutomaticQuoteSubstitution:</string> 1626 <string>toggleAutomaticSpellingCorrection:</string> 1627 <string>toggleAutomaticTextReplacement:</string> 1628 <string>toggleGrammarChecking:</string> 1629 <string>zoomPageIn:</string> 1630 <string>zoomPageOut:</string> 1631 </object> 1632 <object class="NSMutableArray" key="dict.values"> 1633 <bool key="EncodedWithXMLCoder">YES</bool> 1153 <object class="IBActionInfo"> 1154 <string key="name">_openFrameInNewWindowFromMenu:</string> 1155 <string key="candidateClassName">NSMenuItem</string> 1156 </object> 1157 <object class="IBActionInfo"> 1158 <string key="name">_searchWithGoogleFromMenu:</string> 1159 <string key="candidateClassName">id</string> 1160 </object> 1161 <object class="IBActionInfo"> 1162 <string key="name">_searchWithSpotlightFromMenu:</string> 1163 <string key="candidateClassName">id</string> 1164 </object> 1165 <object class="IBActionInfo"> 1166 <string key="name">alignCenter:</string> 1167 <string key="candidateClassName">id</string> 1168 </object> 1169 <object class="IBActionInfo"> 1170 <string key="name">alignJustified:</string> 1171 <string key="candidateClassName">id</string> 1172 </object> 1173 <object class="IBActionInfo"> 1174 <string key="name">alignLeft:</string> 1175 <string key="candidateClassName">id</string> 1176 </object> 1177 <object class="IBActionInfo"> 1178 <string key="name">alignRight:</string> 1179 <string key="candidateClassName">id</string> 1180 </object> 1181 <object class="IBActionInfo"> 1182 <string key="name">changeAttributes:</string> 1183 <string key="candidateClassName">id</string> 1184 </object> 1185 <object class="IBActionInfo"> 1186 <string key="name">changeColor:</string> 1187 <string key="candidateClassName">id</string> 1188 </object> 1189 <object class="IBActionInfo"> 1190 <string key="name">changeDocumentBackgroundColor:</string> 1191 <string key="candidateClassName">id</string> 1192 </object> 1193 <object class="IBActionInfo"> 1194 <string key="name">changeFont:</string> 1195 <string key="candidateClassName">id</string> 1196 </object> 1197 <object class="IBActionInfo"> 1198 <string key="name">checkSpelling:</string> 1199 <string key="candidateClassName">id</string> 1200 </object> 1201 <object class="IBActionInfo"> 1202 <string key="name">copy:</string> 1203 <string key="candidateClassName">id</string> 1204 </object> 1205 <object class="IBActionInfo"> 1206 <string key="name">copyFont:</string> 1207 <string key="candidateClassName">id</string> 1208 </object> 1209 <object class="IBActionInfo"> 1210 <string key="name">cut:</string> 1211 <string key="candidateClassName">id</string> 1212 </object> 1213 <object class="IBActionInfo"> 1214 <string key="name">delete:</string> 1215 <string key="candidateClassName">id</string> 1216 </object> 1217 <object class="IBActionInfo"> 1218 <string key="name">moveToBeginningOfSentence:</string> 1219 <string key="candidateClassName">id</string> 1220 </object> 1221 <object class="IBActionInfo"> 1222 <string key="name">moveToBeginningOfSentenceAndModifySelection:</string> 1223 <string key="candidateClassName">id</string> 1224 </object> 1225 <object class="IBActionInfo"> 1226 <string key="name">moveToEndOfSentence:</string> 1227 <string key="candidateClassName">id</string> 1228 </object> 1229 <object class="IBActionInfo"> 1230 <string key="name">moveToEndOfSentenceAndModifySelection:</string> 1231 <string key="candidateClassName">id</string> 1232 </object> 1634 1233 <object class="IBActionInfo"> 1635 1234 <string key="name">outdent:</string> … … 1637 1236 </object> 1638 1237 <object class="IBActionInfo"> 1238 <string key="name">paste:</string> 1239 <string key="candidateClassName">id</string> 1240 </object> 1241 <object class="IBActionInfo"> 1242 <string key="name">pasteAsPlainText:</string> 1243 <string key="candidateClassName">id</string> 1244 </object> 1245 <object class="IBActionInfo"> 1246 <string key="name">pasteAsRichText:</string> 1247 <string key="candidateClassName">id</string> 1248 </object> 1249 <object class="IBActionInfo"> 1250 <string key="name">pasteFont:</string> 1251 <string key="candidateClassName">id</string> 1252 </object> 1253 <object class="IBActionInfo"> 1254 <string key="name">performFindPanelAction:</string> 1255 <string key="candidateClassName">id</string> 1256 </object> 1257 <object class="IBActionInfo"> 1258 <string key="name">reloadFromOrigin:</string> 1259 <string key="candidateClassName">id</string> 1260 </object> 1261 <object class="IBActionInfo"> 1639 1262 <string key="name">resetPageZoom:</string> 1640 1263 <string key="candidateClassName">id</string> 1641 1264 </object> 1642 1265 <object class="IBActionInfo"> 1266 <string key="name">selectSentence:</string> 1267 <string key="candidateClassName">id</string> 1268 </object> 1269 <object class="IBActionInfo"> 1270 <string key="name">showGuessPanel:</string> 1271 <string key="candidateClassName">id</string> 1272 </object> 1273 <object class="IBActionInfo"> 1274 <string key="name">startSpeaking:</string> 1275 <string key="candidateClassName">id</string> 1276 </object> 1277 <object class="IBActionInfo"> 1278 <string key="name">stopSpeaking:</string> 1279 <string key="candidateClassName">id</string> 1280 </object> 1281 <object class="IBActionInfo"> 1643 1282 <string key="name">toggleAutomaticDashSubstitution:</string> 1644 1283 <string key="candidateClassName">id</string> … … 1674 1313 </object> 1675 1314 </object> 1676 <reference key="sourceIdentifier" ref="153972132"/>1677 </object>1678 <object class="IBPartialClassDescription">1679 <string key="className">WebView</string>1680 <string key="superclassName">NSView</string>1681 1315 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1682 <string key="majorKey">IBUserSource</string> 1683 <string key="minorKey"/> 1684 </object> 1685 </object> 1686 </object> 1687 <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> 1688 <bool key="EncodedWithXMLCoder">YES</bool> 1689 <object class="IBPartialClassDescription"> 1690 <string key="className">NSObject</string> 1691 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1692 <string key="majorKey">IBFrameworkSource</string> 1693 <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string> 1694 </object> 1695 </object> 1696 <object class="IBPartialClassDescription"> 1697 <string key="className">NSObject</string> 1698 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1699 <string key="majorKey">IBFrameworkSource</string> 1700 <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string> 1701 </object> 1702 </object> 1703 <object class="IBPartialClassDescription"> 1704 <string key="className">NSObject</string> 1705 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1706 <string key="majorKey">IBFrameworkSource</string> 1707 <string key="minorKey">QuartzCore.framework/Headers/CIImageProvider.h</string> 1316 <string key="majorKey">IBProjectSource</string> 1317 <string key="minorKey">./Classes/WebView.h</string> 1708 1318 </object> 1709 1319 </object> … … 1721 1331 </object> 1722 1332 <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> 1723 <string key="IBDocument.LastKnownRelativeProjectPath">../../../WebKit.xcodeproj</string>1724 1333 <int key="IBDocument.defaultPropertyAccessControl">3</int> 1725 1334 </data> -
trunk/Source/WebKit/mac/Panels/WebAuthenticationPanel.h
r85231 r95448 65 65 66 66 // This is in the header so it can be used from the nib file 67 @interface NonBlockingPanel : NSPanel67 @interface WebNonBlockingPanel : NSPanel 68 68 @end 69 69 -
trunk/Source/WebKit/mac/Panels/WebAuthenticationPanel.m
r80153 r95448 270 270 @end 271 271 272 @implementation NonBlockingPanel272 @implementation WebNonBlockingPanel 273 273 274 274 - (BOOL)_blocksActionWhenModal:(SEL)theAction -
trunk/Source/WebKit/mac/WebView/WebPDFView.mm
r85237 r95448 99 99 @end; 100 100 101 // PDFPrefUpdatingProxy is a class that forwards everything it gets to a target and updates the PDF viewing prefs101 // WebPDFPrefUpdatingProxy is a class that forwards everything it gets to a target and updates the PDF viewing prefs 102 102 // after each of those messages. We use it as a way to hook all the places that the PDF viewing attrs change. 103 @interface PDFPrefUpdatingProxy : NSProxy {103 @interface WebPDFPrefUpdatingProxy : NSProxy { 104 104 WebPDFView *view; 105 105 } … … 339 339 // Messaging this proxy is the same as messaging PDFSubview, with the side effect that the 340 340 // PDF viewing defaults are updated afterwards 341 PDFSubviewProxy = (PDFView *)[[ PDFPrefUpdatingProxy alloc] initWithView:self];341 PDFSubviewProxy = (PDFView *)[[WebPDFPrefUpdatingProxy alloc] initWithView:self]; 342 342 } 343 343 … … 1440 1440 - (void)_updatePreferencesSoon 1441 1441 { 1442 // Consolidate calls; due to the PDFPrefUpdatingProxy method, this can be called multiple times with a single user action1442 // Consolidate calls; due to the WebPDFPrefUpdatingProxy method, this can be called multiple times with a single user action 1443 1443 // such as showing the context menu. 1444 1444 if (_willUpdatePreferencesSoon) … … 1489 1489 @end 1490 1490 1491 @implementation PDFPrefUpdatingProxy1491 @implementation WebPDFPrefUpdatingProxy 1492 1492 1493 1493 - (id)initWithView:(WebPDFView *)aView -
trunk/Source/WebKit2/ChangeLog
r95436 r95448 1 2011-09-19 Dan Bernstein <mitz@apple.com> 2 3 WebKit2 part of [mac] WebKit contains Objective-C classes that are not prefixed with its standard prefixes 4 https://bugs.webkit.org/show_bug.cgi?id=68323 5 6 Reviewed by Sam Weinig. 7 8 Renamed FullKeyboardAccessWatcher to WKFullKeyboardAccessWatcher. 9 Renamed AccessibilityWebPageObject to WKAccessibilityWebPageObject. 10 11 * WebKit2.xcodeproj/project.pbxproj: 12 * WebProcess/WebPage/WebPage.h: 13 * WebProcess/WebPage/mac/AccessibilityWebPageObject.h: Removed. 14 * WebProcess/WebPage/mac/AccessibilityWebPageObject.mm: Removed. 15 * WebProcess/WebPage/mac/WKAccessibilityWebPageObject.h: Copied from Source/WebKit2/WebProcess/WebPage/mac/AccessibilityWebPageObject.h. 16 * WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm: Copied from Source/WebKit2/WebProcess/WebPage/mac/AccessibilityWebPageObject.mm. 17 * WebProcess/WebPage/mac/WebPageMac.mm: 18 (WebKit::WebPage::platformInitialize): 19 (WebKit::WebPage::accessibilityRemoteObject): 20 * WebProcess/mac/FullKeyboardAccessWatcher.h: Removed. 21 * WebProcess/mac/FullKeyboardAccessWatcher.mm: Removed. 22 * WebProcess/mac/WKFullKeyboardAccessWatcher.h: Copied from Source/WebKit2/WebProcess/mac/FullKeyboardAccessWatcher.h. 23 * WebProcess/mac/WKFullKeyboardAccessWatcher.mm: Copied from Source/WebKit2/WebProcess/mac/FullKeyboardAccessWatcher.mm. 24 (+[WKFullKeyboardAccessWatcher fullKeyboardAccessEnabled]): 25 * WebProcess/mac/WebProcessMac.mm: 26 (WebKit::WebProcess::fullKeyboardAccessEnabled): 27 1 28 2011-09-14 Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> 2 29 -
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
r95339 r95448 239 239 1CA8B946127C882A00576C2B /* WebInspectorProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CA8B944127C882A00576C2B /* WebInspectorProxyMessages.h */; }; 240 240 1CA8B954127C891500576C2B /* WebInspectorMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1C8E2DAD1278C5B200BC7BD0 /* WebInspectorMac.mm */; }; 241 29CD55AA128E294F00133C85 /* AccessibilityWebPageObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 29CD55A8128E294F00133C85 /*AccessibilityWebPageObject.h */; };242 29CD55AB128E294F00133C85 /* AccessibilityWebPageObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29CD55A9128E294F00133C85 /*AccessibilityWebPageObject.mm */; };241 29CD55AA128E294F00133C85 /* WKAccessibilityWebPageObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 29CD55A8128E294F00133C85 /* WKAccessibilityWebPageObject.h */; }; 242 29CD55AB128E294F00133C85 /* WKAccessibilityWebPageObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29CD55A9128E294F00133C85 /* WKAccessibilityWebPageObject.mm */; }; 243 243 31EA25D2134F78C0005B1452 /* NativeWebMouseEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 31EA25D0134F78B2005B1452 /* NativeWebMouseEventMac.mm */; }; 244 244 330934471315B9220097A7BC /* WebCookieManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 330934431315B9220097A7BC /* WebCookieManagerMessageReceiver.cpp */; }; … … 824 824 E1A31732134CEA6C007C9A4F /* AttributedString.h in Headers */ = {isa = PBXBuildFile; fileRef = E1A31731134CEA6C007C9A4F /* AttributedString.h */; }; 825 825 E1A31735134CEA80007C9A4F /* AttributedString.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1A31734134CEA80007C9A4F /* AttributedString.mm */; }; 826 E1BB16A413201B9B00F49431 /* FullKeyboardAccessWatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = E1BB1688132018BA00F49431 /*FullKeyboardAccessWatcher.h */; };827 E1BB16A513201B9B00F49431 /* FullKeyboardAccessWatcher.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1BB1689132018BA00F49431 /*FullKeyboardAccessWatcher.mm */; };826 E1BB16A413201B9B00F49431 /* WKFullKeyboardAccessWatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = E1BB1688132018BA00F49431 /* WKFullKeyboardAccessWatcher.h */; }; 827 E1BB16A513201B9B00F49431 /* WKFullKeyboardAccessWatcher.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1BB1689132018BA00F49431 /* WKFullKeyboardAccessWatcher.mm */; }; 828 828 E1CC1B9012D7EADF00625838 /* PrintInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = E1CC1B8E12D7EADF00625838 /* PrintInfo.h */; }; 829 829 E1CC1B9112D7EADF00625838 /* PrintInfoMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1CC1B8F12D7EADF00625838 /* PrintInfoMac.mm */; }; … … 1167 1167 1CA8B943127C882A00576C2B /* WebInspectorProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebInspectorProxyMessageReceiver.cpp; sourceTree = "<group>"; }; 1168 1168 1CA8B944127C882A00576C2B /* WebInspectorProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebInspectorProxyMessages.h; sourceTree = "<group>"; }; 1169 29CD55A8128E294F00133C85 /* AccessibilityWebPageObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =AccessibilityWebPageObject.h; sourceTree = "<group>"; };1170 29CD55A9128E294F00133C85 /* AccessibilityWebPageObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path =AccessibilityWebPageObject.mm; sourceTree = "<group>"; };1169 29CD55A8128E294F00133C85 /* WKAccessibilityWebPageObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKAccessibilityWebPageObject.h; sourceTree = "<group>"; }; 1170 29CD55A9128E294F00133C85 /* WKAccessibilityWebPageObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKAccessibilityWebPageObject.mm; sourceTree = "<group>"; }; 1171 1171 31EA25D0134F78B2005B1452 /* NativeWebMouseEventMac.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = NativeWebMouseEventMac.mm; sourceTree = "<group>"; }; 1172 1172 31EA25D3134F78D6005B1452 /* NativeWebMouseEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeWebMouseEvent.h; sourceTree = "<group>"; }; … … 1797 1797 E1A31731134CEA6C007C9A4F /* AttributedString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AttributedString.h; sourceTree = "<group>"; }; 1798 1798 E1A31734134CEA80007C9A4F /* AttributedString.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AttributedString.mm; sourceTree = "<group>"; }; 1799 E1BB1688132018BA00F49431 /* FullKeyboardAccessWatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =FullKeyboardAccessWatcher.h; sourceTree = "<group>"; };1800 E1BB1689132018BA00F49431 /* FullKeyboardAccessWatcher.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path =FullKeyboardAccessWatcher.mm; sourceTree = "<group>"; };1799 E1BB1688132018BA00F49431 /* WKFullKeyboardAccessWatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFullKeyboardAccessWatcher.h; sourceTree = "<group>"; }; 1800 E1BB1689132018BA00F49431 /* WKFullKeyboardAccessWatcher.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = WKFullKeyboardAccessWatcher.mm; sourceTree = "<group>"; }; 1801 1801 E1CC1B8E12D7EADF00625838 /* PrintInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrintInfo.h; sourceTree = "<group>"; }; 1802 1802 E1CC1B8F12D7EADF00625838 /* PrintInfoMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PrintInfoMac.mm; sourceTree = "<group>"; }; … … 2049 2049 93C01DAA139AC91700ED51D7 /* CoreIPCClientRunLoop.h */, 2050 2050 93C01DAB139AC91700ED51D7 /* CoreIPCClientRunLoop.mm */, 2051 E1BB1688132018BA00F49431 /* FullKeyboardAccessWatcher.h */,2052 E1BB1689132018BA00F49431 /* FullKeyboardAccessWatcher.mm */,2053 2051 512DF6D6138C181A00A22FC6 /* KeychainItemShimMethods.h */, 2054 2052 512DF6D7138C181A00A22FC6 /* KeychainItemShimMethods.mm */, 2055 2053 511F8A7D138B46FE00A95F44 /* SecItemShimMethods.h */, 2056 2054 511F8A7E138B46FE00A95F44 /* SecItemShimMethods.mm */, 2055 BC3065C312592F8900E71278 /* WebProcessMac.mm */, 2057 2056 1A6FA01D11E1526300DB1371 /* WebProcessMainMac.mm */, 2058 BC3065C312592F8900E71278 /* WebProcessMac.mm */,2059 2057 511F8A77138B460900A95F44 /* WebProcessShim.h */, 2060 2058 511F8A78138B460900A95F44 /* WebProcessShim.mm */, 2059 E1BB1688132018BA00F49431 /* WKFullKeyboardAccessWatcher.h */, 2060 E1BB1689132018BA00F49431 /* WKFullKeyboardAccessWatcher.mm */, 2061 2061 ); 2062 2062 path = mac; … … 3153 3153 isa = PBXGroup; 3154 3154 children = ( 3155 29CD55A8128E294F00133C85 /* AccessibilityWebPageObject.h */,3156 29CD55A9128E294F00133C85 /* AccessibilityWebPageObject.mm */,3157 3155 1C8E2DAD1278C5B200BC7BD0 /* WebInspectorMac.mm */, 3158 3156 BC963D6D113DD1A500574BE2 /* WebPageMac.mm */, 3157 29CD55A8128E294F00133C85 /* WKAccessibilityWebPageObject.h */, 3158 29CD55A9128E294F00133C85 /* WKAccessibilityWebPageObject.mm */, 3159 3159 ); 3160 3160 path = mac; … … 3699 3699 ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */, 3700 3700 1CA8B946127C882A00576C2B /* WebInspectorProxyMessages.h in Headers */, 3701 29CD55AA128E294F00133C85 /* AccessibilityWebPageObject.h in Headers */,3701 29CD55AA128E294F00133C85 /* WKAccessibilityWebPageObject.h in Headers */, 3702 3702 5153569D1291B1D2000749DC /* WebPageContextMenuClient.h in Headers */, 3703 3703 1AAB4A8D1296F0A20023952F /* SandboxExtension.h in Headers */, … … 3814 3814 BCE81D99131AE02100241910 /* DictionaryPopupInfo.h in Headers */, 3815 3815 37C4E9F6131C6E7E0029BD5A /* config.h in Headers */, 3816 E1BB16A413201B9B00F49431 /* FullKeyboardAccessWatcher.h in Headers */,3816 E1BB16A413201B9B00F49431 /* WKFullKeyboardAccessWatcher.h in Headers */, 3817 3817 33AA1067131F060000D4A575 /* WebCookieManagerProxyClient.h in Headers */, 3818 3818 CDCA85C9132ABA4E00E961DF /* WKFullScreenWindowController.h in Headers */, … … 4356 4356 1CA8B954127C891500576C2B /* WebInspectorMac.mm in Sources */, 4357 4357 EDCA71B7128DDA8C00201B26 /* WKBundlePageOverlay.cpp in Sources */, 4358 29CD55AB128E294F00133C85 /* AccessibilityWebPageObject.mm in Sources */,4358 29CD55AB128E294F00133C85 /* WKAccessibilityWebPageObject.mm in Sources */, 4359 4359 5153569C1291B1D2000749DC /* WebPageContextMenuClient.cpp in Sources */, 4360 4360 1AAB4AAA1296F1540023952F /* SandboxExtensionMac.mm in Sources */, … … 4473 4473 BCE81D8C1319F7EF00241910 /* FontInfo.cpp in Sources */, 4474 4474 BCE81D98131AE02100241910 /* DictionaryPopupInfo.cpp in Sources */, 4475 E1BB16A513201B9B00F49431 /* FullKeyboardAccessWatcher.mm in Sources */,4475 E1BB16A513201B9B00F49431 /* WKFullKeyboardAccessWatcher.mm in Sources */, 4476 4476 33AA1066131F060000D4A575 /* WebCookieManagerProxyClient.cpp in Sources */, 4477 4477 CD73BA47131ACC9A00EEDED2 /* WebFullScreenManagerProxyMessageReceiver.cpp in Sources */, -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h
r95039 r95448 68 68 #include "DictionaryPopupInfo.h" 69 69 #include <wtf/RetainPtr.h> 70 OBJC_CLASS AccessibilityWebPageObject;71 70 OBJC_CLASS NSDictionary; 72 71 OBJC_CLASS NSObject; 72 OBJC_CLASS WKAccessibilityWebPageObject; 73 73 #endif 74 74 … … 331 331 #if PLATFORM(MAC) 332 332 void registerUIProcessAccessibilityTokens(const CoreIPC::DataReference& elemenToken, const CoreIPC::DataReference& windowToken); 333 AccessibilityWebPageObject* accessibilityRemoteObject();333 WKAccessibilityWebPageObject* accessibilityRemoteObject(); 334 334 WebCore::IntPoint accessibilityPosition() const { return m_accessibilityPosition; } 335 335 … … 606 606 HashSet<PluginView*> m_pluginViews; 607 607 608 RetainPtr< AccessibilityWebPageObject> m_mockAccessibilityElement;608 RetainPtr<WKAccessibilityWebPageObject> m_mockAccessibilityElement; 609 609 610 610 WebCore::KeyboardEvent* m_keyboardEventBeingInterpreted; -
trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.h
r95445 r95448 24 24 */ 25 25 26 #ifndef AccessibilityWebPageObject_h27 #define AccessibilityWebPageObject_h26 #ifndef WKAccessibilityWebPageObject_h 27 #define WKAccessibilityWebPageObject_h 28 28 29 29 namespace WebKit { … … 31 31 } 32 32 33 @interface AccessibilityWebPageObject : NSObject {33 @interface WKAccessibilityWebPageObject : NSObject { 34 34 WebKit::WebPage* m_page; 35 35 … … 45 45 @end 46 46 47 #endif // AccessibilityWebPageObject_h47 #endif // WKAccessibilityWebPageObject_h -
trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm
r95445 r95448 25 25 26 26 #import "config.h" 27 #import " AccessibilityWebPageObject.h"27 #import "WKAccessibilityWebPageObject.h" 28 28 29 29 #import "WebFrame.h" … … 40 40 using namespace WebKit; 41 41 42 @implementation AccessibilityWebPageObject42 @implementation WKAccessibilityWebPageObject 43 43 44 44 - (id)accessibilityRootObjectWrapper -
trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm
r94908 r95448 27 27 #import "WebPage.h" 28 28 29 #import "AccessibilityWebPageObject.h"30 29 #import "AttributedString.h" 31 30 #import "DataReference.h" 32 31 #import "EditorState.h" 33 32 #import "PluginView.h" 33 #import "WKAccessibilityWebPageObject.h" 34 34 #import "WebCoreArgumentCoders.h" 35 35 #import "WebEvent.h" … … 70 70 #endif 71 71 72 AccessibilityWebPageObject* mockAccessibilityElement = [[[AccessibilityWebPageObject alloc] init] autorelease];72 WKAccessibilityWebPageObject* mockAccessibilityElement = [[[WKAccessibilityWebPageObject alloc] init] autorelease]; 73 73 74 74 // Get the pid for the starting process. … … 622 622 } 623 623 624 AccessibilityWebPageObject* WebPage::accessibilityRemoteObject()624 WKAccessibilityWebPageObject* WebPage::accessibilityRemoteObject() 625 625 { 626 626 return m_mockAccessibilityElement.get(); -
trunk/Source/WebKit2/WebProcess/mac/WKFullKeyboardAccessWatcher.h
r95445 r95448 24 24 */ 25 25 26 #ifndef FullKeyboardAccessWatcher_h27 #define FullKeyboardAccessWatcher_h26 #ifndef WKFullKeyboardAccessWatcher_h 27 #define WKFullKeyboardAccessWatcher_h 28 28 29 29 #import <Cocoa/Cocoa.h> 30 30 31 @interface FullKeyboardAccessWatcher : NSObject {31 @interface WKFullKeyboardAccessWatcher : NSObject { 32 32 @private 33 33 BOOL fullKeyboardAccessEnabled; … … 38 38 @end; 39 39 40 #endif // FullKeyboardAccessWatcher_h40 #endif // WKFullKeyboardAccessWatcher_h -
trunk/Source/WebKit2/WebProcess/mac/WKFullKeyboardAccessWatcher.mm
r95445 r95448 25 25 26 26 #import "config.h" 27 #import " FullKeyboardAccessWatcher.h"27 #import "WKFullKeyboardAccessWatcher.h" 28 28 29 29 NSString * const KeyboardUIModeDidChangeNotification = @"com.apple.KeyboardUIModeDidChange"; … … 31 31 const CFStringRef UniversalAccessDomain = CFSTR("com.apple.universalaccess"); 32 32 33 @implementation FullKeyboardAccessWatcher33 @implementation WKFullKeyboardAccessWatcher 34 34 35 35 - (void)retrieveKeyboardUIModeFromPreferences:(NSNotification *)notification … … 64 64 + (BOOL)fullKeyboardAccessEnabled 65 65 { 66 static FullKeyboardAccessWatcher *watcher = [[FullKeyboardAccessWatcher alloc] init];66 static WKFullKeyboardAccessWatcher *watcher = [[WKFullKeyboardAccessWatcher alloc] init]; 67 67 return watcher->fullKeyboardAccessEnabled; 68 68 } -
trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm
r89784 r95448 27 27 #import "WebProcess.h" 28 28 29 #import "FullKeyboardAccessWatcher.h"30 29 #import "SandboxExtension.h" 30 #import "WKFullKeyboardAccessWatcher.h" 31 31 #import "WebPage.h" 32 32 #import "WebProcessCreationParameters.h" … … 135 135 bool WebProcess::fullKeyboardAccessEnabled() 136 136 { 137 return [ FullKeyboardAccessWatcher fullKeyboardAccessEnabled];137 return [WKFullKeyboardAccessWatcher fullKeyboardAccessEnabled]; 138 138 } 139 139
Note: See TracChangeset
for help on using the changeset viewer.