From d06194330da2bb8da887d2e1adeacb3a5c1504b2 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 5 Jan 2011 12:15:11 +0000 Subject: Merge WebKit at r72805: Initial merge by Git Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790 --- WebCore/page/mac/WebCoreFrameView.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'WebCore/page/mac') diff --git a/WebCore/page/mac/WebCoreFrameView.h b/WebCore/page/mac/WebCoreFrameView.h index b76350d..977b1a7 100644 --- a/WebCore/page/mac/WebCoreFrameView.h +++ b/WebCore/page/mac/WebCoreFrameView.h @@ -33,8 +33,6 @@ namespace WebCore { - (void)setScrollingModes:(WebCore::ScrollbarMode)hMode vertical:(WebCore::ScrollbarMode)vMode andLock:(BOOL)lock; - (void)scrollingModes:(WebCore::ScrollbarMode*)hMode vertical:(WebCore::ScrollbarMode*)vMode; - (void)setScrollBarsSuppressed:(BOOL)suppressed repaintOnUnsuppress:(BOOL)repaint; -- (void)setScrollOrigin:(NSPoint)origin updatePosition:(BOOL)updatePosition; -- (NSPoint)scrollOrigin; @end @protocol WebCoreFrameView -- cgit v1.1