Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(825)

Side by Side Diff: Source/web/WebFrameImpl.h

Issue 201773005: Copy a few selection related methods to WebFrame from WebView. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: update test Created 6 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
« no previous file with comments | « no previous file | Source/web/WebFrameImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 struct WindowFeatures; 56 struct WindowFeatures;
57 } 57 }
58 58
59 namespace blink { 59 namespace blink {
60 class ChromePrintContext; 60 class ChromePrintContext;
61 class SharedWorkerRepositoryClientImpl; 61 class SharedWorkerRepositoryClientImpl;
62 class WebDataSourceImpl; 62 class WebDataSourceImpl;
63 class WebInputElement; 63 class WebInputElement;
64 class WebFrameClient; 64 class WebFrameClient;
65 class WebPerformance; 65 class WebPerformance;
66 class WebPlugin;
66 class WebPluginContainerImpl; 67 class WebPluginContainerImpl;
67 class WebView; 68 class WebView;
68 class WebViewImpl; 69 class WebViewImpl;
69 struct WebPrintParams; 70 struct WebPrintParams;
70 71
71 template <typename T> class WebVector; 72 template <typename T> class WebVector;
72 73
73 // Implementation of WebFrame, note that this is a reference counted object. 74 // Implementation of WebFrame, note that this is a reference counted object.
74 class WebFrameImpl FINAL 75 class WebFrameImpl FINAL
75 : public WebLocalFrame 76 : public WebLocalFrame
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 virtual void removeSpellingMarkers() OVERRIDE; 176 virtual void removeSpellingMarkers() OVERRIDE;
176 virtual bool hasSelection() const OVERRIDE; 177 virtual bool hasSelection() const OVERRIDE;
177 virtual WebRange selectionRange() const OVERRIDE; 178 virtual WebRange selectionRange() const OVERRIDE;
178 virtual WebString selectionAsText() const OVERRIDE; 179 virtual WebString selectionAsText() const OVERRIDE;
179 virtual WebString selectionAsMarkup() const OVERRIDE; 180 virtual WebString selectionAsMarkup() const OVERRIDE;
180 virtual bool selectWordAroundCaret() OVERRIDE; 181 virtual bool selectWordAroundCaret() OVERRIDE;
181 virtual void selectRange(const WebPoint& base, const WebPoint& extent) OVERR IDE; 182 virtual void selectRange(const WebPoint& base, const WebPoint& extent) OVERR IDE;
182 virtual void selectRange(const WebRange&) OVERRIDE; 183 virtual void selectRange(const WebRange&) OVERRIDE;
183 virtual void moveRangeSelection(const WebPoint& base, const WebPoint& extent ) OVERRIDE; 184 virtual void moveRangeSelection(const WebPoint& base, const WebPoint& extent ) OVERRIDE;
184 virtual void moveCaretSelection(const WebPoint&) OVERRIDE; 185 virtual void moveCaretSelection(const WebPoint&) OVERRIDE;
186 virtual bool setEditableSelectionOffsets(int start, int end) OVERRIDE;
187 virtual bool setCompositionFromExistingText(int compositionStart, int compos itionEnd, const WebVector<WebCompositionUnderline>& underlines) OVERRIDE;
188 virtual void extendSelectionAndDelete(int before, int after) OVERRIDE;
185 virtual void setCaretVisible(bool) OVERRIDE; 189 virtual void setCaretVisible(bool) OVERRIDE;
186 virtual int printBegin(const WebPrintParams&, const WebNode& constrainToNode ) OVERRIDE; 190 virtual int printBegin(const WebPrintParams&, const WebNode& constrainToNode ) OVERRIDE;
187 virtual float printPage(int pageToPrint, WebCanvas*) OVERRIDE; 191 virtual float printPage(int pageToPrint, WebCanvas*) OVERRIDE;
188 virtual float getPrintPageShrink(int page) OVERRIDE; 192 virtual float getPrintPageShrink(int page) OVERRIDE;
189 virtual void printEnd() OVERRIDE; 193 virtual void printEnd() OVERRIDE;
190 virtual bool isPrintScalingDisabledForPlugin(const WebNode&) OVERRIDE; 194 virtual bool isPrintScalingDisabledForPlugin(const WebNode&) OVERRIDE;
191 virtual bool hasCustomPageSizeStyle(int pageIndex) OVERRIDE; 195 virtual bool hasCustomPageSizeStyle(int pageIndex) OVERRIDE;
192 virtual bool isPageBoxVisible(int pageIndex) OVERRIDE; 196 virtual bool isPageBoxVisible(int pageIndex) OVERRIDE;
193 virtual void pageSizeAndMarginsInPixels(int pageIndex, 197 virtual void pageSizeAndMarginsInPixels(int pageIndex,
194 WebSize& pageSize, 198 WebSize& pageSize,
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 const WebFindOptions&, bool reset); 405 const WebFindOptions&, bool reset);
402 406
403 // Determines whether to invalidate the content area and scrollbar. 407 // Determines whether to invalidate the content area and scrollbar.
404 void invalidateIfNecessary(); 408 void invalidateIfNecessary();
405 409
406 void loadJavaScriptURL(const WebCore::KURL&); 410 void loadJavaScriptURL(const WebCore::KURL&);
407 411
408 // Returns a hit-tested VisiblePosition for the given point 412 // Returns a hit-tested VisiblePosition for the given point
409 WebCore::VisiblePosition visiblePositionForWindowPoint(const WebPoint&); 413 WebCore::VisiblePosition visiblePositionForWindowPoint(const WebPoint&);
410 414
415 WebPlugin* focusedPluginIfInputMethodSupported();
416
411 FrameLoaderClientImpl m_frameLoaderClientImpl; 417 FrameLoaderClientImpl m_frameLoaderClientImpl;
412 418
413 // The embedder retains a reference to the WebCore LocalFrame while it is ac tive in the DOM. This 419 // The embedder retains a reference to the WebCore LocalFrame while it is ac tive in the DOM. This
414 // reference is released when the frame is removed from the DOM or the entir e page is closed. 420 // reference is released when the frame is removed from the DOM or the entir e page is closed.
415 // FIXME: These will need to change to WebFrame when we introduce WebFramePr oxy. 421 // FIXME: These will need to change to WebFrame when we introduce WebFramePr oxy.
416 RefPtr<WebCore::LocalFrame> m_frame; 422 RefPtr<WebCore::LocalFrame> m_frame;
417 WebFrameImpl* m_parent; 423 WebFrameImpl* m_parent;
418 WebFrameImpl* m_previousSibling; 424 WebFrameImpl* m_previousSibling;
419 WebFrameImpl* m_nextSibling; 425 WebFrameImpl* m_nextSibling;
420 WebFrameImpl* m_firstChild; 426 WebFrameImpl* m_firstChild;
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 // Stores the additional input events offset and scale when device metrics e mulation is enabled. 517 // Stores the additional input events offset and scale when device metrics e mulation is enabled.
512 WebCore::IntSize m_inputEventsOffsetForEmulation; 518 WebCore::IntSize m_inputEventsOffsetForEmulation;
513 float m_inputEventsScaleFactorForEmulation; 519 float m_inputEventsScaleFactorForEmulation;
514 }; 520 };
515 521
516 DEFINE_TYPE_CASTS(WebFrameImpl, WebFrame, frame, true, true); 522 DEFINE_TYPE_CASTS(WebFrameImpl, WebFrame, frame, true, true);
517 523
518 } // namespace blink 524 } // namespace blink
519 525
520 #endif 526 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/web/WebFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698