[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
sullivan at apple.com
sullivan at apple.com
Thu Apr 8 02:22:31 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit b022f7be338ba07831c1887fb59eadd825457055
Author: sullivan at apple.com <sullivan at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Mar 15 15:40:57 2010 +0000
Method name and parameter name mistakes from recent SPI addition
<https://bugs.webkit.org/show_bug.cgi?id=36119>
Reviewed by Dan Bernstein.
* WebView/WebDynamicScrollBarsView.h:
Renamed instance variable and method name from "setAllowXXX" to "setAllowsXXX".
* WebView/WebDynamicScrollBarsView.mm:
(-[WebDynamicScrollBarsView setAllowsScrollersToOverlapContent:]):
Updated for renamed instance variable and method.
(-[WebDynamicScrollBarsView setAlwaysHideHorizontalScroller:]):
Changed parameter name from shouldBeVisible to shouldBeHidden.
(-[WebDynamicScrollBarsView setAlwaysHideVerticalScroller:]):
Ditto.
(-[WebDynamicScrollBarsView contentViewFrame]):
Updated for renamed instance variable.
(-[WebDynamicScrollBarsView tile]):
Ditto.
(-[WebDynamicScrollBarsView reflectScrolledClipView:]):
Ditto.
* WebView/WebFrame.mm:
(-[WebFrame setAllowsScrollersToOverlapContent:]):
Renamed method from setAllowXXX, and updated for same change in WebDynamicScrollBarsView.
* WebView/WebFramePrivate.h:
Renamed method name from "setAllowXXX" to "setAllowsXXX".
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55997 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index b85d373..e651568 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,34 @@
+2010-03-15 John Sullivan <sullivan at apple.com>
+
+ Method name and parameter name mistakes from recent SPI addition
+ <https://bugs.webkit.org/show_bug.cgi?id=36119>
+
+ Reviewed by Dan Bernstein.
+
+ * WebView/WebDynamicScrollBarsView.h:
+ Renamed instance variable and method name from "setAllowXXX" to "setAllowsXXX".
+
+ * WebView/WebDynamicScrollBarsView.mm:
+ (-[WebDynamicScrollBarsView setAllowsScrollersToOverlapContent:]):
+ Updated for renamed instance variable and method.
+ (-[WebDynamicScrollBarsView setAlwaysHideHorizontalScroller:]):
+ Changed parameter name from shouldBeVisible to shouldBeHidden.
+ (-[WebDynamicScrollBarsView setAlwaysHideVerticalScroller:]):
+ Ditto.
+ (-[WebDynamicScrollBarsView contentViewFrame]):
+ Updated for renamed instance variable.
+ (-[WebDynamicScrollBarsView tile]):
+ Ditto.
+ (-[WebDynamicScrollBarsView reflectScrolledClipView:]):
+ Ditto.
+
+ * WebView/WebFrame.mm:
+ (-[WebFrame setAllowsScrollersToOverlapContent:]):
+ Renamed method from setAllowXXX, and updated for same change in WebDynamicScrollBarsView.
+
+ * WebView/WebFramePrivate.h:
+ Renamed method name from "setAllowXXX" to "setAllowsXXX".
+
2010-03-14 Darin Adler <darin at apple.com>
Reviewed by Mark Rowe.
diff --git a/WebKit/mac/WebView/WebDynamicScrollBarsView.h b/WebKit/mac/WebView/WebDynamicScrollBarsView.h
index b57c939..f674422 100644
--- a/WebKit/mac/WebView/WebDynamicScrollBarsView.h
+++ b/WebKit/mac/WebView/WebDynamicScrollBarsView.h
@@ -44,7 +44,7 @@ extern const int WebCoreScrollbarAlwaysOn;
BOOL horizontallyPinnedByPreviousWheelEvent;
unsigned inUpdateScrollersLayoutPass;
- BOOL allowScrollersToOverlapContent;
+ BOOL allowsScrollersToOverlapContent;
BOOL hideHorizontalScroller;
BOOL hideVerticalScroller;
}
@@ -53,7 +53,7 @@ extern const int WebCoreScrollbarAlwaysOn;
// Perhaps it can be removed.
- (void)setAllowsHorizontalScrolling:(BOOL)flag;
-- (void)setAllowScrollersToOverlapContent:(BOOL)flag;
+- (void)setAllowsScrollersToOverlapContent:(BOOL)flag;
- (void)setAlwaysHideHorizontalScroller:(BOOL)flag;
- (void)setAlwaysHideVerticalScroller:(BOOL)flag;
@end
diff --git a/WebKit/mac/WebView/WebDynamicScrollBarsView.mm b/WebKit/mac/WebView/WebDynamicScrollBarsView.mm
index 82f9d2f..bbf8227 100644
--- a/WebKit/mac/WebView/WebDynamicScrollBarsView.mm
+++ b/WebKit/mac/WebView/WebDynamicScrollBarsView.mm
@@ -54,33 +54,33 @@ const int WebCoreScrollbarAlwaysOn = ScrollbarAlwaysOn;
[self updateScrollers];
}
-- (void)setAllowScrollersToOverlapContent:(BOOL)flag
+- (void)setAllowsScrollersToOverlapContent:(BOOL)flag
{
- if (allowScrollersToOverlapContent == flag)
+ if (allowsScrollersToOverlapContent == flag)
return;
- allowScrollersToOverlapContent = flag;
+ allowsScrollersToOverlapContent = flag;
[[self contentView] setFrame:[self contentViewFrame]];
[[self documentView] setNeedsLayout:YES];
[[self documentView] layout];
}
-- (void)setAlwaysHideHorizontalScroller:(BOOL)shouldBeVisible
+- (void)setAlwaysHideHorizontalScroller:(BOOL)shouldBeHidden
{
- if (hideHorizontalScroller == shouldBeVisible)
+ if (hideHorizontalScroller == shouldBeHidden)
return;
- hideHorizontalScroller = shouldBeVisible;
+ hideHorizontalScroller = shouldBeHidden;
[self updateScrollers];
}
-- (void)setAlwaysHideVerticalScroller:(BOOL)shouldBeVisible
+- (void)setAlwaysHideVerticalScroller:(BOOL)shouldBeHidden
{
- if (hideVerticalScroller == shouldBeVisible)
+ if (hideVerticalScroller == shouldBeHidden)
return;
- hideVerticalScroller = shouldBeVisible;
+ hideVerticalScroller = shouldBeHidden;
[self updateScrollers];
}
@@ -93,9 +93,9 @@ const int WebCoreScrollbarAlwaysOn = ScrollbarAlwaysOn;
NSRect frame = [[self contentView] frame];
if ([self hasHorizontalScroller])
- frame.size.height = (allowScrollersToOverlapContent ? NSMaxY([[self horizontalScroller] frame]) : NSMinY([[self horizontalScroller] frame]));
+ frame.size.height = (allowsScrollersToOverlapContent ? NSMaxY([[self horizontalScroller] frame]) : NSMinY([[self horizontalScroller] frame]));
if ([self hasVerticalScroller])
- frame.size.width = (allowScrollersToOverlapContent ? NSMaxX([[self verticalScroller] frame]) : NSMinX([[self verticalScroller] frame]));
+ frame.size.width = (allowsScrollersToOverlapContent ? NSMaxX([[self verticalScroller] frame]) : NSMinX([[self verticalScroller] frame]));
return frame;
}
@@ -105,7 +105,7 @@ const int WebCoreScrollbarAlwaysOn = ScrollbarAlwaysOn;
// [super tile] sets the contentView size so that it does not overlap with the scrollers,
// we want to re-set the contentView to overlap scrollers before displaying.
- if (allowScrollersToOverlapContent)
+ if (allowsScrollersToOverlapContent)
[[self contentView] setFrame:[self contentViewFrame]];
}
@@ -250,7 +250,7 @@ static const unsigned cMaxUpdateScrollbarsPass = 2;
{
if (clipView == [self contentView]) {
// Prevent appearance of trails because of overlapping views
- if (allowScrollersToOverlapContent)
+ if (allowsScrollersToOverlapContent)
[self setDrawsBackground:NO];
// FIXME: This hack here prevents infinite recursion that takes place when we
diff --git a/WebKit/mac/WebView/WebFrame.mm b/WebKit/mac/WebView/WebFrame.mm
index 9a560f4..f294f05 100644
--- a/WebKit/mac/WebView/WebFrame.mm
+++ b/WebKit/mac/WebView/WebFrame.mm
@@ -1282,10 +1282,10 @@ static inline WebDataSource *dataSource(DocumentLoader* loader)
return toGlobalRef(coreFrame->script()->globalObject(coreWorld)->globalExec());
}
-- (void)setAllowScrollersToOverlapContent:(BOOL)flag
+- (void)setAllowsScrollersToOverlapContent:(BOOL)flag
{
ASSERT([[[self frameView] _scrollView] isKindOfClass:[WebDynamicScrollBarsView class]]);
- [(WebDynamicScrollBarsView *)[[self frameView] _scrollView] setAllowScrollersToOverlapContent:flag];
+ [(WebDynamicScrollBarsView *)[[self frameView] _scrollView] setAllowsScrollersToOverlapContent:flag];
}
- (void)setAlwaysHideHorizontalScroller:(BOOL)flag
diff --git a/WebKit/mac/WebView/WebFramePrivate.h b/WebKit/mac/WebView/WebFramePrivate.h
index b1dc9ec..7d7ae7a 100644
--- a/WebKit/mac/WebView/WebFramePrivate.h
+++ b/WebKit/mac/WebView/WebFramePrivate.h
@@ -124,7 +124,7 @@ typedef enum {
// Sets whether the scrollbars, if any, should be shown inside the document's border
// (thus overlapping some content) or outside the webView's border (default behavior).
// Changing this flag changes the size of the contentView and maintains the size of the frameView.
-- (void)setAllowScrollersToOverlapContent:(BOOL)flag;
+- (void)setAllowsScrollersToOverlapContent:(BOOL)flag;
// Sets if the scrollbar is always hidden, regardless of other scrollbar visibility settings.
// This does not affect the scrollability of the document.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list