diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:15 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:15 -0800 |
| commit | 1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353 (patch) | |
| tree | 4457a7306ea5acb43fe05bfe0973b1f7faf97ba2 /WebKitTools/DumpRenderTree/mac/DumpRenderTreeWindow.mm | |
| parent | 9364f22aed35e1a1e9d07c121510f80be3ab0502 (diff) | |
| download | external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.zip external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.tar.gz external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.tar.bz2 | |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'WebKitTools/DumpRenderTree/mac/DumpRenderTreeWindow.mm')
| -rw-r--r-- | WebKitTools/DumpRenderTree/mac/DumpRenderTreeWindow.mm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebKitTools/DumpRenderTree/mac/DumpRenderTreeWindow.mm b/WebKitTools/DumpRenderTree/mac/DumpRenderTreeWindow.mm index 9e5e104..b3fc5a7 100644 --- a/WebKitTools/DumpRenderTree/mac/DumpRenderTreeWindow.mm +++ b/WebKitTools/DumpRenderTree/mac/DumpRenderTreeWindow.mm @@ -34,6 +34,7 @@ // FIXME: This file is ObjC++ only because of this include. :( #import "LayoutTestController.h" +#import <WebKit/WebTypesInternal.h> CFMutableArrayRef openWindowsRef = 0; @@ -52,7 +53,7 @@ static CFArrayCallBacks NonRetainingArrayCallbacks = { return [[(NSArray *)openWindowsRef copy] autorelease]; } -- (id)initWithContentRect:(NSRect)contentRect styleMask:(unsigned int)styleMask backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation +- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)styleMask backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation { if (!openWindowsRef) openWindowsRef = CFArrayCreateMutable(NULL, 0, &NonRetainingArrayCallbacks); @@ -73,7 +74,7 @@ static CFArrayCallBacks NonRetainingArrayCallbacks = { - (BOOL)isKeyWindow { - return layoutTestController ? layoutTestController->windowIsKey() : YES; + return gLayoutTestController ? gLayoutTestController->windowIsKey() : YES; } - (void)keyDown:(id)sender |