Source/WebKit/chromium/src/WebPluginContainerImpl.h - Issue 12475008: Merge 144236

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/WebPluginContainerImpl.h

Issue 12475008: Merge 144236 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/

Patch Set: Created 7 years, 9 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

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2009 Google Inc. All rights reserved.	2 * Copyright (C) 2009 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 75 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
86 virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect&);	86 virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect&);

87 virtual void invalidateRect(const WebCore::IntRect&);	87 virtual void invalidateRect(const WebCore::IntRect&);

88 virtual void setFocus(bool);	88 virtual void setFocus(bool);

89 virtual void show();	89 virtual void show();

90 virtual void hide();	90 virtual void hide();

91 virtual void handleEvent(WebCore::Event*);	91 virtual void handleEvent(WebCore::Event*);

92 virtual void frameRectsChanged();	92 virtual void frameRectsChanged();

93 virtual void setParentVisible(bool);	93 virtual void setParentVisible(bool);

94 virtual void setParent(WebCore::ScrollView*);	94 virtual void setParent(WebCore::ScrollView*);

95 virtual void widgetPositionsUpdated();	95 virtual void widgetPositionsUpdated();

	96 virtual void clipRectChanged() OVERRIDE;

96 virtual bool isPluginContainer() const { return true; }	97 virtual bool isPluginContainer() const { return true; }

97	98

98 // WebPluginContainer methods	99 // WebPluginContainer methods

99 virtual WebElement element();	100 virtual WebElement element();

100 virtual void invalidate();	101 virtual void invalidate();

101 virtual void invalidateRect(const WebRect&);	102 virtual void invalidateRect(const WebRect&);

102 virtual void scrollRect(int dx, int dy, const WebRect&);	103 virtual void scrollRect(int dx, int dy, const WebRect&);

103 virtual void reportGeometry();	104 virtual void reportGeometry();

104 virtual void setBackingTextureId(unsigned);	105 virtual void setBackingTextureId(unsigned);

105 virtual void setBackingIOSurfaceId(int width,	106 virtual void setBackingIOSurfaceId(int width,

(...skipping 101 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
207 // scrollbars.	208 // scrollbars.

208 OwnPtr<ScrollbarGroup> m_scrollbarGroup;	209 OwnPtr<ScrollbarGroup> m_scrollbarGroup;

209	210

210 TouchEventRequestType m_touchEventRequestType;	211 TouchEventRequestType m_touchEventRequestType;

211 bool m_wantsWheelEvents;	212 bool m_wantsWheelEvents;

212 };	213 };

213	214

214 } // namespace WebKit	215 } // namespace WebKit

215	216

216 #endif	217 #endif

OLD	NEW

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