summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-04 05:23:46 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-04 05:23:46 +0000
commit867056cc13fad6ec04efb849b366b60477cef978 (patch)
tree1f28f5506758160a347877bde95df1a71dabc4ee /chrome/renderer
parenta3406979cd56b42ec58244e6382ca77c2c93205d (diff)
downloadchromium_src-867056cc13fad6ec04efb849b366b60477cef978.zip
chromium_src-867056cc13fad6ec04efb849b366b60477cef978.tar.gz
chromium_src-867056cc13fad6ec04efb849b366b60477cef978.tar.bz2
Add default implementations for WebViewClient and WebWidgetClient
methods. Once these interfaces live upstream, we'll want to allow the addition of new methods w/o requiring the consumer (chrome) to implement the new methods. That'll make webkit merging easier, and it'll also make it possible to use a newer webkit with an older chrome. Obviously, this only works if the methods are not crucial to webkit working properly, but that is generally the case for *Client methods. R=dglazkov BUG=none TEST=none Review URL: http://codereview.chromium.org/346042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30943 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/print_web_view_helper.cc24
-rw-r--r--chrome/renderer/print_web_view_helper.h114
-rw-r--r--chrome/renderer/render_view.cc38
-rw-r--r--chrome/renderer/render_view.h18
4 files changed, 1 insertions, 193 deletions
diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc
index 804de0f..fe49462 100644
--- a/chrome/renderer/print_web_view_helper.cc
+++ b/chrome/renderer/print_web_view_helper.cc
@@ -164,27 +164,3 @@ void PrintWebViewHelper::didStopLoading() {
DCHECK(print_pages_params_.get() != NULL);
PrintPages(*print_pages_params_.get(), print_web_view_->mainFrame());
}
-
-WebString PrintWebViewHelper::autoCorrectWord(const WebString& word) {
- return word;
-}
-
-WebRect PrintWebViewHelper::windowRect() {
- NOTREACHED();
- return WebRect();
-}
-
-WebRect PrintWebViewHelper::windowResizerRect() {
- NOTREACHED();
- return WebRect();
-}
-
-WebRect PrintWebViewHelper::rootWindowRect() {
- NOTREACHED();
- return WebRect();
-}
-
-WebScreenInfo PrintWebViewHelper::screenInfo() {
- NOTREACHED();
- return WebScreenInfo();
-}
diff --git a/chrome/renderer/print_web_view_helper.h b/chrome/renderer/print_web_view_helper.h
index c0b3d17..eb3ffaf 100644
--- a/chrome/renderer/print_web_view_helper.h
+++ b/chrome/renderer/print_web_view_helper.h
@@ -114,120 +114,8 @@ class PrintWebViewHelper : public WebKit::WebViewClient {
int32 routing_id();
- // WebKit::WebViewClient
- virtual WebKit::WebView* createView(WebKit::WebFrame* creator) { return NULL; }
- virtual WebKit::WebWidget* createPopupMenu(bool activatable) { return NULL; }
- virtual WebKit::WebWidget* createPopupMenu(
- const WebKit::WebPopupMenuInfo& info) { return NULL; }
- virtual void didAddMessageToConsole(
- const WebKit::WebConsoleMessage& message,
- const WebKit::WebString& source_name, unsigned source_line) {}
- virtual void printPage(WebKit::WebFrame* frame) {}
- virtual WebKit::WebNotificationPresenter* notificationPresenter() {
- return NULL;
- }
- virtual void didStartLoading() {}
+ // WebKit::WebViewClient override:
virtual void didStopLoading();
- virtual bool shouldBeginEditing(const WebKit::WebRange& range) {
- return false;
- }
- virtual bool shouldEndEditing(const WebKit::WebRange& range) {
- return false;
- }
- virtual bool shouldInsertNode(
- const WebKit::WebNode& node, const WebKit::WebRange& range,
- WebKit::WebEditingAction action) { return false; }
- virtual bool shouldInsertText(
- const WebKit::WebString& text, const WebKit::WebRange& range,
- WebKit::WebEditingAction action) { return false; }
- virtual bool shouldChangeSelectedRange(
- const WebKit::WebRange& from, const WebKit::WebRange& to,
- WebKit::WebTextAffinity affinity, bool still_selecting) { return false; }
- virtual bool shouldDeleteRange(const WebKit::WebRange& range) {
- return false;
- }
- virtual bool shouldApplyStyle(
- const WebKit::WebString& style, const WebKit::WebRange& range) {
- return false;
- }
- virtual bool isSmartInsertDeleteEnabled() { return false; }
- virtual bool isSelectTrailingWhitespaceEnabled() { return false; }
- virtual void setInputMethodEnabled(bool enabled) {}
- virtual void didBeginEditing() {}
- virtual void didChangeSelection(bool is_selection_empty) {}
- virtual void didChangeContents() {}
- virtual void didExecuteCommand(const WebKit::WebString& command_name) {}
- virtual void didEndEditing() {}
- virtual bool handleCurrentKeyboardEvent() { return false; }
- virtual void spellCheck(
- const WebKit::WebString& text, int& offset, int& length) {}
- virtual WebKit::WebString autoCorrectWord(
- const WebKit::WebString& misspelled_word);
- virtual void showSpellingUI(bool show) {}
- virtual bool isShowingSpellingUI() { return false; }
- virtual void updateSpellingUIWithMisspelledWord(
- const WebKit::WebString& word) {}
- virtual bool runFileChooser(
- bool multi_select, const WebKit::WebString& title,
- const WebKit::WebString& initial_value,
- WebKit::WebFileChooserCompletion* chooser_completion) {
- return false;
- }
- virtual void runModalAlertDialog(
- WebKit::WebFrame* frame, const WebKit::WebString& message) {}
- virtual bool runModalConfirmDialog(
- WebKit::WebFrame* frame, const WebKit::WebString& message) {
- return false;
- }
- virtual bool runModalPromptDialog(
- WebKit::WebFrame* frame, const WebKit::WebString& message,
- const WebKit::WebString& default_value,
- WebKit::WebString* actual_value) { return false; }
- virtual bool runModalBeforeUnloadDialog(
- WebKit::WebFrame* frame, const WebKit::WebString& message) {
- return true;
- }
- virtual void showContextMenu(
- WebKit::WebFrame* frame, const WebKit::WebContextMenuData& data) {}
- virtual void setStatusText(const WebKit::WebString& text) {}
- virtual void setMouseOverURL(const WebKit::WebURL& url) {}
- virtual void setKeyboardFocusURL(const WebKit::WebURL& url) {}
- virtual void setToolTipText(
- const WebKit::WebString& text, WebKit::WebTextDirection hint) {}
- virtual void startDragging(
- const WebKit::WebPoint& from, const WebKit::WebDragData& data,
- WebKit::WebDragOperationsMask mask) {}
- virtual bool acceptsLoadDrops() { return false; }
- virtual void focusNext() {}
- virtual void focusPrevious() {}
- virtual void navigateBackForwardSoon(int offset) {}
- virtual int historyBackListCount() { return 0; }
- virtual int historyForwardListCount() { return 0; }
- virtual void didAddHistoryItem() {}
- virtual void focusAccessibilityObject(
- const WebKit::WebAccessibilityObject& object) {}
- virtual void didUpdateInspectorSettings() {}
- virtual void queryAutofillSuggestions(
- const WebKit::WebNode& node, const WebKit::WebString& name,
- const WebKit::WebString& value) {}
- virtual void removeAutofillSuggestions(
- const WebKit::WebString& name, const WebKit::WebString& value) {}
-
- // WebKit::WebWidgetClient
- virtual void didInvalidateRect(const WebKit::WebRect&) {}
- virtual void didScrollRect(
- int dx, int dy, const WebKit::WebRect& clipRect) {}
- virtual void didFocus() {}
- virtual void didBlur() {}
- virtual void didChangeCursor(const WebKit::WebCursorInfo&) {}
- virtual void closeWidgetSoon() {}
- virtual void show(WebKit::WebNavigationPolicy) {}
- virtual void runModal() {}
- virtual WebKit::WebRect windowRect();
- virtual void setWindowRect(const WebKit::WebRect&) {}
- virtual WebKit::WebRect windowResizerRect();
- virtual WebKit::WebRect rootWindowRect();
- virtual WebKit::WebScreenInfo screenInfo();
private:
RenderView* render_view_;
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 271a48b..9740d6b 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -1407,44 +1407,6 @@ void RenderView::didStopLoading() {
kDelayForCaptureMs);
}
-bool RenderView::shouldBeginEditing(const WebRange& range) {
- return true;
-}
-
-bool RenderView::shouldEndEditing(const WebRange& range) {
- return true;
-}
-
-bool RenderView::shouldInsertNode(const WebNode& node, const WebRange& range,
- WebEditingAction action) {
- return true;
-}
-
-bool RenderView::shouldInsertText(const WebString& text, const WebRange& range,
- WebEditingAction action) {
- return true;
-}
-
-bool RenderView::shouldChangeSelectedRange(const WebRange& from_range,
- const WebRange& to_range,
- WebTextAffinity affinity,
- bool still_selecting) {
- return true;
-}
-
-bool RenderView::shouldDeleteRange(const WebRange& range) {
- return true;
-}
-
-bool RenderView::shouldApplyStyle(const WebString& style,
- const WebRange& range) {
- return true;
-}
-
-bool RenderView::isSmartInsertDeleteEnabled() {
- return true;
-}
-
bool RenderView::isSelectTrailingWhitespaceEnabled() {
#if defined(OS_WIN)
return true;
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index f2324a1..9907aea 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -192,28 +192,10 @@ class RenderView : public RenderWidget,
}
virtual void didStartLoading();
virtual void didStopLoading();
- virtual bool shouldBeginEditing(const WebKit::WebRange& range);
- virtual bool shouldEndEditing(const WebKit::WebRange& range);
- virtual bool shouldInsertNode(
- const WebKit::WebNode& node, const WebKit::WebRange& range,
- WebKit::WebEditingAction action);
- virtual bool shouldInsertText(
- const WebKit::WebString& text, const WebKit::WebRange& range,
- WebKit::WebEditingAction action);
- virtual bool shouldChangeSelectedRange(
- const WebKit::WebRange& from, const WebKit::WebRange& to,
- WebKit::WebTextAffinity affinity, bool still_selecting);
- virtual bool shouldDeleteRange(const WebKit::WebRange& range);
- virtual bool shouldApplyStyle(
- const WebKit::WebString& style, const WebKit::WebRange& range);
- virtual bool isSmartInsertDeleteEnabled();
virtual bool isSelectTrailingWhitespaceEnabled();
virtual void setInputMethodEnabled(bool enabled);
- virtual void didBeginEditing() {}
virtual void didChangeSelection(bool is_selection_empty);
- virtual void didChangeContents() {}
virtual void didExecuteCommand(const WebKit::WebString& command_name);
- virtual void didEndEditing() {}
virtual bool handleCurrentKeyboardEvent();
virtual void spellCheck(
const WebKit::WebString& text, int& offset, int& length);