Title: [90380] trunk/Source/WebKit/mac
- Revision
- 90380
- Author
- [email protected]
- Date
- 2011-07-04 18:54:27 -0700 (Mon, 04 Jul 2011)
Log Message
Moved handling of frame size changes into its own method.
Reviewed by Oliver Hunt.
* WebView/WebFrameView.mm:
(-[WebFrameView _frameSizeChanged]): Added. Moved code here...
(-[WebFrameView setFrameSize:]): ...from here.
* WebView/WebFrameViewInternal.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (90379 => 90380)
--- trunk/Source/WebKit/mac/ChangeLog 2011-07-05 01:27:45 UTC (rev 90379)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-07-05 01:54:27 UTC (rev 90380)
@@ -1,3 +1,14 @@
+2011-07-04 Dan Bernstein <[email protected]>
+
+ Moved handling of frame size changes into its own method.
+
+ Reviewed by Oliver Hunt.
+
+ * WebView/WebFrameView.mm:
+ (-[WebFrameView _frameSizeChanged]): Added. Moved code here...
+ (-[WebFrameView setFrameSize:]): ...from here.
+ * WebView/WebFrameViewInternal.h:
+
2011-07-01 Adele Peterson <[email protected]>
Reviewed by Darin Adler.
Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.mm (90379 => 90380)
--- trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2011-07-05 01:27:45 UTC (rev 90379)
+++ trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2011-07-05 01:54:27 UTC (rev 90380)
@@ -288,6 +288,17 @@
view->updateCanHaveScrollbars();
}
+- (void)_frameSizeChanged
+{
+ // See WebFrameLoaderClient::provisionalLoadStarted.
+ if ([[[self webFrame] webView] drawsBackground])
+ [[self _scrollView] setDrawsBackground:YES];
+ if (Frame* coreFrame = [self _web_frame]) {
+ if (FrameView* coreFrameView = coreFrame->view())
+ coreFrameView->setNeedsLayout();
+ }
+}
+
@end
@implementation WebFrameView
@@ -496,15 +507,9 @@
- (void)setFrameSize:(NSSize)size
{
- if (!NSEqualSizes(size, [self frame].size)) {
- // See WebFrameLoaderClient::provisionalLoadStarted.
- if ([[[self webFrame] webView] drawsBackground])
- [[self _scrollView] setDrawsBackground:YES];
- if (Frame* coreFrame = [self _web_frame]) {
- if (FrameView* coreFrameView = coreFrame->view())
- coreFrameView->setNeedsLayout();
- }
- }
+ if (!NSEqualSizes(size, [self frame].size))
+ [self _frameSizeChanged];
+
[super setFrameSize:size];
}
Modified: trunk/Source/WebKit/mac/WebView/WebFrameViewInternal.h (90379 => 90380)
--- trunk/Source/WebKit/mac/WebView/WebFrameViewInternal.h 2011-07-05 01:27:45 UTC (rev 90379)
+++ trunk/Source/WebKit/mac/WebView/WebFrameViewInternal.h 2011-07-05 01:54:27 UTC (rev 90380)
@@ -44,5 +44,6 @@
+ (BOOL)_canShowMIMETypeAsHTML:(NSString *)MIMEType;
- (WebDynamicScrollBarsView *)_scrollView;
- (void)_install;
+- (void)_frameSizeChanged;
@end
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
