WebKit/chromium/src/WebScrollbarImpl.h - Issue 3364013: Merge 67001 - 2010-09-08 Peter Kasting <pkasting@google.com>...

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

Issue 3364013: Merge 67001 - 2010-09-08 Peter Kasting <pkasting@google.com>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/

Patch Set: Created 10 years, 3 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 | « WebKit/chromium/ChangeLog ('k') | 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 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
51 // WebKit::WebScrollbar methods	51 // WebKit::WebScrollbar methods

52 virtual void setLocation(const WebRect&);	52 virtual void setLocation(const WebRect&);

53 virtual int value() const;	53 virtual int value() const;

54 virtual void setValue(int position);	54 virtual void setValue(int position);

55 virtual void setDocumentSize(int size);	55 virtual void setDocumentSize(int size);

56 virtual void scroll(ScrollDirection, ScrollGranularity, float multiplier);	56 virtual void scroll(ScrollDirection, ScrollGranularity, float multiplier);

57 virtual void paint(WebCanvas*, const WebRect&);	57 virtual void paint(WebCanvas*, const WebRect&);

58 virtual bool handleInputEvent(const WebInputEvent&);	58 virtual bool handleInputEvent(const WebInputEvent&);

59	59

60 // WebCore::ScrollbarClient methods	60 // WebCore::ScrollbarClient methods

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

	62 virtual void setScrollOffsetFromAnimation(const WebCore::IntPoint&);

61 virtual void valueChanged(WebCore::Scrollbar*);	63 virtual void valueChanged(WebCore::Scrollbar*);

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

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

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

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

66	68

67 private:	69 private:

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

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

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

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

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

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

74	76

75 WebScrollbarClient* m_client;	77 WebScrollbarClient* m_client;

76	78

77 RefPtr<WebCore::Scrollbar> m_scrollbar;	79 RefPtr<WebCore::Scrollbar> m_scrollbar;

78 };	80 };

79	81

80 } // namespace WebKit	82 } // namespace WebKit

81	83

82 #endif	84 #endif

OLD	NEW