summaryrefslogtreecommitdiff
path: root/Tools/MiniBrowser
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-08-12 09:27:39 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-08-12 09:27:39 +0200
commit3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch)
tree73dc228333948738bbe02976cacca8cd382bc978 /Tools/MiniBrowser
parentb32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff)
downloadqtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Tools/MiniBrowser')
-rw-r--r--Tools/MiniBrowser/MBToolbarItem.h1
-rw-r--r--Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj10
-rw-r--r--Tools/MiniBrowser/efl/CMakeLists.txt1
-rw-r--r--Tools/MiniBrowser/mac/AppDelegate.h15
-rw-r--r--Tools/MiniBrowser/mac/AppDelegate.m74
-rw-r--r--Tools/MiniBrowser/mac/BrowserStatisticsWindow.xib974
-rw-r--r--Tools/MiniBrowser/mac/BrowserStatisticsWindowController.h20
-rw-r--r--Tools/MiniBrowser/mac/BrowserStatisticsWindowController.m47
-rw-r--r--Tools/MiniBrowser/mac/BrowserWindowController.m17
-rw-r--r--Tools/MiniBrowser/mac/MainMenu.xib257
-rw-r--r--Tools/MiniBrowser/mac/MiniBrowser_Prefix.pch2
-rw-r--r--Tools/MiniBrowser/mac/WebBundle/WebBundleMain.m3
-rw-r--r--Tools/MiniBrowser/qt/MiniBrowserApplication.cpp6
-rw-r--r--Tools/MiniBrowser/win/BrowserView.cpp8
-rw-r--r--Tools/MiniBrowser/win/BrowserView.h2
15 files changed, 50 insertions, 1387 deletions
diff --git a/Tools/MiniBrowser/MBToolbarItem.h b/Tools/MiniBrowser/MBToolbarItem.h
index cc5a4b4cf..9971d4c10 100644
--- a/Tools/MiniBrowser/MBToolbarItem.h
+++ b/Tools/MiniBrowser/MBToolbarItem.h
@@ -24,5 +24,4 @@
*/
@interface MBToolbarItem : NSToolbarItem
-{ }
@end
diff --git a/Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj b/Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj
index fb69e89f6..0e0cc502e 100644
--- a/Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj
+++ b/Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj
@@ -21,8 +21,6 @@
BCBD384011B08A6800E01E54 /* WebBundleMain.m in Sources */ = {isa = PBXBuildFile; fileRef = BCBD383D11B08A3100E01E54 /* WebBundleMain.m */; };
BCBD384411B08AAD00E01E54 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC8FB5A7116AA1FE0080D413 /* WebKit2.framework */; };
BCBD38D011B08C0200E01E54 /* WebBundle.bundle in Copy WebBundle */ = {isa = PBXBuildFile; fileRef = BCBD381D11B0898200E01E54 /* WebBundle.bundle */; };
- BCE625EE117FC80E00572433 /* BrowserStatisticsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCE625ED117FC80E00572433 /* BrowserStatisticsWindow.xib */; };
- BCE625F1117FC82700572433 /* BrowserStatisticsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCE625F0117FC82700572433 /* BrowserStatisticsWindowController.m */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -74,9 +72,6 @@
BCA8CBE011E578A000812FB7 /* WebBundle.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebBundle.xcconfig; sourceTree = "<group>"; };
BCBD381D11B0898200E01E54 /* WebBundle.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WebBundle.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
BCBD383D11B08A3100E01E54 /* WebBundleMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebBundleMain.m; sourceTree = "<group>"; };
- BCE625ED117FC80E00572433 /* BrowserStatisticsWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = BrowserStatisticsWindow.xib; path = mac/BrowserStatisticsWindow.xib; sourceTree = "<group>"; };
- BCE625EF117FC82700572433 /* BrowserStatisticsWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BrowserStatisticsWindowController.h; path = mac/BrowserStatisticsWindowController.h; sourceTree = "<group>"; };
- BCE625F0117FC82700572433 /* BrowserStatisticsWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BrowserStatisticsWindowController.m; path = mac/BrowserStatisticsWindowController.m; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -112,8 +107,6 @@
256AC3D90F4B6AC300CF3369 /* AppDelegate.m */,
BC329496116A941B008635D0 /* BrowserWindowController.h */,
BC329497116A941B008635D0 /* BrowserWindowController.m */,
- BCE625EF117FC82700572433 /* BrowserStatisticsWindowController.h */,
- BCE625F0117FC82700572433 /* BrowserStatisticsWindowController.m */,
51E244F811EFCE07008228D1 /* MBToolbarItem.h */,
51E244F911EFCE07008228D1 /* MBToolbarItem.m */,
);
@@ -167,7 +160,6 @@
children = (
BC3294A2116A9852008635D0 /* BrowserWindow.xib */,
1DDD58150DA1D0A300B32029 /* MainMenu.xib */,
- BCE625ED117FC80E00572433 /* BrowserStatisticsWindow.xib */,
);
name = Resources;
sourceTree = "<group>";
@@ -274,7 +266,6 @@
files = (
BC72B89511E57E07001EB4EA /* MainMenu.xib in Resources */,
BC72B89611E57E0F001EB4EA /* BrowserWindow.xib in Resources */,
- BCE625EE117FC80E00572433 /* BrowserStatisticsWindow.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -295,7 +286,6 @@
256AC3DA0F4B6AC300CF3369 /* AppDelegate.m in Sources */,
BC329487116A92E2008635D0 /* main.m in Sources */,
BC329498116A941B008635D0 /* BrowserWindowController.m in Sources */,
- BCE625F1117FC82700572433 /* BrowserStatisticsWindowController.m in Sources */,
51E244FA11EFCE07008228D1 /* MBToolbarItem.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
diff --git a/Tools/MiniBrowser/efl/CMakeLists.txt b/Tools/MiniBrowser/efl/CMakeLists.txt
index fc4fcf370..ae359a668 100644
--- a/Tools/MiniBrowser/efl/CMakeLists.txt
+++ b/Tools/MiniBrowser/efl/CMakeLists.txt
@@ -28,6 +28,7 @@ SET(MiniBrowser_LIBRARIES
${LIBSOUP24_LIBRARIES}
${LIBXML2_LIBRARIES}
${LIBXSLT_LIBRARIES}
+ ${OPENGL_LIBRARIES}
${SQLITE_LIBRARIES}
)
diff --git a/Tools/MiniBrowser/mac/AppDelegate.h b/Tools/MiniBrowser/mac/AppDelegate.h
index 5d7855014..6129ea396 100644
--- a/Tools/MiniBrowser/mac/AppDelegate.h
+++ b/Tools/MiniBrowser/mac/AppDelegate.h
@@ -23,23 +23,12 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-enum ProcessModel {
- kProcessModelSharedSecondaryThread,
- kProcessModelSharedSecondaryProcess
-};
-typedef unsigned long ProcessModel;
-
@interface BrowserAppDelegate : NSObject <NSApplicationDelegate> {
- ProcessModel _currentProcessModel;
- WKContextRef _threadContext;
WKContextRef _processContext;
WKPageGroupRef _pageGroup;
+ NSMutableSet *_browserWindows;
}
-- (WKContextRef)getCurrentContext;
-
-- (IBAction)setSharedProcessProcessModel:(id)sender;
-- (IBAction)setSharedThreadProcessModel:(id)sender;
-- (IBAction)showStatisticsWindow:(id)sender;
+- (void)browserWindowWillClose:(NSWindow *)window;
@end
diff --git a/Tools/MiniBrowser/mac/AppDelegate.m b/Tools/MiniBrowser/mac/AppDelegate.m
index c8d7f8d0a..a620c798e 100644
--- a/Tools/MiniBrowser/mac/AppDelegate.m
+++ b/Tools/MiniBrowser/mac/AppDelegate.m
@@ -26,7 +26,6 @@
#import "AppDelegate.h"
#import "BrowserWindowController.h"
-#import "BrowserStatisticsWindowController.h"
#import <WebKit2/WKContextPrivate.h>
#import <WebKit2/WKStringCF.h>
@@ -113,11 +112,6 @@ static void populateVisitedLinks(WKContextRef context, const void *clientInfo)
{
self = [super init];
if (self) {
- if ([NSEvent modifierFlags] & NSShiftKeyMask)
- _currentProcessModel = kProcessModelSharedSecondaryThread;
- else
- _currentProcessModel = kProcessModelSharedSecondaryProcess;
-
WKContextHistoryClient historyClient = {
kWKContextHistoryClientCurrentVersion,
self,
@@ -128,10 +122,6 @@ static void populateVisitedLinks(WKContextRef context, const void *clientInfo)
populateVisitedLinks
};
- _threadContext = WKContextGetSharedThreadContext();
- WKContextSetHistoryClient(_threadContext, &historyClient);
- WKContextSetCacheModel(_threadContext, kWKCacheModelPrimaryWebBrowser);
-
CFStringRef bundlePathCF = (CFStringRef)[[NSBundle mainBundle] pathForAuxiliaryExecutable:@"WebBundle.bundle"];
WKStringRef bundlePath = WKStringCreateWithCFString(bundlePathCF);
@@ -153,6 +143,8 @@ static void populateVisitedLinks(WKContextRef context, const void *clientInfo)
WKStringRef pageGroupIdentifier = WKStringCreateWithCFString(CFSTR("MiniBrowser"));
_pageGroup = WKPageGroupCreateWithIdentifier(pageGroupIdentifier);
WKRelease(pageGroupIdentifier);
+
+ _browserWindows = [[NSMutableSet alloc] init];
}
return self;
@@ -160,52 +152,16 @@ static void populateVisitedLinks(WKContextRef context, const void *clientInfo)
- (IBAction)newWindow:(id)sender
{
- BrowserWindowController *controller = [[BrowserWindowController alloc] initWithContext:[self getCurrentContext] pageGroup:_pageGroup];
+ BrowserWindowController *controller = [[BrowserWindowController alloc] initWithContext:_processContext pageGroup:_pageGroup];
[[controller window] makeKeyAndOrderFront:sender];
+ [_browserWindows addObject:[controller window]];
[controller loadURLString:defaultURL];
}
-- (WKContextRef)getCurrentContext
-{
- return (_currentProcessModel == kProcessModelSharedSecondaryThread) ? _threadContext : _processContext;
-}
-
-- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
-{
- if ([menuItem action] == @selector(setSharedProcessProcessModel:))
- [menuItem setState:_currentProcessModel == kProcessModelSharedSecondaryProcess ? NSOnState : NSOffState];
- else if ([menuItem action] == @selector(setSharedThreadProcessModel:))
- [menuItem setState:_currentProcessModel == kProcessModelSharedSecondaryThread ? NSOnState : NSOffState];
- return YES;
-}
-
-- (void)_setProcessModel:(ProcessModel)processModel
-{
- if (processModel == _currentProcessModel)
- return;
-
- _currentProcessModel = processModel;
-}
-
-- (IBAction)setSharedProcessProcessModel:(id)sender
-{
- [self _setProcessModel:kProcessModelSharedSecondaryProcess];
-}
-
-- (IBAction)setSharedThreadProcessModel:(id)sender
-{
- [self _setProcessModel:kProcessModelSharedSecondaryThread];
-}
-
-- (IBAction)showStatisticsWindow:(id)sender
+- (void)browserWindowWillClose:(NSWindow *)window
{
- static BrowserStatisticsWindowController* windowController;
- if (!windowController)
- windowController = [[BrowserStatisticsWindowController alloc] initWithThreadedWKContextRef:_threadContext
- processWKContextRef:_processContext];
-
- [[windowController window] makeKeyAndOrderFront:self];
+ [_browserWindows removeObject:window];
}
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
@@ -215,13 +171,11 @@ static void populateVisitedLinks(WKContextRef context, const void *clientInfo)
- (void)applicationWillTerminate:(NSNotification *)notification
{
- NSArray* windows = [NSApp windows];
- for (NSWindow* window in windows) {
+ for (NSWindow* window in _browserWindows) {
id delegate = [window delegate];
- if ([delegate isKindOfClass:[BrowserWindowController class]]) {
- BrowserWindowController *controller = (BrowserWindowController *)delegate;
- [controller applicationTerminating];
- }
+ assert([delegate isKindOfClass:[BrowserWindowController class]]);
+ BrowserWindowController *controller = (BrowserWindowController *)delegate;
+ [controller applicationTerminating];
}
WKRelease(_processContext);
@@ -233,8 +187,10 @@ static void populateVisitedLinks(WKContextRef context, const void *clientInfo)
NSArray* windows = [NSApp windows];
for (NSWindow* window in windows) {
id delegate = [window delegate];
- if ([delegate isKindOfClass:[BrowserWindowController class]])
- return (BrowserWindowController *)delegate;
+ assert([delegate isKindOfClass:[BrowserWindowController class]]);
+ BrowserWindowController *controller = (BrowserWindowController *)delegate;
+ assert([_browserWindows containsObject:[controller window]]);
+ return controller;
}
return 0;
@@ -261,7 +217,7 @@ static void populateVisitedLinks(WKContextRef context, const void *clientInfo)
BrowserWindowController *controller = [self frontmostBrowserWindowController];
if (!controller) {
- controller = [[BrowserWindowController alloc] initWithContext:[self getCurrentContext] pageGroup:_pageGroup];
+ controller = [[BrowserWindowController alloc] initWithContext:_processContext pageGroup:_pageGroup];
[[controller window] makeKeyAndOrderFront:self];
}
diff --git a/Tools/MiniBrowser/mac/BrowserStatisticsWindow.xib b/Tools/MiniBrowser/mac/BrowserStatisticsWindow.xib
deleted file mode 100644
index ae2b5f8c7..000000000
--- a/Tools/MiniBrowser/mac/BrowserStatisticsWindow.xib
+++ /dev/null
@@ -1,974 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
- <data>
- <int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">10D573</string>
- <string key="IBDocument.InterfaceBuilderVersion">762</string>
- <string key="IBDocument.AppKitVersion">1038.29</string>
- <string key="IBDocument.HIToolboxVersion">460.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">762</string>
- </object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="2"/>
- </object>
- <object class="NSArray" key="IBDocument.PluginDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSCustomObject" id="1001">
- <string key="NSClassName">BrowserStatisticsWindowController</string>
- </object>
- <object class="NSCustomObject" id="1003">
- <string key="NSClassName">FirstResponder</string>
- </object>
- <object class="NSCustomObject" id="1004">
- <string key="NSClassName">NSApplication</string>
- </object>
- <object class="NSWindowTemplate" id="1005">
- <int key="NSWindowStyleMask">15</int>
- <int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{196, 352}, {398, 158}}</string>
- <int key="NSWTFlags">544735232</int>
- <string key="NSWindowTitle">Window</string>
- <string key="NSWindowClass">NSWindow</string>
- <nil key="NSViewClass"/>
- <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
- <object class="NSView" key="NSWindowView" id="1006">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">256</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSBox" id="349928848">
- <reference key="NSNextResponder" ref="1006"/>
- <int key="NSvFlags">45</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSView" id="737205069">
- <reference key="NSNextResponder" ref="349928848"/>
- <int key="NSvFlags">256</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMatrix" id="840724334">
- <reference key="NSNextResponder" ref="737205069"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{18, 14}, {318, 42}}</string>
- <reference key="NSSuperview" ref="737205069"/>
- <bool key="NSEnabled">YES</bool>
- <int key="NSNumRows">3</int>
- <int key="NSNumCols">3</int>
- <object class="NSMutableArray" key="NSCells">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSTextFieldCell" id="66669903">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">71435264</int>
- <string key="NSContents"/>
- <object class="NSFont" key="NSSupport" id="57559">
- <string key="NSName">LucidaGrande-Bold</string>
- <double key="NSSize">11</double>
- <int key="NSfFlags">16</int>
- </object>
- <reference key="NSControlView" ref="840724334"/>
- <object class="NSColor" key="NSBackgroundColor" id="159766406">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
- </object>
- </object>
- <object class="NSColor" key="NSTextColor" id="822671316">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlTextColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
- </object>
- </object>
- </object>
- <object class="NSTextFieldCell" id="792638244">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">71435264</int>
- <string key="NSContents">Shared Process</string>
- <reference key="NSSupport" ref="57559"/>
- <reference key="NSControlView" ref="840724334"/>
- <int key="NSTag">1</int>
- <reference key="NSBackgroundColor" ref="159766406"/>
- <reference key="NSTextColor" ref="822671316"/>
- </object>
- <object class="NSTextFieldCell" id="220500282">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">71435264</int>
- <string key="NSContents">Shared Thread</string>
- <reference key="NSSupport" ref="57559"/>
- <reference key="NSControlView" ref="840724334"/>
- <reference key="NSBackgroundColor" ref="159766406"/>
- <reference key="NSTextColor" ref="822671316"/>
- </object>
- <object class="NSTextFieldCell" id="822378002">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">71435264</int>
- <string key="NSContents">Pages</string>
- <reference key="NSSupport" ref="57559"/>
- <reference key="NSControlView" ref="840724334"/>
- <reference key="NSBackgroundColor" ref="159766406"/>
- <reference key="NSTextColor" ref="822671316"/>
- </object>
- <object class="NSTextFieldCell" id="665973187">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">71435264</int>
- <string key="NSContents">-100</string>
- <object class="NSFont" key="NSSupport" id="422232155">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">11</double>
- <int key="NSfFlags">16</int>
- </object>
- <reference key="NSControlView" ref="840724334"/>
- <int key="NSTag">11</int>
- <reference key="NSBackgroundColor" ref="159766406"/>
- <reference key="NSTextColor" ref="822671316"/>
- </object>
- <object class="NSTextFieldCell" id="534624797">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">71435264</int>
- <string key="NSContents">-100</string>
- <reference key="NSSupport" ref="422232155"/>
- <reference key="NSControlView" ref="840724334"/>
- <int key="NSTag">21</int>
- <reference key="NSBackgroundColor" ref="159766406"/>
- <reference key="NSTextColor" ref="822671316"/>
- </object>
- <object class="NSTextFieldCell" id="576107244">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">71435264</int>
- <string key="NSContents">Frames</string>
- <reference key="NSSupport" ref="57559"/>
- <reference key="NSControlView" ref="840724334"/>
- <reference key="NSBackgroundColor" ref="159766406"/>
- <reference key="NSTextColor" ref="822671316"/>
- </object>
- <object class="NSTextFieldCell" id="775125133">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">71435264</int>
- <string key="NSContents">-100</string>
- <reference key="NSSupport" ref="422232155"/>
- <reference key="NSControlView" ref="840724334"/>
- <int key="NSTag">12</int>
- <reference key="NSBackgroundColor" ref="159766406"/>
- <reference key="NSTextColor" ref="822671316"/>
- </object>
- <object class="NSTextFieldCell" id="1058484862">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">71435264</int>
- <string key="NSContents">-100</string>
- <reference key="NSSupport" ref="422232155"/>
- <reference key="NSControlView" ref="840724334"/>
- <int key="NSTag">22</int>
- <reference key="NSBackgroundColor" ref="159766406"/>
- <reference key="NSTextColor" ref="822671316"/>
- </object>
- </object>
- <string key="NSCellSize">{106, 14}</string>
- <string key="NSIntercellSpacing">{0, 0}</string>
- <int key="NSMatrixFlags">-2080374784</int>
- <nil key="NSCellClass"/>
- <object class="NSTextFieldCell" key="NSProtoCell" id="609012621">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">71435264</int>
- <string key="NSContents">Page Namespaces</string>
- <reference key="NSSupport" ref="57559"/>
- <reference key="NSBackgroundColor" ref="159766406"/>
- <reference key="NSTextColor" ref="822671316"/>
- </object>
- <int key="NSSelectedRow">-1</int>
- <int key="NSSelectedCol">-1</int>
- <reference key="NSBackgroundColor" ref="159766406"/>
- <reference key="NSCellBackgroundColor" ref="159766406"/>
- </object>
- </object>
- <string key="NSFrame">{{1, 1}, {354, 66}}</string>
- <reference key="NSSuperview" ref="349928848"/>
- </object>
- </object>
- <string key="NSFrame">{{25, 56}, {356, 82}}</string>
- <reference key="NSSuperview" ref="1006"/>
- <string key="NSOffsets">{0, 0}</string>
- <object class="NSTextFieldCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Statistics</string>
- <object class="NSFont" key="NSSupport">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">11</double>
- <int key="NSfFlags">3100</int>
- </object>
- <object class="NSColor" key="NSBackgroundColor">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">textBackgroundColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- </object>
- <object class="NSColor" key="NSTextColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
- </object>
- </object>
- <reference key="NSContentView" ref="737205069"/>
- <int key="NSBorderType">1</int>
- <int key="NSBoxType">0</int>
- <int key="NSTitlePosition">2</int>
- <bool key="NSTransparent">NO</bool>
- </object>
- <object class="NSButton" id="913385411">
- <reference key="NSNextResponder" ref="1006"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{288, 12}, {96, 32}}</string>
- <reference key="NSSuperview" ref="1006"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="465163606">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">134217728</int>
- <string key="NSContents">Refresh</string>
- <object class="NSFont" key="NSSupport">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">13</double>
- <int key="NSfFlags">1044</int>
- </object>
- <reference key="NSControlView" ref="913385411"/>
- <int key="NSButtonFlags">-2038284033</int>
- <int key="NSButtonFlags2">129</int>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- </object>
- <string key="NSFrameSize">{398, 158}</string>
- <reference key="NSSuperview"/>
- </object>
- <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
- <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
- </object>
- </object>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <object class="NSMutableArray" key="connectionRecords">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">window</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="1005"/>
- </object>
- <int key="connectionID">3</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="1005"/>
- <reference key="destination" ref="1001"/>
- </object>
- <int key="connectionID">4</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">refreshStatistics:</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="913385411"/>
- </object>
- <int key="connectionID">83</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">_basicStatsMatrix</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="840724334"/>
- </object>
- <int key="connectionID">84</int>
- </object>
- </object>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <object class="NSArray" key="orderedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <reference key="object" ref="0"/>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="1001"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="1003"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">First Responder</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-3</int>
- <reference key="object" ref="1004"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">Application</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">1</int>
- <reference key="object" ref="1005"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="1006"/>
- </object>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">2</int>
- <reference key="object" ref="1006"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="349928848"/>
- <reference ref="913385411"/>
- </object>
- <reference key="parent" ref="1005"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5</int>
- <reference key="object" ref="349928848"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="840724334"/>
- </object>
- <reference key="parent" ref="1006"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">37</int>
- <reference key="object" ref="913385411"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="465163606"/>
- </object>
- <reference key="parent" ref="1006"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">38</int>
- <reference key="object" ref="465163606"/>
- <reference key="parent" ref="913385411"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">75</int>
- <reference key="object" ref="840724334"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="1058484862"/>
- <reference ref="534624797"/>
- <reference ref="220500282"/>
- <reference ref="792638244"/>
- <reference ref="66669903"/>
- <reference ref="665973187"/>
- <reference ref="822378002"/>
- <reference ref="775125133"/>
- <reference ref="576107244"/>
- <reference ref="609012621"/>
- </object>
- <reference key="parent" ref="349928848"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">87</int>
- <reference key="object" ref="1058484862"/>
- <reference key="parent" ref="840724334"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">86</int>
- <reference key="object" ref="534624797"/>
- <reference key="parent" ref="840724334"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">85</int>
- <reference key="object" ref="220500282"/>
- <reference key="parent" ref="840724334"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">48</int>
- <reference key="object" ref="792638244"/>
- <reference key="parent" ref="840724334"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">42</int>
- <reference key="object" ref="66669903"/>
- <reference key="parent" ref="840724334"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">46</int>
- <reference key="object" ref="665973187"/>
- <reference key="parent" ref="840724334"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">43</int>
- <reference key="object" ref="822378002"/>
- <reference key="parent" ref="840724334"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">47</int>
- <reference key="object" ref="775125133"/>
- <reference key="parent" ref="840724334"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">44</int>
- <reference key="object" ref="576107244"/>
- <reference key="parent" ref="840724334"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">82</int>
- <reference key="object" ref="609012621"/>
- <reference key="parent" ref="840724334"/>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="flattenedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>1.IBEditorWindowLastContentRect</string>
- <string>1.IBPluginDependency</string>
- <string>1.IBWindowTemplateEditedContentRect</string>
- <string>1.NSWindowTemplate.visibleAtLaunch</string>
- <string>1.WindowOrigin</string>
- <string>1.editorWindowContentRectSynchronizationRect</string>
- <string>2.IBPluginDependency</string>
- <string>37.IBPluginDependency</string>
- <string>38.IBPluginDependency</string>
- <string>5.IBPluginDependency</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>{{362, 638}, {398, 158}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{362, 638}, {398, 158}}</string>
- <integer value="1"/>
- <string>{196, 240}</string>
- <string>{{202, 428}, {480, 270}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="unlocalizedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="activeLocalization"/>
- <object class="NSMutableDictionary" key="localizations">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="sourceID"/>
- <int key="maxID">88</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">BrowserStatisticsWindowController</string>
- <string key="superclassName">NSWindowController</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">refreshStatistics:</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">_basicStatsMatrix</string>
- <string key="NS.object.0">NSMatrix</string>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">mac/BrowserStatisticsWindowController.h</string>
- </object>
- </object>
- </object>
- <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">NSActionCell</string>
- <string key="superclassName">NSCell</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <string key="superclassName">NSResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="580408357">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="153722584">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="814670282">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSUserInterfaceItemSearching.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSBox</string>
- <string key="superclassName">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSBox.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSButton</string>
- <string key="superclassName">NSControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSButton.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSButtonCell</string>
- <string key="superclassName">NSActionCell</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSCell</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSControl</string>
- <string key="superclassName">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="423015697">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSFormatter</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSMatrix</string>
- <string key="superclassName">NSControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSMatrix.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSMenu</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="571428989">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSMenu.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="580408357"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="153722584"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="814670282"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="423015697"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSDragging.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="571428989"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSSavePanel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSTableView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="214998123">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSClassDescription.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObjectScripting.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSPortCoder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSScriptClassDescription.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSScriptKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSScriptObjectSpecifiers.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSScriptWhoseTests.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLDownload.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSInterfaceStyle.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSResponder</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSResponder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSTextFieldCell</string>
- <string key="superclassName">NSActionCell</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSTextFieldCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSClipView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSRulerView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSView</string>
- <string key="superclassName">NSResponder</string>
- <reference key="sourceIdentifier" ref="214998123"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSWindow</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSDrawer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSWindow</string>
- <string key="superclassName">NSResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSWindow.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSWindow</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSWindowScripting.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSWindowController</string>
- <string key="superclassName">NSResponder</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">showWindow:</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string>
- </object>
- </object>
- </object>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
- <integer value="1060" key="NS.object.0"/>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
- <integer value="3000" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">../MiniBrowser.xcodeproj</string>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- </data>
-</archive>
diff --git a/Tools/MiniBrowser/mac/BrowserStatisticsWindowController.h b/Tools/MiniBrowser/mac/BrowserStatisticsWindowController.h
deleted file mode 100644
index 6b4438f47..000000000
--- a/Tools/MiniBrowser/mac/BrowserStatisticsWindowController.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// BrowserStatisticsWindowController.h
-// MiniBrowser
-//
-// Created by Sam Weinig on 4/21/10.
-// Copyright 2010 Apple Inc. All rights reserved.
-//
-
-@interface BrowserStatisticsWindowController : NSWindowController {
- IBOutlet NSMatrix *_basicStatsMatrix;
-
- WKContextRef _threadContext;
- WKContextRef _processContext;
-}
-
-- (id)initWithThreadedWKContextRef:(WKContextRef)threadContext processWKContextRef:(WKContextRef)processContext;
-
-- (IBAction)refreshStatistics:(id)sender;
-
-@end
diff --git a/Tools/MiniBrowser/mac/BrowserStatisticsWindowController.m b/Tools/MiniBrowser/mac/BrowserStatisticsWindowController.m
deleted file mode 100644
index 878821a86..000000000
--- a/Tools/MiniBrowser/mac/BrowserStatisticsWindowController.m
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// BrowserStatisticsWindowController.m
-// MiniBrowser
-//
-// Created by Sam Weinig on 4/21/10.
-// Copyright 2010 Apple Inc. All rights reserved.
-//
-
-#import "BrowserStatisticsWindowController.h"
-
-#import <WebKit2/WKContextPrivate.h>
-
-@implementation BrowserStatisticsWindowController
-
-- (id)initWithThreadedWKContextRef:(WKContextRef)threadContext processWKContextRef:(WKContextRef)processContext
-{
- if ((self = [super initWithWindowNibName:@"BrowserStatisticsWindow"])) {
- _threadContext = WKRetain(threadContext);
- _processContext = WKRetain(processContext);
- }
-
- return self;
-}
-
-- (void)dealloc
-{
- WKRelease(_threadContext);
- _threadContext = 0;
-
- WKRelease(_processContext);
- _processContext = 0;
-
- [super dealloc];
-}
-
-- (void)windowDidLoad
-{
- [super windowDidLoad];
- [self refreshStatistics:nil];
-}
-
-- (IBAction)refreshStatistics:(id)sender
-{
- // FIXME: (Re-)implement.
-}
-
-@end
diff --git a/Tools/MiniBrowser/mac/BrowserWindowController.m b/Tools/MiniBrowser/mac/BrowserWindowController.m
index 72d37beac..e6b6f542d 100644
--- a/Tools/MiniBrowser/mac/BrowserWindowController.m
+++ b/Tools/MiniBrowser/mac/BrowserWindowController.m
@@ -25,6 +25,7 @@
#import "BrowserWindowController.h"
+#import "AppDelegate.h"
#import <WebKit2/WKPagePrivate.h>
#import <WebKit2/WKStringCF.h>
#import <WebKit2/WKURLCF.h>
@@ -58,7 +59,10 @@
- (void)dealloc
{
- assert(!_context);
+ WKRelease(_context);
+ WKRelease(_pageGroup);
+ [_webView release];
+
[super dealloc];
}
@@ -163,16 +167,14 @@
- (void)windowWillClose:(NSNotification *)notification
{
- WKRelease(_context);
- _context = 0;
- WKRelease(_pageGroup);
- _pageGroup = 0;
+ [(BrowserAppDelegate *)[NSApp delegate] browserWindowWillClose:[self window]];
+ [self autorelease];
}
- (void)applicationTerminating
{
+ // FIXME: Why are we bothering to close the page? This doesn't even prevent LEAK output.
WKPageClose(_webView.pageRef);
- WKRelease(_webView.pageRef);
}
#define DefaultMinimumZoomFactor (.5)
@@ -412,7 +414,7 @@ static WKPageRef createNewPage(WKPageRef page, WKURLRequestRef request, WKDictio
BrowserWindowController *controller = [[BrowserWindowController alloc] initWithContext:WKPageGetContext(page) pageGroup:WKPageGetPageGroup(page)];
[controller loadWindow];
- return controller->_webView.pageRef;
+ return WKRetain(controller->_webView.pageRef);
}
static void showPage(WKPageRef page, const void *clientInfo)
@@ -426,7 +428,6 @@ static void closePage(WKPageRef page, const void *clientInfo)
LOG(@"closePage");
WKPageClose(page);
[[(BrowserWindowController *)clientInfo window] close];
- WKRelease(page);
}
static void runJavaScriptAlert(WKPageRef page, WKStringRef message, WKFrameRef frame, const void* clientInfo)
diff --git a/Tools/MiniBrowser/mac/MainMenu.xib b/Tools/MiniBrowser/mac/MainMenu.xib
index b6939956d..164dba466 100644
--- a/Tools/MiniBrowser/mac/MainMenu.xib
+++ b/Tools/MiniBrowser/mac/MainMenu.xib
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1080</int>
- <string key="IBDocument.SystemVersion">12A265</string>
- <string key="IBDocument.InterfaceBuilderVersion">2816</string>
- <string key="IBDocument.AppKitVersion">1186</string>
- <string key="IBDocument.HIToolboxVersion">624.00</string>
+ <string key="IBDocument.SystemVersion">12A256</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2547</string>
+ <string key="IBDocument.AppKitVersion">1185</string>
+ <string key="IBDocument.HIToolboxVersion">622.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">2816</string>
+ <string key="NS.object.0">2547</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -934,65 +934,6 @@
<reference key="NSOnImage" ref="35465992"/>
<reference key="NSMixedImage" ref="502551668"/>
</object>
- <object class="NSMenuItem" id="208343368">
- <reference key="NSMenu" ref="865232259"/>
- <string key="NSTitle">Show Statistics Window</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="35465992"/>
- <reference key="NSMixedImage" ref="502551668"/>
- </object>
- <object class="NSMenuItem" id="162978490">
- <reference key="NSMenu" ref="865232259"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="35465992"/>
- <reference key="NSMixedImage" ref="502551668"/>
- </object>
- <object class="NSMenuItem" id="340689355">
- <reference key="NSMenu" ref="865232259"/>
- <string key="NSTitle">Process Model</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="35465992"/>
- <reference key="NSMixedImage" ref="502551668"/>
- <string key="NSAction">submenuAction:</string>
- <object class="NSMenu" key="NSSubmenu" id="935112943">
- <string key="NSTitle">Process Model</string>
- <object class="NSMutableArray" key="NSMenuItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMenuItem" id="993856752">
- <reference key="NSMenu" ref="935112943"/>
- <string key="NSTitle">Shared Process</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="35465992"/>
- <reference key="NSMixedImage" ref="502551668"/>
- </object>
- <object class="NSMenuItem" id="516840223">
- <reference key="NSMenu" ref="935112943"/>
- <string key="NSTitle">Shared Thread</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="35465992"/>
- <reference key="NSMixedImage" ref="502551668"/>
- </object>
- </object>
- </object>
- </object>
- <object class="NSMenuItem" id="377902755">
- <reference key="NSMenu" ref="865232259"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="35465992"/>
- <reference key="NSMixedImage" ref="502551668"/>
- </object>
<object class="NSMenuItem" id="191469404">
<reference key="NSMenu" ref="865232259"/>
<string key="NSTitle">Dump Source To Console</string>
@@ -1489,30 +1430,6 @@
</object>
<int key="connectionID">570</int>
</object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">setSharedProcessProcessModel:</string>
- <reference key="source" ref="976324537"/>
- <reference key="destination" ref="993856752"/>
- </object>
- <int key="connectionID">543</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">setSharedThreadProcessModel:</string>
- <reference key="source" ref="976324537"/>
- <reference key="destination" ref="516840223"/>
- </object>
- <int key="connectionID">544</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">showStatisticsWindow:</string>
- <reference key="source" ref="976324537"/>
- <reference key="destination" ref="208343368"/>
- </object>
- <int key="connectionID">554</int>
- </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -2178,14 +2095,10 @@
<reference key="object" ref="865232259"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="340689355"/>
<reference ref="878165919"/>
- <reference ref="162978490"/>
<reference ref="137933275"/>
<reference ref="1027125810"/>
<reference ref="864702084"/>
- <reference ref="208343368"/>
- <reference ref="377902755"/>
<reference ref="191469404"/>
<reference ref="624939128"/>
<reference ref="15772092"/>
@@ -2193,48 +2106,11 @@
<reference key="parent" ref="816668511"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">537</int>
- <reference key="object" ref="340689355"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="935112943"/>
- </object>
- <reference key="parent" ref="865232259"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">538</int>
- <reference key="object" ref="935112943"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="993856752"/>
- <reference ref="516840223"/>
- </object>
- <reference key="parent" ref="340689355"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">539</int>
- <reference key="object" ref="993856752"/>
- <reference key="parent" ref="935112943"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">540</int>
- <reference key="object" ref="516840223"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <reference key="parent" ref="935112943"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">545</int>
<reference key="object" ref="878165919"/>
<reference key="parent" ref="865232259"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">546</int>
- <reference key="object" ref="162978490"/>
- <reference key="parent" ref="865232259"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">548</int>
<reference key="object" ref="137933275"/>
<reference key="parent" ref="865232259"/>
@@ -2245,11 +2121,6 @@
<reference key="parent" ref="865232259"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">552</int>
- <reference key="object" ref="208343368"/>
- <reference key="parent" ref="865232259"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">553</int>
<reference key="object" ref="864702084"/>
<reference key="parent" ref="865232259"/>
@@ -2280,11 +2151,6 @@
<reference key="parent" ref="466310130"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">565</int>
- <reference key="object" ref="377902755"/>
- <reference key="parent" ref="865232259"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">566</int>
<reference key="object" ref="191469404"/>
<reference key="parent" ref="865232259"/>
@@ -2385,15 +2251,9 @@
<string>5.IBPluginDependency</string>
<string>534.IBPluginDependency</string>
<string>535.IBPluginDependency</string>
- <string>537.IBPluginDependency</string>
- <string>538.IBPluginDependency</string>
- <string>539.IBPluginDependency</string>
- <string>540.IBPluginDependency</string>
<string>545.IBPluginDependency</string>
- <string>546.IBPluginDependency</string>
<string>548.IBPluginDependency</string>
<string>550.IBPluginDependency</string>
- <string>552.IBPluginDependency</string>
<string>553.IBPluginDependency</string>
<string>555.IBPluginDependency</string>
<string>556.IBPluginDependency</string>
@@ -2401,7 +2261,6 @@
<string>558.IBPluginDependency</string>
<string>56.IBPluginDependency</string>
<string>562.IBPluginDependency</string>
- <string>565.IBPluginDependency</string>
<string>566.IBPluginDependency</string>
<string>568.IBPluginDependency</string>
<string>569.IBPluginDependency</string>
@@ -2529,13 +2388,6 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -2558,45 +2410,6 @@
<object class="IBPartialClassDescription">
<string key="className">BrowserAppDelegate</string>
<string key="superclassName">NSObject</string>
- <object class="NSMutableDictionary" key="actions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>setSharedProcessProcessModel:</string>
- <string>setSharedThreadProcessModel:</string>
- <string>showStatisticsWindow:</string>
- </object>
- <object class="NSArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>setSharedProcessProcessModel:</string>
- <string>setSharedThreadProcessModel:</string>
- <string>showStatisticsWindow:</string>
- </object>
- <object class="NSArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBActionInfo">
- <string key="name">setSharedProcessProcessModel:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">setSharedThreadProcessModel:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">showStatisticsWindow:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/BrowserAppDelegate.h</string>
@@ -2619,6 +2432,7 @@
<string>removeReinsertWebView:</string>
<string>resetZoom:</string>
<string>showHideWebView:</string>
+ <string>togglePaginationMode:</string>
<string>toggleZoomMode:</string>
<string>zoomIn:</string>
<string>zoomOut:</string>
@@ -2638,6 +2452,7 @@
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
@@ -2654,6 +2469,7 @@
<string>removeReinsertWebView:</string>
<string>resetZoom:</string>
<string>showHideWebView:</string>
+ <string>togglePaginationMode:</string>
<string>toggleZoomMode:</string>
<string>zoomIn:</string>
<string>zoomOut:</string>
@@ -2701,6 +2517,10 @@
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
+ <string key="name">togglePaginationMode:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
<string key="name">toggleZoomMode:</string>
<string key="candidateClassName">id</string>
</object>
@@ -2917,59 +2737,6 @@
<string key="minorKey">./Classes/NSDocumentController.h</string>
</object>
</object>
- <object class="IBPartialClassDescription">
- <string key="className">WebView</string>
- <object class="NSMutableDictionary" key="actions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>reloadFromOrigin:</string>
- <string>resetPageZoom:</string>
- <string>zoomPageIn:</string>
- <string>zoomPageOut:</string>
- </object>
- <object class="NSArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>reloadFromOrigin:</string>
- <string>resetPageZoom:</string>
- <string>zoomPageIn:</string>
- <string>zoomPageOut:</string>
- </object>
- <object class="NSArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBActionInfo">
- <string key="name">reloadFromOrigin:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">resetPageZoom:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">zoomPageIn:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">zoomPageOut:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/WebView.h</string>
- </object>
- </object>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
diff --git a/Tools/MiniBrowser/mac/MiniBrowser_Prefix.pch b/Tools/MiniBrowser/mac/MiniBrowser_Prefix.pch
index a4e648ee7..24ff04c07 100644
--- a/Tools/MiniBrowser/mac/MiniBrowser_Prefix.pch
+++ b/Tools/MiniBrowser/mac/MiniBrowser_Prefix.pch
@@ -27,7 +27,7 @@
#import <Cocoa/Cocoa.h>
#endif
-#import <WebKit2/WebKit2.h>
+#import <WebKit2/WebKit2_C.h>
#define ENABLE_LOGGING 0
diff --git a/Tools/MiniBrowser/mac/WebBundle/WebBundleMain.m b/Tools/MiniBrowser/mac/WebBundle/WebBundleMain.m
index 2da3e9596..509038a9c 100644
--- a/Tools/MiniBrowser/mac/WebBundle/WebBundleMain.m
+++ b/Tools/MiniBrowser/mac/WebBundle/WebBundleMain.m
@@ -44,7 +44,8 @@ void didClearWindowObjectForFrame(WKBundlePageRef page, WKBundleFrameRef frame,
WKRelease(wkURL);
LOG(@"WKBundlePageClient - didClearWindowForFrame %@", [(NSURL *)cfURL absoluteString]);
- CFRelease(cfURL);
+ if (cfURL)
+ CFRelease(cfURL);
WKStringRef messageName = WKStringCreateWithCFString(CFSTR("Callback"));
WKStringRef messageBody = WKStringCreateWithCFString(CFSTR("Window was cleared"));
diff --git a/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp b/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
index f11f90d8c..1277a13b2 100644
--- a/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
+++ b/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
@@ -216,10 +216,16 @@ bool MiniBrowserApplication::notify(QObject* target, QEvent* event)
void MiniBrowserApplication::updateTouchPoint(const QMouseEvent* mouseEvent, QTouchEvent::TouchPoint touchPoint, Qt::MouseButton mouseButton)
{
+ // Ignore inserting additional touch points if Ctrl isn't held because it produces
+ // inconsistent touch events and results in assers in the gesture recognizers.
+ if (!m_holdingControl && m_touchPoints.size() && !m_touchPoints.contains(mouseButton))
+ return;
+
if (m_holdingControl && touchPoint.state() == Qt::TouchPointReleased) {
m_heldTouchPoints.insert(mouseButton);
return;
}
+
// Gesture recognition uses the screen position for the initial threshold
// but since the canvas translates touch events we actually need to pass
// the screen position as the scene position to deliver the appropriate
diff --git a/Tools/MiniBrowser/win/BrowserView.cpp b/Tools/MiniBrowser/win/BrowserView.cpp
index bd5dcba65..03a46cb19 100644
--- a/Tools/MiniBrowser/win/BrowserView.cpp
+++ b/Tools/MiniBrowser/win/BrowserView.cpp
@@ -82,13 +82,7 @@ void BrowserView::create(RECT webViewRect, BrowserWindow* parentWindow)
{
assert(!m_webView);
- bool isShiftKeyDown = ::GetKeyState(VK_SHIFT) & HIGH_BIT_MASK_SHORT;
-
- WKContextRef context;
- if (isShiftKeyDown)
- context = WKContextGetSharedThreadContext();
- else
- context = WKContextGetSharedProcessContext();
+ static WKContextRef context = WKContextCreate();
m_webView = WKViewCreate(webViewRect, context, 0, parentWindow->window());
diff --git a/Tools/MiniBrowser/win/BrowserView.h b/Tools/MiniBrowser/win/BrowserView.h
index 08c5e4a39..e170a7df7 100644
--- a/Tools/MiniBrowser/win/BrowserView.h
+++ b/Tools/MiniBrowser/win/BrowserView.h
@@ -26,7 +26,7 @@
#ifndef BrowserView_h
#define BrowserView_h
-#include <WebKit2/WebKit2.h>
+#include <WebKit2/WebKit2_C.h>
#include <string>
class BrowserWindow;
View Lorry Controller Status