Source/WebKit/chromium/src/WebFrameImpl.h - Issue 10907083: Merge 126609

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

Issue 10907083: Merge 126609 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/

Patch Set: Created 8 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:

« no previous file with comments | « Source/WebKit/chromium/public/WebFrame.h ('k') | Source/WebKit/chromium/src/WebFrameImpl.cpp » ('j') | no next file with comments »

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 143 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
154 virtual WebHistoryItem previousHistoryItem() const;	154 virtual WebHistoryItem previousHistoryItem() const;

155 virtual WebHistoryItem currentHistoryItem() const;	155 virtual WebHistoryItem currentHistoryItem() const;

156 virtual void enableViewSourceMode(bool enable);	156 virtual void enableViewSourceMode(bool enable);

157 virtual bool isViewSourceModeEnabled() const;	157 virtual bool isViewSourceModeEnabled() const;

158 virtual void setReferrerForRequest(WebURLRequest&, const WebURL& referrer);	158 virtual void setReferrerForRequest(WebURLRequest&, const WebURL& referrer);

159 virtual void dispatchWillSendRequest(WebURLRequest&);	159 virtual void dispatchWillSendRequest(WebURLRequest&);

160 virtual WebURLLoader* createAssociatedURLLoader(const WebURLLoaderOptions&);	160 virtual WebURLLoader* createAssociatedURLLoader(const WebURLLoaderOptions&);

161 virtual void commitDocumentData(const char* data, size_t length);	161 virtual void commitDocumentData(const char* data, size_t length);

162 virtual unsigned unloadListenerCount() const;	162 virtual unsigned unloadListenerCount() const;

163 virtual bool isProcessingUserGesture() const;	163 virtual bool isProcessingUserGesture() const;

	164 virtual bool consumeUserGesture() const;

164 virtual bool willSuppressOpenerInNewFrame() const;	165 virtual bool willSuppressOpenerInNewFrame() const;

165 virtual void replaceSelection(const WebString&);	166 virtual void replaceSelection(const WebString&);

166 virtual void insertText(const WebString&);	167 virtual void insertText(const WebString&);

167 virtual void setMarkedText(const WebString&, unsigned location, unsigned len gth);	168 virtual void setMarkedText(const WebString&, unsigned location, unsigned len gth);

168 virtual void unmarkText();	169 virtual void unmarkText();

169 virtual bool hasMarkedText() const;	170 virtual bool hasMarkedText() const;

170 virtual WebRange markedRange() const;	171 virtual WebRange markedRange() const;

171 virtual void setSelectionToRange(const WebRange&) OVERRIDE;	172 virtual void setSelectionToRange(const WebRange&) OVERRIDE;

172 virtual bool firstRectForCharacterRange(unsigned location, unsigned length, WebRect&) const;	173 virtual bool firstRectForCharacterRange(unsigned location, unsigned length, WebRect&) const;

173 virtual size_t characterIndexForPoint(const WebPoint&) const;	174 virtual size_t characterIndexForPoint(const WebPoint&) const;

(...skipping 251 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
425 long long m_identifier;	426 long long m_identifier;

426	427

427 // Ensure we don't overwrite valid history data during same document loads	428 // Ensure we don't overwrite valid history data during same document loads

428 // from HistoryItems	429 // from HistoryItems

429 bool m_inSameDocumentHistoryLoad;	430 bool m_inSameDocumentHistoryLoad;

430 };	431 };

431	432

432 } // namespace WebKit	433 } // namespace WebKit

433	434

434 #endif	435 #endif

OLD	NEW