Source/WebKit/chromium/src/WebFrameImpl.h - Issue 11931008: Merge 138893

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

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

Patch Set: Created 7 years, 11 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 172 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
183 virtual bool isContinuousSpellCheckingEnabled() const;	183 virtual bool isContinuousSpellCheckingEnabled() const;

184 virtual void requestTextChecking(const WebElement&);	184 virtual void requestTextChecking(const WebElement&);

185 virtual void replaceMisspelledRange(const WebString&);	185 virtual void replaceMisspelledRange(const WebString&);

186 virtual bool hasSelection() const;	186 virtual bool hasSelection() const;

187 virtual WebRange selectionRange() const;	187 virtual WebRange selectionRange() const;

188 virtual WebString selectionAsText() const;	188 virtual WebString selectionAsText() const;

189 virtual WebString selectionAsMarkup() const;	189 virtual WebString selectionAsMarkup() const;

190 virtual bool selectWordAroundCaret();	190 virtual bool selectWordAroundCaret();

191 virtual void selectRange(const WebPoint& base, const WebPoint& extent);	191 virtual void selectRange(const WebPoint& base, const WebPoint& extent);

192 virtual void selectRange(const WebRange&);	192 virtual void selectRange(const WebRange&);

	193 virtual void moveCaretSelectionTowardsWindowPoint(const WebPoint&);

193 virtual int printBegin(const WebPrintParams&,	194 virtual int printBegin(const WebPrintParams&,

194 const WebNode& constrainToNode,	195 const WebNode& constrainToNode,

195 bool* useBrowserOverlays);	196 bool* useBrowserOverlays);

196 virtual float printPage(int pageToPrint, WebCanvas*);	197 virtual float printPage(int pageToPrint, WebCanvas*);

197 virtual float getPrintPageShrink(int page);	198 virtual float getPrintPageShrink(int page);

198 virtual void printEnd();	199 virtual void printEnd();

199 virtual bool isPrintScalingDisabledForPlugin(const WebNode&);	200 virtual bool isPrintScalingDisabledForPlugin(const WebNode&);

200 virtual bool hasCustomPageSizeStyle(int pageIndex);	201 virtual bool hasCustomPageSizeStyle(int pageIndex);

201 virtual bool isPageBoxVisible(int pageIndex);	202 virtual bool isPageBoxVisible(int pageIndex);

202 virtual void pageSizeAndMarginsInPixels(int pageIndex,	203 virtual void pageSizeAndMarginsInPixels(int pageIndex,

(...skipping 298 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
501 long long m_identifier;	502 long long m_identifier;

502	503

503 // Ensure we don't overwrite valid history data during same document loads	504 // Ensure we don't overwrite valid history data during same document loads

504 // from HistoryItems	505 // from HistoryItems

505 bool m_inSameDocumentHistoryLoad;	506 bool m_inSameDocumentHistoryLoad;

506 };	507 };

507	508

508 } // namespace WebKit	509 } // namespace WebKit

509	510

510 #endif	511 #endif

OLD	NEW