Changeset 58117 in webkit
- Timestamp:
- Apr 22, 2010 1:56:25 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 21 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit2/ChangeLog
r57945 r58117 1 2010-04-22 Sam Weinig <sam@webkit.org> 2 3 Reviewed by Anders Carlsson. 4 5 Fix for https://bugs.webkit.org/show_bug.cgi?id=38002 6 Add rudimentary statistics gathering for WebKit2 7 8 * UIProcess/API/C/WKContext.cpp: 9 (WKContextGetStatistics): 10 * UIProcess/API/C/WKContextPrivate.h: Copied from WebKit2/UIProcess/API/C/WKContext.h. 11 * UIProcess/API/C/WKPageNamespace.cpp: 12 (WKPageNamespaceGetContext): 13 * UIProcess/API/C/WKPageNamespace.h: 14 * UIProcess/WebContext.cpp: 15 (WebKit::WebContext::getStatistics): 16 * UIProcess/WebContext.h: 17 * UIProcess/WebPageNamespace.cpp: 18 (WebKit::WebPageNamespace::getStatistics): 19 * UIProcess/WebPageNamespace.h: 20 * UIProcess/WebPageProxy.cpp: 21 (WebKit::WebPageProxy::getStatistics): 22 * UIProcess/WebPageProxy.h: 23 * UIProcess/WebProcessProxy.cpp: 24 (WebKit::WebProcessProxy::numberOfPages): 25 * UIProcess/WebProcessProxy.h: 26 * WebKit2.xcodeproj/project.pbxproj: 27 * win/WebKit2.vcproj: 28 1 29 2010-04-20 Anders Carlsson <andersca@apple.com> 2 30 -
trunk/WebKit2/UIProcess/API/C/WKContext.cpp
r57310 r58117 25 25 26 26 #include "WKContext.h" 27 #include "WKContextPrivate.h" 27 28 28 29 #include "ProcessModel.h" … … 63 64 } 64 65 66 void WKContextGetStatistics(WKContextRef contextRef, WKContextStatistics* statistics) 67 { 68 toWK(contextRef)->getStatistics(statistics); 69 } 70 65 71 WKContextRef WKContextRetain(WKContextRef contextRef) 66 72 { -
trunk/WebKit2/UIProcess/API/C/WKContextPrivate.h
r58024 r58117 24 24 */ 25 25 26 #ifndef WKContext _h27 #define WKContext _h26 #ifndef WKContextPrivate_h 27 #define WKContextPrivate_h 28 28 29 29 #include <WebKit2/WKBase.h> 30 #include <WebKit2/WKContext.h> 30 31 31 32 #ifdef __cplusplus … … 33 34 #endif 34 35 35 enum { 36 kWKProcessModelSecondaryProcess = 0, 37 kWKProcessModelSecondaryThread = 1 36 struct WKContextStatistics { 37 size_t numberOfWKPageNamespaces; 38 size_t numberOfWKPages; 39 size_t numberOfWKFrames; 38 40 }; 39 typedef unsigned long WKProcessModel;41 typedef struct WKContextStatistics WKContextStatistics; 40 42 41 WK_EXPORT WKContextRef WKContextCreateWithProcessModel(WKProcessModel processModel); 42 43 WK_EXPORT void WKContextSetPreferences(WKContextRef context, WKPreferencesRef preferences); 44 WK_EXPORT WKPreferencesRef WKContextGetPreferences(WKContextRef context); 45 46 WK_EXPORT WKContextRef WKContextRetain(WKContextRef context); 47 WK_EXPORT void WKContextRelease(WKContextRef context); 43 WK_EXPORT void WKContextGetStatistics(WKContextRef context, WKContextStatistics* statistics); 48 44 49 45 #ifdef __cplusplus … … 51 47 #endif 52 48 53 #endif /* WKContext _h */49 #endif /* WKContextPrivate_h */ -
trunk/WebKit2/UIProcess/API/C/WKPageNamespace.cpp
r57310 r58117 38 38 } 39 39 40 WKContextRef WKPageNamespaceGetContext(WKPageNamespaceRef pageNamespaceRef) 41 { 42 return toRef(toWK(pageNamespaceRef)->context()); 43 } 44 40 45 WKPageNamespaceRef WKPageNamespaceRetain(WKPageNamespaceRef pageNamespaceRef) 41 46 { -
trunk/WebKit2/UIProcess/API/C/WKPageNamespace.h
r57310 r58117 35 35 WK_EXPORT WKPageNamespaceRef WKPageNamespaceCreate(WKContextRef ownerContext); 36 36 37 WK_EXPORT WKContextRef WKPageNamespaceGetContext(WKPageNamespaceRef pageNamespace); 38 37 39 WK_EXPORT WKPageNamespaceRef WKPageNamespaceRetain(WKPageNamespaceRef pageNamespace); 38 40 WK_EXPORT void WKPageNamespaceRelease(WKPageNamespaceRef pageNamespace); -
trunk/WebKit2/UIProcess/WebContext.cpp
r57310 r58117 30 30 #include "WebPreferences.h" 31 31 #include "WebProcessManager.h" 32 33 #include "WKContextPrivate.h" 32 34 33 35 #ifndef NDEBUG … … 104 106 } 105 107 108 void WebContext::getStatistics(WKContextStatistics* statistics) 109 { 110 memset(statistics, 0, sizeof(WKContextStatistics)); 111 112 statistics->numberOfWKPageNamespaces = m_pageNamespaces.size(); 113 114 for (HashSet<WebPageNamespace*>::iterator it = m_pageNamespaces.begin(), end = m_pageNamespaces.end(); it != end; ++it) 115 (*it)->getStatistics(statistics); 116 } 117 106 118 } // namespace WebKit -
trunk/WebKit2/UIProcess/WebContext.h
r57310 r58117 33 33 #include <wtf/RefPtr.h> 34 34 35 struct WKContextStatistics; 36 35 37 namespace WebKit { 36 38 … … 57 59 ProcessModel processModel() const { return m_processModel; } 58 60 61 void getStatistics(WKContextStatistics* statistics); 62 59 63 private: 60 64 WebContext(ProcessModel); -
trunk/WebKit2/UIProcess/WebPageNamespace.cpp
r57310 r58117 28 28 #include "WebProcessManager.h" 29 29 #include "WebProcessProxy.h" 30 31 #include "WKContextPrivate.h" 30 32 31 33 #ifndef NDEBUG … … 87 89 } 88 90 91 void WebPageNamespace::getStatistics(WKContextStatistics* statistics) 92 { 93 if (!m_process) 94 return; 95 96 statistics->numberOfWKPages += m_process->numberOfPages(); 97 98 for (WebProcessProxy::pages_const_iterator it = m_process->pages_begin(), end = m_process->pages_end(); it != end; ++it) 99 (*it)->getStatistics(statistics); 100 } 101 89 102 } // namespace WebKit -
trunk/WebKit2/UIProcess/WebPageNamespace.h
r57310 r58117 33 33 #include <wtf/RefPtr.h> 34 34 35 struct WKContextStatistics; 36 35 37 namespace WebKit { 36 38 … … 55 57 void preferencesDidChange(); 56 58 59 void getStatistics(WKContextStatistics*); 60 57 61 private: 58 62 WebPageNamespace(WebContext*); -
trunk/WebKit2/UIProcess/WebPageProxy.cpp
r57764 r58117 41 41 #include "WebProcessProxy.h" 42 42 43 #include "WKContextPrivate.h" 44 43 45 #ifndef NDEBUG 44 46 #include <wtf/RefCountedLeakCounter.h> … … 295 297 // FIXME: It probably makes more sense to send individual preference changes. 296 298 process()->connection()->send(WebPageMessage::PreferencesDidChange, m_pageID, CoreIPC::In(pageNamespace()->context()->preferences()->store())); 299 } 300 301 void WebPageProxy::getStatistics(WKContextStatistics* statistics) 302 { 303 statistics->numberOfWKFrames += m_frameMap.size(); 297 304 } 298 305 -
trunk/WebKit2/UIProcess/WebPageProxy.h
r57676 r58117 54 54 } 55 55 56 struct WKContextStatistics; 57 56 58 namespace WebKit { 57 59 … … 134 136 135 137 void preferencesDidChange(); 138 139 void getStatistics(WKContextStatistics*); 136 140 137 141 private: -
trunk/WebKit2/UIProcess/WebProcessProxy.cpp
r57548 r58117 113 113 } 114 114 115 size_t WebProcessProxy::numberOfPages() 116 { 117 return m_pageMap.size(); 118 } 119 115 120 void WebProcessProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments) 116 121 { -
trunk/WebKit2/UIProcess/WebProcessProxy.h
r57310 r58117 59 59 pages_const_iterator pages_begin(); 60 60 pages_const_iterator pages_end(); 61 size_t numberOfPages(); 61 62 62 63 ResponsivenessTimer* responsivenessTimer() { return &m_responsivenessTimer; } -
trunk/WebKit2/WebKit2.xcodeproj/project.pbxproj
r57761 r58117 144 144 BCC5715C115ADAEF001CCAF9 /* WebSystemInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = BCC5715A115ADAEF001CCAF9 /* WebSystemInterface.m */; }; 145 145 BCC57162115ADB42001CCAF9 /* NotImplemented.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC57161115ADB42001CCAF9 /* NotImplemented.h */; }; 146 BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC938E01180DE440085E5FE /* WKContextPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 146 147 BCCF085F113F3B8600C650C5 /* DrawingAreaProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = BCCF085D113F3B8600C650C5 /* DrawingAreaProxy.h */; }; 147 148 BCCF0860113F3B8600C650C5 /* DrawingAreaProxy.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCCF085E113F3B8600C650C5 /* DrawingAreaProxy.mm */; }; … … 341 342 BCC5715A115ADAEF001CCAF9 /* WebSystemInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebSystemInterface.m; sourceTree = "<group>"; }; 342 343 BCC57161115ADB42001CCAF9 /* NotImplemented.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotImplemented.h; sourceTree = "<group>"; }; 344 BCC938E01180DE440085E5FE /* WKContextPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContextPrivate.h; sourceTree = "<group>"; }; 343 345 BCCF085D113F3B8600C650C5 /* DrawingAreaProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DrawingAreaProxy.h; path = mac/DrawingAreaProxy.h; sourceTree = "<group>"; }; 344 346 BCCF085E113F3B8600C650C5 /* DrawingAreaProxy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DrawingAreaProxy.mm; path = mac/DrawingAreaProxy.mm; sourceTree = "<group>"; }; … … 642 644 BCB9E24A1120E15C00A137E0 /* WKContext.cpp */, 643 645 BCB9E2491120E15C00A137E0 /* WKContext.h */, 646 BCC938E01180DE440085E5FE /* WKContextPrivate.h */, 644 647 BCD01398110FA420003B8A67 /* WKFrame.cpp */, 645 648 BCD01397110FA420003B8A67 /* WKFrame.h */, … … 903 906 BCF69FA21176D01400471A52 /* WebNavigationData.h in Headers */, 904 907 BCF69FA91176D1CB00471A52 /* WKNavigationData.h in Headers */, 908 BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */, 905 909 ); 906 910 runOnlyForDeploymentPostprocessing = 0; -
trunk/WebKit2/win/WebKit2.vcproj
r57774 r58117 855 855 </File> 856 856 <File 857 RelativePath="..\UIProcess\API\C\WKContextPrivate.h" 858 > 859 </File> 860 <File 857 861 RelativePath="..\UIProcess\API\C\WKFrame.cpp" 858 862 > -
trunk/WebKitTools/ChangeLog
r58111 r58117 1 2010-04-22 Sam Weinig <sam@webkit.org> 2 3 Reviewed by Anders Carlsson. 4 5 Fix for https://bugs.webkit.org/show_bug.cgi?id=38002 6 Add rudimentary statistics gathering for WebKit2 7 8 * MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj: 9 * MiniBrowser/mac/AppDelegate.h: 10 * MiniBrowser/mac/AppDelegate.m: 11 (-[BrowserAppDelegate init]): 12 (-[BrowserAppDelegate newWindow:]): 13 (-[BrowserAppDelegate getCurrentPageNamespace]): 14 (-[BrowserAppDelegate _setProcessModel:]): 15 (-[BrowserAppDelegate showStatisticsWindow:]): 16 (-[BrowserAppDelegate applicationWillTerminate:]): 17 * MiniBrowser/mac/BrowserStatisticsWindow.xib: Added. 18 * MiniBrowser/mac/BrowserStatisticsWindowController.h: Added. 19 * MiniBrowser/mac/BrowserStatisticsWindowController.m: Added. 20 (-[BrowserStatisticsWindowController initWithThreadedWKContextRef:processWKContextRef:]): 21 (-[BrowserStatisticsWindowController dealloc]): 22 (-[BrowserStatisticsWindowController windowDidLoad]): 23 (-[BrowserStatisticsWindowController refreshStatistics:]): 24 * MiniBrowser/mac/BrowserWindowController.h: 25 * MiniBrowser/mac/English.lproj/MainMenu.xib: 26 * MiniBrowser/mac/MiniBrowser_Prefix.pch: 27 1 28 2010-04-22 Dave Moore <davemoore@chromium.org> 2 29 -
trunk/WebKitTools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj
r57374 r58117 16 16 BC3294A3116A9852008635D0 /* BrowserWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC3294A1116A9852008635D0 /* BrowserWindow.xib */; }; 17 17 BC8FB5A8116AA1FE0080D413 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC8FB5A7116AA1FE0080D413 /* WebKit2.framework */; }; 18 BCE625EE117FC80E00572433 /* BrowserStatisticsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCE625ED117FC80E00572433 /* BrowserStatisticsWindow.xib */; }; 19 BCE625F1117FC82700572433 /* BrowserStatisticsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCE625F0117FC82700572433 /* BrowserStatisticsWindowController.m */; }; 18 20 /* End PBXBuildFile section */ 19 21 … … 35 37 BC3294A2116A9852008635D0 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = mac/English.lproj/BrowserWindow.xib; sourceTree = "<group>"; }; 36 38 BC8FB5A7116AA1FE0080D413 /* WebKit2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebKit2.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 39 BCE625ED117FC80E00572433 /* BrowserStatisticsWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = BrowserStatisticsWindow.xib; path = mac/BrowserStatisticsWindow.xib; sourceTree = "<group>"; }; 40 BCE625EF117FC82700572433 /* BrowserStatisticsWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BrowserStatisticsWindowController.h; path = mac/BrowserStatisticsWindowController.h; sourceTree = "<group>"; }; 41 BCE625F0117FC82700572433 /* BrowserStatisticsWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BrowserStatisticsWindowController.m; path = mac/BrowserStatisticsWindowController.m; sourceTree = "<group>"; }; 37 42 /* End PBXFileReference section */ 38 43 … … 57 62 BC329496116A941B008635D0 /* BrowserWindowController.h */, 58 63 BC329497116A941B008635D0 /* BrowserWindowController.m */, 64 BCE625EF117FC82700572433 /* BrowserStatisticsWindowController.h */, 65 BCE625F0117FC82700572433 /* BrowserStatisticsWindowController.m */, 59 66 ); 60 67 name = Classes; … … 116 123 BC3294A1116A9852008635D0 /* BrowserWindow.xib */, 117 124 1DDD58140DA1D0A300B32029 /* MainMenu.xib */, 125 BCE625ED117FC80E00572433 /* BrowserStatisticsWindow.xib */, 118 126 ); 119 127 name = Resources; … … 175 183 1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */, 176 184 BC3294A3116A9852008635D0 /* BrowserWindow.xib in Resources */, 185 BCE625EE117FC80E00572433 /* BrowserStatisticsWindow.xib in Resources */, 177 186 ); 178 187 runOnlyForDeploymentPostprocessing = 0; … … 188 197 BC329487116A92E2008635D0 /* main.m in Sources */, 189 198 BC329498116A941B008635D0 /* BrowserWindowController.m in Sources */, 199 BCE625F1117FC82700572433 /* BrowserStatisticsWindowController.m in Sources */, 190 200 ); 191 201 runOnlyForDeploymentPostprocessing = 0; -
trunk/WebKitTools/MiniBrowser/mac/AppDelegate.h
r57374 r58117 24 24 */ 25 25 26 #import <Cocoa/Cocoa.h>27 #import <WebKit2/WebKit2.h>28 29 26 @interface BrowserAppDelegate : NSObject <NSApplicationDelegate> { 30 27 WKProcessModel currentProcessModel; 31 WKPageNamespaceRef pageNamespace; 28 WKPageNamespaceRef threadPageNamespace; 29 WKPageNamespaceRef processPageNamespace; 32 30 } 33 31 34 - (WKPageNamespaceRef)get PageNamespace;32 - (WKPageNamespaceRef)getCurrentPageNamespace; 35 33 36 34 - (IBAction)setSharedProcessProcessModel:(id)sender; 37 35 - (IBAction)setSharedThreadProcessModel:(id)sender; 36 - (IBAction)showStatisticsWindow:(id)sender; 38 37 39 38 @end -
trunk/WebKitTools/MiniBrowser/mac/AppDelegate.m
r57675 r58117 25 25 26 26 #import "AppDelegate.h" 27 27 28 #import "BrowserWindowController.h" 29 #import "BrowserStatisticsWindowController.h" 28 30 29 31 static NSString *defaultURL = @"http://webkit.org/"; 30 static const WKProcessModel defaultProcessModel = kWKProcessModelSecondaryProcess;31 32 32 33 @implementation BrowserAppDelegate … … 40 41 else 41 42 currentProcessModel = kWKProcessModelSecondaryProcess; 43 44 WKContextRef threadContext = WKContextCreateWithProcessModel(kWKProcessModelSecondaryThread); 45 threadPageNamespace = WKPageNamespaceCreate(threadContext); 46 WKContextRelease(threadContext); 47 48 WKContextRef processContext = WKContextCreateWithProcessModel(kWKProcessModelSecondaryProcess); 49 processPageNamespace = WKPageNamespaceCreate(processContext); 50 WKContextRelease(processContext); 42 51 } 43 52 … … 47 56 - (IBAction)newWindow:(id)sender 48 57 { 49 BrowserWindowController *controller = [[BrowserWindowController alloc] initWithPageNamespace:[self get PageNamespace]];58 BrowserWindowController *controller = [[BrowserWindowController alloc] initWithPageNamespace:[self getCurrentPageNamespace]]; 50 59 [[controller window] makeKeyAndOrderFront:sender]; 51 60 … … 53 62 } 54 63 55 - (WKPageNamespaceRef)get PageNamespace64 - (WKPageNamespaceRef)getCurrentPageNamespace 56 65 { 57 if (!pageNamespace) { 58 WKContextRef context = WKContextCreateWithProcessModel(currentProcessModel); 59 pageNamespace = WKPageNamespaceCreate(context); 60 WKContextRelease(context); 61 } 62 63 return pageNamespace; 66 return (currentProcessModel == kWKProcessModelSecondaryThread) ? threadPageNamespace : processPageNamespace; 64 67 } 65 68 … … 79 82 80 83 currentProcessModel = processModel; 81 if (pageNamespace) {82 WKPageNamespaceRelease(pageNamespace);83 pageNamespace = 0;84 }85 84 } 86 85 … … 95 94 } 96 95 96 - (IBAction)showStatisticsWindow:(id)sender 97 { 98 static BrowserStatisticsWindowController* windowController; 99 if (!windowController) 100 windowController = [[BrowserStatisticsWindowController alloc] initWithThreadedWKContextRef:WKPageNamespaceGetContext(threadPageNamespace) 101 processWKContextRef:WKPageNamespaceGetContext(processPageNamespace)]; 102 103 [[windowController window] makeKeyAndOrderFront:self]; 104 } 105 97 106 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification 98 107 { … … 104 113 NSArray* windows = [NSApp windows]; 105 114 for (NSWindow* window in windows) { 106 BrowserWindowController *controller = (BrowserWindowController *)[window delegate]; 107 [controller applicationTerminating]; 115 id delegate = [window delegate]; 116 if ([delegate isKindOfClass:[BrowserWindowController class]]) { 117 BrowserWindowController *controller = (BrowserWindowController *)delegate; 118 [controller applicationTerminating]; 119 } 108 120 } 121 122 WKPageNamespaceRelease(threadPageNamespace); 123 threadPageNamespace = 0; 109 124 110 if (pageNamespace) { 111 WKPageNamespaceRelease(pageNamespace); 112 pageNamespace = 0; 113 } 125 WKPageNamespaceRelease(processPageNamespace); 126 processPageNamespace = 0; 114 127 } 115 128 -
trunk/WebKitTools/MiniBrowser/mac/BrowserWindowController.h
r58024 r58117 24 24 */ 25 25 26 #import <Cocoa/Cocoa.h>27 28 #import <WebKit2/WebKit2.h>29 30 26 @interface BrowserWindowController : NSWindowController { 31 27 IBOutlet NSProgressIndicator *progressIndicator; -
trunk/WebKitTools/MiniBrowser/mac/English.lproj/MainMenu.xib
r58024 r58117 4 4 <int key="IBDocument.SystemTarget">1060</int> 5 5 <string key="IBDocument.SystemVersion">10D573</string> 6 <string key="IBDocument.InterfaceBuilderVersion">7 83</string>6 <string key="IBDocument.InterfaceBuilderVersion">762</string> 7 7 <string key="IBDocument.AppKitVersion">1038.29</string> 8 8 <string key="IBDocument.HIToolboxVersion">460.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">7 83</string>11 <string key="NS.object.0">762</string> 12 12 </object> 13 13 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> … … 1349 1349 <reference key="NSMixedImage" ref="502551668"/> 1350 1350 </object> 1351 <object class="NSMenuItem" id="864702084"> 1352 <reference key="NSMenu" ref="865232259"/> 1353 <bool key="NSIsDisabled">YES</bool> 1354 <bool key="NSIsSeparator">YES</bool> 1355 <string key="NSTitle"/> 1356 <string key="NSKeyEquiv"/> 1357 <int key="NSMnemonicLoc">2147483647</int> 1358 <reference key="NSOnImage" ref="35465992"/> 1359 <reference key="NSMixedImage" ref="502551668"/> 1360 </object> 1361 <object class="NSMenuItem" id="208343368"> 1362 <reference key="NSMenu" ref="865232259"/> 1363 <string key="NSTitle">Show Statistics Window</string> 1364 <string key="NSKeyEquiv"/> 1365 <int key="NSMnemonicLoc">2147483647</int> 1366 <reference key="NSOnImage" ref="35465992"/> 1367 <reference key="NSMixedImage" ref="502551668"/> 1368 </object> 1351 1369 <object class="NSMenuItem" id="162978490"> 1352 1370 <reference key="NSMenu" ref="865232259"/> … … 2117 2135 </object> 2118 2136 <int key="connectionID">551</int> 2137 </object> 2138 <object class="IBConnectionRecord"> 2139 <object class="IBActionConnection" key="connection"> 2140 <string key="label">showStatisticsWindow:</string> 2141 <reference key="source" ref="976324537"/> 2142 <reference key="destination" ref="208343368"/> 2143 </object> 2144 <int key="connectionID">554</int> 2119 2145 </object> 2120 2146 </object> … … 3165 3191 <reference ref="137933275"/> 3166 3192 <reference ref="1027125810"/> 3193 <reference ref="864702084"/> 3194 <reference ref="208343368"/> 3167 3195 </object> 3168 3196 <reference key="parent" ref="816668511"/> … … 3218 3246 <int key="objectID">550</int> 3219 3247 <reference key="object" ref="1027125810"/> 3248 <reference key="parent" ref="865232259"/> 3249 </object> 3250 <object class="IBObjectRecord"> 3251 <int key="objectID">552</int> 3252 <reference key="object" ref="208343368"/> 3253 <reference key="parent" ref="865232259"/> 3254 </object> 3255 <object class="IBObjectRecord"> 3256 <int key="objectID">553</int> 3257 <reference key="object" ref="864702084"/> 3220 3258 <reference key="parent" ref="865232259"/> 3221 3259 </object> … … 3447 3485 <string>548.IBPluginDependency</string> 3448 3486 <string>550.IBPluginDependency</string> 3487 <string>552.IBPluginDependency</string> 3488 <string>553.IBPluginDependency</string> 3449 3489 <string>56.IBPluginDependency</string> 3450 3490 <string>56.ImportedFromIB2</string> … … 3588 3628 <integer value="1"/> 3589 3629 <string>{{525, 802}, {197, 73}}</string> 3590 <string>{{317, 945}, {517, 20}}</string>3630 <string>{{317, 836}, {517, 20}}</string> 3591 3631 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3592 3632 <integer value="1"/> … … 3694 3734 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3695 3735 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3696 <string>{{759, 852}, {211, 93}}</string>3736 <string>{{759, 713}, {246, 123}}</string> 3697 3737 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3698 3738 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3699 3739 <string>{{944, 872}, {154, 43}}</string> 3740 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3741 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3700 3742 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3701 3743 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> … … 3757 3799 </object> 3758 3800 <nil key="sourceID"/> 3759 <int key="maxID">55 1</int>3801 <int key="maxID">554</int> 3760 3802 </object> 3761 3803 <object class="IBClassDescriber" key="IBDocument.Classes"> … … 3771 3813 <string>setSharedProcessProcessModel:</string> 3772 3814 <string>setSharedThreadProcessModel:</string> 3815 <string>showStatisticsWindow:</string> 3773 3816 </object> 3774 3817 <object class="NSMutableArray" key="dict.values"> … … 3776 3819 <string>id</string> 3777 3820 <string>id</string> 3778 </object> 3779 </object> 3780 <object class="NSMutableDictionary" key="actionInfosByName"> 3781 <bool key="EncodedWithXMLCoder">YES</bool> 3782 <object class="NSArray" key="dict.sortedKeys"> 3783 <bool key="EncodedWithXMLCoder">YES</bool> 3784 <string>setSharedProcessProcessModel:</string> 3785 <string>setSharedThreadProcessModel:</string> 3786 </object> 3787 <object class="NSMutableArray" key="dict.values"> 3788 <bool key="EncodedWithXMLCoder">YES</bool> 3789 <object class="IBActionInfo"> 3790 <string key="name">setSharedProcessProcessModel:</string> 3791 <string key="candidateClassName">id</string> 3792 </object> 3793 <object class="IBActionInfo"> 3794 <string key="name">setSharedThreadProcessModel:</string> 3795 <string key="candidateClassName">id</string> 3796 </object> 3821 <string>id</string> 3797 3822 </object> 3798 3823 </object> … … 3809 3834 <string key="NS.object.0">NSWindow</string> 3810 3835 </object> 3811 <object class="NSMutableDictionary" key="toOneOutletInfosByName">3812 <string key="NS.key.0">window</string>3813 <object class="IBToOneOutletInfo" key="NS.object.0">3814 <string key="name">window</string>3815 <string key="candidateClassName">NSWindow</string>3816 </object>3817 </object>3818 3836 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 3819 3837 <string key="majorKey">IBUserSource</string> … … 3843 3861 </object> 3844 3862 </object> 3845 <object class="NSMutableDictionary" key="actionInfosByName">3846 <bool key="EncodedWithXMLCoder">YES</bool>3847 <object class="NSArray" key="dict.sortedKeys">3848 <bool key="EncodedWithXMLCoder">YES</bool>3849 <string>fetch:</string>3850 <string>forceRepaint:</string>3851 <string>reload:</string>3852 <string>removeReinsertWebView:</string>3853 <string>showHideWebView:</string>3854 </object>3855 <object class="NSMutableArray" key="dict.values">3856 <bool key="EncodedWithXMLCoder">YES</bool>3857 <object class="IBActionInfo">3858 <string key="name">fetch:</string>3859 <string key="candidateClassName">id</string>3860 </object>3861 <object class="IBActionInfo">3862 <string key="name">forceRepaint:</string>3863 <string key="candidateClassName">id</string>3864 </object>3865 <object class="IBActionInfo">3866 <string key="name">reload:</string>3867 <string key="candidateClassName">id</string>3868 </object>3869 <object class="IBActionInfo">3870 <string key="name">removeReinsertWebView:</string>3871 <string key="candidateClassName">id</string>3872 </object>3873 <object class="IBActionInfo">3874 <string key="name">showHideWebView:</string>3875 <string key="candidateClassName">id</string>3876 </object>3877 </object>3878 </object>3879 3863 <object class="NSMutableDictionary" key="outlets"> 3880 3864 <bool key="EncodedWithXMLCoder">YES</bool> … … 3892 3876 <string>NSButton</string> 3893 3877 <string>NSTextField</string> 3894 </object>3895 </object>3896 <object class="NSMutableDictionary" key="toOneOutletInfosByName">3897 <bool key="EncodedWithXMLCoder">YES</bool>3898 <object class="NSArray" key="dict.sortedKeys">3899 <bool key="EncodedWithXMLCoder">YES</bool>3900 <string>containerView</string>3901 <string>progressIndicator</string>3902 <string>reloadButton</string>3903 <string>urlText</string>3904 </object>3905 <object class="NSMutableArray" key="dict.values">3906 <bool key="EncodedWithXMLCoder">YES</bool>3907 <object class="IBToOneOutletInfo">3908 <string key="name">containerView</string>3909 <string key="candidateClassName">NSView</string>3910 </object>3911 <object class="IBToOneOutletInfo">3912 <string key="name">progressIndicator</string>3913 <string key="candidateClassName">NSProgressIndicator</string>3914 </object>3915 <object class="IBToOneOutletInfo">3916 <string key="name">reloadButton</string>3917 <string key="candidateClassName">NSButton</string>3918 </object>3919 <object class="IBToOneOutletInfo">3920 <string key="name">urlText</string>3921 <string key="candidateClassName">NSTextField</string>3922 </object>3923 3878 </object> 3924 3879 </object> … … 3942 3897 <string>id</string> 3943 3898 <string>id</string> 3944 </object>3945 </object>3946 <object class="NSMutableDictionary" key="actionInfosByName">3947 <bool key="EncodedWithXMLCoder">YES</bool>3948 <object class="NSArray" key="dict.sortedKeys">3949 <bool key="EncodedWithXMLCoder">YES</bool>3950 <string>forceRepaint:</string>3951 <string>newWindow:</string>3952 </object>3953 <object class="NSMutableArray" key="dict.values">3954 <bool key="EncodedWithXMLCoder">YES</bool>3955 <object class="IBActionInfo">3956 <string key="name">forceRepaint:</string>3957 <string key="candidateClassName">id</string>3958 </object>3959 <object class="IBActionInfo">3960 <string key="name">newWindow:</string>3961 <string key="candidateClassName">id</string>3962 </object>3963 3899 </object> 3964 3900 </object> … … 4062 3998 </object> 4063 3999 </object> 4064 <object class="NSMutableDictionary" key="actionInfosByName">4065 <bool key="EncodedWithXMLCoder">YES</bool>4066 <object class="NSArray" key="dict.sortedKeys">4067 <bool key="EncodedWithXMLCoder">YES</bool>4068 <string>printDocument:</string>4069 <string>revertDocumentToSaved:</string>4070 <string>runPageLayout:</string>4071 <string>saveDocument:</string>4072 <string>saveDocumentAs:</string>4073 <string>saveDocumentTo:</string>4074 </object>4075 <object class="NSMutableArray" key="dict.values">4076 <bool key="EncodedWithXMLCoder">YES</bool>4077 <object class="IBActionInfo">4078 <string key="name">printDocument:</string>4079 <string key="candidateClassName">id</string>4080 </object>4081 <object class="IBActionInfo">4082 <string key="name">revertDocumentToSaved:</string>4083 <string key="candidateClassName">id</string>4084 </object>4085 <object class="IBActionInfo">4086 <string key="name">runPageLayout:</string>4087 <string key="candidateClassName">id</string>4088 </object>4089 <object class="IBActionInfo">4090 <string key="name">saveDocument:</string>4091 <string key="candidateClassName">id</string>4092 </object>4093 <object class="IBActionInfo">4094 <string key="name">saveDocumentAs:</string>4095 <string key="candidateClassName">id</string>4096 </object>4097 <object class="IBActionInfo">4098 <string key="name">saveDocumentTo:</string>4099 <string key="candidateClassName">id</string>4100 </object>4101 </object>4102 </object>4103 4000 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 4104 4001 <string key="majorKey">IBFrameworkSource</string> … … 4133 4030 </object> 4134 4031 </object> 4135 <object class="NSMutableDictionary" key="actionInfosByName">4136 <bool key="EncodedWithXMLCoder">YES</bool>4137 <object class="NSArray" key="dict.sortedKeys">4138 <bool key="EncodedWithXMLCoder">YES</bool>4139 <string>clearRecentDocuments:</string>4140 <string>newDocument:</string>4141 <string>openDocument:</string>4142 <string>saveAllDocuments:</string>4143 </object>4144 <object class="NSMutableArray" key="dict.values">4145 <bool key="EncodedWithXMLCoder">YES</bool>4146 <object class="IBActionInfo">4147 <string key="name">clearRecentDocuments:</string>4148 <string key="candidateClassName">id</string>4149 </object>4150 <object class="IBActionInfo">4151 <string key="name">newDocument:</string>4152 <string key="candidateClassName">id</string>4153 </object>4154 <object class="IBActionInfo">4155 <string key="name">openDocument:</string>4156 <string key="candidateClassName">id</string>4157 </object>4158 <object class="IBActionInfo">4159 <string key="name">saveAllDocuments:</string>4160 <string key="candidateClassName">id</string>4161 </object>4162 </object>4163 </object>4164 4032 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 4165 4033 <string key="majorKey">IBFrameworkSource</string> … … 4559 4427 <string key="NS.key.0">showWindow:</string> 4560 4428 <string key="NS.object.0">id</string> 4561 </object>4562 <object class="NSMutableDictionary" key="actionInfosByName">4563 <string key="NS.key.0">showWindow:</string>4564 <object class="IBActionInfo" key="NS.object.0">4565 <string key="name">showWindow:</string>4566 <string key="candidateClassName">id</string>4567 </object>4568 4429 </object> 4569 4430 <object class="IBClassDescriptionSource" key="sourceIdentifier"> -
trunk/WebKitTools/MiniBrowser/mac/MiniBrowser_Prefix.pch
r57374 r58117 27 27 #import <Cocoa/Cocoa.h> 28 28 #endif 29 30 #import <WebKit2/WebKit2.h>
Note: See TracChangeset
for help on using the changeset viewer.