Source/WebKit/chromium/src/WebViewImpl.h - Issue 9384018: Merge 106401 (part of http://crbug.com/111266) -

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

Issue 9384018: Merge 106401 (part of http://crbug.com/111266) - (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/

Patch Set: Created 8 years, 10 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/public/WebWidget.h ('k') | Source/WebKit/chromium/src/WebViewImpl.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 114 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
125 virtual bool confirmComposition(const WebString& text);	125 virtual bool confirmComposition(const WebString& text);

126 virtual bool compositionRange(size_t* location, size_t* length);	126 virtual bool compositionRange(size_t* location, size_t* length);

127 virtual WebTextInputType textInputType();	127 virtual WebTextInputType textInputType();

128 virtual bool selectionBounds(WebRect& start, WebRect& end) const;	128 virtual bool selectionBounds(WebRect& start, WebRect& end) const;

129 virtual bool caretOrSelectionRange(size_t* location, size_t* length);	129 virtual bool caretOrSelectionRange(size_t* location, size_t* length);

130 virtual void setTextDirection(WebTextDirection direction);	130 virtual void setTextDirection(WebTextDirection direction);

131 virtual bool isAcceleratedCompositingActive() const;	131 virtual bool isAcceleratedCompositingActive() const;

132 virtual void didAcquirePointerLock();	132 virtual void didAcquirePointerLock();

133 virtual void didNotAcquirePointerLock();	133 virtual void didNotAcquirePointerLock();

134 virtual void didLosePointerLock();	134 virtual void didLosePointerLock();

	135 virtual void didChangeWindowResizerRect();

135	136

136 // WebView methods:	137 // WebView methods:

137 virtual void initializeMainFrame(WebFrameClient*);	138 virtual void initializeMainFrame(WebFrameClient*);

138 virtual void setAutofillClient(WebAutofillClient*);	139 virtual void setAutofillClient(WebAutofillClient*);

139 virtual void setDevToolsAgentClient(WebDevToolsAgentClient*);	140 virtual void setDevToolsAgentClient(WebDevToolsAgentClient*);

140 virtual void setPermissionClient(WebPermissionClient*);	141 virtual void setPermissionClient(WebPermissionClient*);

141 virtual void setSpellCheckClient(WebSpellCheckClient*);	142 virtual void setSpellCheckClient(WebSpellCheckClient*);

142 virtual WebSettings* settings();	143 virtual WebSettings* settings();

143 virtual WebString pageEncoding() const;	144 virtual WebString pageEncoding() const;

144 virtual void setPageEncoding(const WebString& encoding);	145 virtual void setPageEncoding(const WebString& encoding);

(...skipping 549 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
694 #endif	695 #endif

695	696

696 #if ENABLE(MEDIA_STREAM)	697 #if ENABLE(MEDIA_STREAM)

697 UserMediaClientImpl m_userMediaClientImpl;	698 UserMediaClientImpl m_userMediaClientImpl;

698 #endif	699 #endif

699 };	700 };

700	701

701 } // namespace WebKit	702 } // namespace WebKit

702	703

703 #endif	704 #endif

OLD	NEW