diff options
| author | Steve Block <steveblock@google.com> | 2011-01-05 12:15:11 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-01-06 14:14:00 +0000 |
| commit | d06194330da2bb8da887d2e1adeacb3a5c1504b2 (patch) | |
| tree | e0af8413af65a8e30630563441af7bdb8478e513 /WebCore/page/mac | |
| parent | 419a5cf2f8db6ca014df624865197ffb82caad37 (diff) | |
| download | external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.zip external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.gz external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.bz2 | |
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
Diffstat (limited to 'WebCore/page/mac')
| -rw-r--r-- | WebCore/page/mac/WebCoreFrameView.h | 2 |
1 files changed, 0 insertions, 2 deletions
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 |