From f0a51fb571f46531025fa09240bbc3e1af925e84 Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Thu, 5 Mar 2009 12:46:38 +0000 Subject: Fixes CRLF and trailing white spaces. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10982 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h | 6 +++--- webkit/tools/test_shell/mac/DumpRenderTreePasteboard.m | 6 +++--- webkit/tools/test_shell/mac/test_shell_webview.mm | 14 +++++++------- webkit/tools/test_shell/mac/test_webview_delegate.mm | 8 ++++---- webkit/tools/test_shell/mac/webwidget_host.mm | 10 +++++----- 5 files changed, 22 insertions(+), 22 deletions(-) (limited to 'webkit/tools/test_shell/mac') diff --git a/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h b/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h index 60e2ab5..f2c1953 100644 --- a/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h +++ b/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h @@ -8,13 +8,13 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * documentation and/or other materials provided with the distribution. * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. + * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED diff --git a/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.m b/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.m index e8fa4ee..0e6731a 100644 --- a/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.m +++ b/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.m @@ -8,13 +8,13 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * documentation and/or other materials provided with the distribution. * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. + * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED diff --git a/webkit/tools/test_shell/mac/test_shell_webview.mm b/webkit/tools/test_shell/mac/test_shell_webview.mm index 17d6b79..4767e63 100644 --- a/webkit/tools/test_shell/mac/test_shell_webview.mm +++ b/webkit/tools/test_shell/mac/test_shell_webview.mm @@ -35,7 +35,7 @@ - (void) dealloc { [self removeTrackingArea:trackingArea_]; [trackingArea_ release]; - + [super dealloc]; } @@ -43,7 +43,7 @@ CGContextRef context = reinterpret_cast([[NSGraphicsContext currentContext] graphicsPort]); - + // start by filling the rect with magenta, so that we can see what's drawn CGContextSetRGBFillColor (context, 1, 0, 1, 1); CGContextFillRect(context, NSRectToCGRect(rect)); @@ -53,7 +53,7 @@ // flip from cocoa coordinates client_rect.set_y([self frame].size.height - client_rect.height() - client_rect.y()); - + shell_->webViewHost()->UpdatePaintRect(client_rect); shell_->webViewHost()->Paint(); } @@ -81,8 +81,8 @@ - (IBAction)takeURLStringValueFrom:(NSTextField *)sender { NSString *url = [sender stringValue]; - - // if it doesn't already have a prefix, add http. If we can't parse it, + + // if it doesn't already have a prefix, add http. If we can't parse it, // just don't bother rather than making things worse. NSURL* tempUrl = [NSURL URLWithString:url]; if (tempUrl && ![tempUrl scheme]) @@ -182,7 +182,7 @@ shell_->webViewHost()->SetFocus(YES); return YES; } - + return NO; } @@ -191,7 +191,7 @@ shell_->webViewHost()->SetFocus(NO); return YES; } - + return NO; } diff --git a/webkit/tools/test_shell/mac/test_webview_delegate.mm b/webkit/tools/test_shell/mac/test_webview_delegate.mm index 48e2c3f..e80f75a 100755 --- a/webkit/tools/test_shell/mac/test_webview_delegate.mm +++ b/webkit/tools/test_shell/mac/test_webview_delegate.mm @@ -74,7 +74,7 @@ void TestWebViewDelegate::CloseWidgetSoon(WebWidget* webwidget) { } } -void TestWebViewDelegate::SetCursor(WebWidget* webwidget, +void TestWebViewDelegate::SetCursor(WebWidget* webwidget, const WebCursor& cursor) { NSCursor* ns_cursor = cursor.GetCursor(); [ns_cursor set]; @@ -114,7 +114,7 @@ void TestWebViewDelegate::GetRootWindowRect(WebWidget* webwidget, - (NSRect)_growBoxRect; @end -void TestWebViewDelegate::GetRootWindowResizerRect(WebWidget* webwidget, +void TestWebViewDelegate::GetRootWindowResizerRect(WebWidget* webwidget, gfx::Rect* out_rect) { NSRect resize_rect = NSMakeRect(0, 0, 0, 0); WebWidgetHost* host = GetHostForWidget(webwidget); @@ -131,8 +131,8 @@ void TestWebViewDelegate::GetRootWindowResizerRect(WebWidget* webwidget, // Convert to view coordinates from window coordinates. resize_rect = [view convertRect:resize_rect fromView:nil]; // Flip the rect in view coordinates - resize_rect.origin.y = - [view frame].size.height - resize_rect.origin.y - + resize_rect.origin.y = + [view frame].size.height - resize_rect.origin.y - resize_rect.size.height; } *out_rect = gfx::Rect(NSRectToCGRect(resize_rect)); diff --git a/webkit/tools/test_shell/mac/webwidget_host.mm b/webkit/tools/test_shell/mac/webwidget_host.mm index b99aca7..fd95535 100644 --- a/webkit/tools/test_shell/mac/webwidget_host.mm +++ b/webkit/tools/test_shell/mac/webwidget_host.mm @@ -23,7 +23,7 @@ WebWidgetHost* WebWidgetHost::Create(NSView* parent_view, content_rect.size.height -= 64; host->view_ = [[NSView alloc] initWithFrame:content_rect]; [parent_view addSubview:host->view_]; - + // win_util::SetWindowUserData(host->hwnd_, host); host->webwidget_ = WebWidget::Create(delegate); @@ -162,10 +162,10 @@ void WebWidgetHost::Paint() { [NSGraphicsContext setCurrentContext: [NSGraphicsContext graphicsContextWithGraphicsPort:bitmap_context flipped:NO]]; - + // This may result in more invalidation webwidget_->Layout(); - + // Scroll the canvas if necessary scroll_rect_ = client_rect.Intersect(scroll_rect_); if (!scroll_rect_.IsEmpty()) { @@ -188,7 +188,7 @@ void WebWidgetHost::Paint() { } } DCHECK(paint_rect_.IsEmpty()); - + // set the context back to our window [NSGraphicsContext setCurrentContext: view_context]; @@ -201,7 +201,7 @@ void WebWidgetHost::Paint() { { bitmap_width, bitmap_height } }; canvas_->getTopPlatformDevice().DrawToContext( context, 0, client_rect.height() - bitmap_height, &bitmap_rect); - + [view_ unlockFocus]; } } -- cgit v1.1