Source/WebKit/chromium/src/WebPluginContainerImpl.h - Issue 12408009: 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 12408009: Merge 144236 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/

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 74 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
85 virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect&);	85 virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect&);

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

87 virtual void setFocus(bool);	87 virtual void setFocus(bool);

88 virtual void show();	88 virtual void show();

89 virtual void hide();	89 virtual void hide();

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

91 virtual void frameRectsChanged();	91 virtual void frameRectsChanged();

92 virtual void setParentVisible(bool);	92 virtual void setParentVisible(bool);

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

94 virtual void widgetPositionsUpdated();	94 virtual void widgetPositionsUpdated();

	95 virtual void clipRectChanged() OVERRIDE;

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

96	97

97 // WebPluginContainer methods	98 // WebPluginContainer methods

98 virtual WebElement element();	99 virtual WebElement element();

99 virtual void invalidate();	100 virtual void invalidate();

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

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

102 virtual void reportGeometry();	103 virtual void reportGeometry();

103 virtual void clearScriptObjects();	104 virtual void clearScriptObjects();

104 virtual NPObject* scriptableObjectForElement();	105 virtual NPObject* scriptableObjectForElement();

(...skipping 85 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
190 // scrollbars.	191 // scrollbars.

191 OwnPtr<ScrollbarGroup> m_scrollbarGroup;	192 OwnPtr<ScrollbarGroup> m_scrollbarGroup;

192	193

193 TouchEventRequestType m_touchEventRequestType;	194 TouchEventRequestType m_touchEventRequestType;

194 bool m_wantsWheelEvents;	195 bool m_wantsWheelEvents;

195 };	196 };

196	197

197 } // namespace WebKit	198 } // namespace WebKit

198	199

199 #endif	200 #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 »