src/webkit side of webkit merge 38729:38760

Review URL: http://codereview.chromium.org/13028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6183 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 21 insertions, 2 deletions

diff --git a/webkit/glue/editor_client_impl.cc b/webkit/glue/editor_client_impl.cc
index d6b2e2c..abf2ecf 100644
--- a/webkit/glue/editor_client_impl.cc
+++ b/webkit/glue/editor_client_impl.cc
@@ -104,6 +104,15 @@ bool EditorClientImpl::smartInsertDeleteEnabled() {
   return true;
 }
 
+bool EditorClientImpl::isSelectTrailingWhitespaceEnabled() {
+  if (use_editor_delegate_) {
+  WebViewDelegate* d = web_view_->delegate();
+  if (d)
+    return d->IsSelectTrailingWhitespaceEnabled();
+  }
+  return true;
+}
+
 bool EditorClientImpl::isContinuousSpellCheckingEnabled() {
   // Spell check everything if possible.
   // FIXME(brettw) This should be modified to do reasonable defaults depending
diff --git a/webkit/glue/editor_client_impl.h b/webkit/glue/editor_client_impl.h
index 4d0f057..52f725a 100644
--- a/webkit/glue/editor_client_impl.h
+++ b/webkit/glue/editor_client_impl.h
@@ -34,6 +34,7 @@ class EditorClientImpl : public WebCore::EditorClient {
 
   virtual bool shouldShowDeleteInterface(WebCore::HTMLElement*);
   virtual bool smartInsertDeleteEnabled();
+  virtual bool isSelectTrailingWhitespaceEnabled();
   virtual bool isContinuousSpellCheckingEnabled();
   virtual void toggleContinuousSpellChecking();
   virtual bool isGrammarCheckingEnabled();
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc
index 5983854..21b3938 100644
--- a/webkit/glue/webframeloaderclient_impl.cc
+++ b/webkit/glue/webframeloaderclient_impl.cc
@@ -1081,7 +1081,7 @@ void WebFrameLoaderClient::finishedLoading(DocumentLoader* dl) {
   }
 }
 
-void WebFrameLoaderClient::updateGlobalHistory(const KURL& kurl) {
+void WebFrameLoaderClient::updateGlobalHistory() {
 }
 
 bool WebFrameLoaderClient::shouldGoToHistoryItem(HistoryItem*) const {
diff --git a/webkit/glue/webframeloaderclient_impl.h b/webkit/glue/webframeloaderclient_impl.h
index 70c124b..ad41622 100644
--- a/webkit/glue/webframeloaderclient_impl.h
+++ b/webkit/glue/webframeloaderclient_impl.h
@@ -116,7 +116,7 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
   virtual void committedLoad(WebCore::DocumentLoader*, const char*, int);
   virtual void finishedLoading(WebCore::DocumentLoader*);
 
-  virtual void updateGlobalHistory(const WebCore::KURL&);
+  virtual void updateGlobalHistory();
   virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const;
 
   virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&);
diff --git a/webkit/glue/webview_delegate.h b/webkit/glue/webview_delegate.h
index 1987999..6ea074c 100644
--- a/webkit/glue/webview_delegate.h
+++ b/webkit/glue/webview_delegate.h
@@ -633,6 +633,15 @@ class WebViewDelegate : virtual public WebWidgetDelegate {
   virtual bool SmartInsertDeleteEnabled() {
     return false;
   }
+
+  virtual bool IsSelectTrailingWhitespaceEnabled() {
+#if defined(OS_WIN)
+    return true;
+#else
+    return false;
+#endif
+  }
+
   virtual void DidBeginEditing() { }
   virtual void DidChangeSelection(bool is_empty_selection) { }
   virtual void DidChangeContents() { }