diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
| commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
| tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebKitTools/DumpRenderTree/mac/DumpRenderTreeWindow.mm | |
| parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
| download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 | |
Merge in WebKit r47029.
Diffstat (limited to 'WebKitTools/DumpRenderTree/mac/DumpRenderTreeWindow.mm')
| -rw-r--r-- | WebKitTools/DumpRenderTree/mac/DumpRenderTreeWindow.mm | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/WebKitTools/DumpRenderTree/mac/DumpRenderTreeWindow.mm b/WebKitTools/DumpRenderTree/mac/DumpRenderTreeWindow.mm index 3b1fc1f..aa5b117 100644 --- a/WebKitTools/DumpRenderTree/mac/DumpRenderTreeWindow.mm +++ b/WebKitTools/DumpRenderTree/mac/DumpRenderTreeWindow.mm @@ -28,6 +28,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#import "config.h" #import "DumpRenderTreeWindow.h" #import "DumpRenderTree.h" @@ -70,9 +71,9 @@ static CFArrayCallBacks NonRetainingArrayCallbacks = { CFRange arrayRange = CFRangeMake(0, CFArrayGetCount(openWindowsRef)); CFIndex i = CFArrayGetFirstIndexOfValue(openWindowsRef, arrayRange, self); - assert(i != -1); - CFArrayRemoveValueAtIndex(openWindowsRef, i); - + if (i != kCFNotFound) + CFArrayRemoveValueAtIndex(openWindowsRef, i); + [super close]; } @@ -100,12 +101,17 @@ static CFArrayCallBacks NonRetainingArrayCallbacks = { - (void)startObservingWebView { + [self stopObservingWebView]; [[self webView] addObserver:self forKeyPath:@"_isUsingAcceleratedCompositing" options:0 context:0]; + observingWebView = YES; } - (void)stopObservingWebView { + if (!observingWebView) + return; [[self webView] removeObserver:self forKeyPath:@"_isUsingAcceleratedCompositing"]; + observingWebView = NO; } - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context |