Source/WebKit/chromium/src/WebScrollbarImpl.h - Issue 6392001: Merge 76455 - 2011-01-22 John Abd-El-Malek <jam@chromium.org>...

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: Source/WebKit/chromium/src/WebScrollbarImpl.h

Issue 6392001: Merge 76455 - 2011-01-22 John Abd-El-Malek <jam@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/

Patch Set: Created 9 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « Source/WebKit/chromium/ChangeLog ('k') | Source/WebKit/chromium/src/WebScrollbarImpl.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2010 Google Inc. All rights reserved.	2 * Copyright (C) 2010 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
58 virtual bool handleInputEvent(const WebInputEvent&);	58 virtual bool handleInputEvent(const WebInputEvent&);

59	59

60 // WebCore::ScrollableArea methods	60 // WebCore::ScrollableArea methods

61 virtual int scrollSize(WebCore::ScrollbarOrientation) const;	61 virtual int scrollSize(WebCore::ScrollbarOrientation) const;

62 virtual int scrollPosition(WebCore::Scrollbar*) const;	62 virtual int scrollPosition(WebCore::Scrollbar*) const;

63 virtual void setScrollOffset(const WebCore::IntPoint&);	63 virtual void setScrollOffset(const WebCore::IntPoint&);

64 virtual void invalidateScrollbarRect(WebCore::Scrollbar*, const WebCore::Int Rect&);	64 virtual void invalidateScrollbarRect(WebCore::Scrollbar*, const WebCore::Int Rect&);

65 virtual bool isActive() const;	65 virtual bool isActive() const;

66 virtual bool scrollbarCornerPresent() const;	66 virtual bool scrollbarCornerPresent() const;

67 virtual void getTickmarks(Vector<WebCore::IntRect>&) const;	67 virtual void getTickmarks(Vector<WebCore::IntRect>&) const;

	68 virtual WebCore::Scrollbar* horizontalScrollbar() const;

	69 virtual WebCore::Scrollbar* verticalScrollbar() const;

68	70

69 private:	71 private:

70 bool onMouseDown(const WebInputEvent& event);	72 bool onMouseDown(const WebInputEvent& event);

71 bool onMouseUp(const WebInputEvent& event);	73 bool onMouseUp(const WebInputEvent& event);

72 bool onMouseMove(const WebInputEvent& event);	74 bool onMouseMove(const WebInputEvent& event);

73 bool onMouseLeave(const WebInputEvent& event);	75 bool onMouseLeave(const WebInputEvent& event);

74 bool onMouseWheel(const WebInputEvent& event);	76 bool onMouseWheel(const WebInputEvent& event);

75 bool onKeyDown(const WebInputEvent& event);	77 bool onKeyDown(const WebInputEvent& event);

76	78

77 WebScrollbarClient* m_client;	79 WebScrollbarClient* m_client;

78	80

79 int m_scrollOffset;	81 int m_scrollOffset;

80 RefPtr<WebCore::Scrollbar> m_scrollbar;	82 RefPtr<WebCore::Scrollbar> m_scrollbar;

81 };	83 };

82	84

83 } // namespace WebKit	85 } // namespace WebKit

84	86

85 #endif	87 #endif

OLD	NEW