Fix sudden termination after the latest WebKit merge.

BUG=10927

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

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

6 files changed, 14 insertions, 30 deletions

diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 23e966a..3f55e32 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -133,27 +133,27 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorDatabaseResource.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorController.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorDatabaseResource.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorController.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorDOMStorageResource.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorDatabaseResource.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorDOMStorageResource.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorDatabaseResource.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorController.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorDOMStorageResource.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorController.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorDOMStorageResource.h"
 				>
 			</File>
 			<File
@@ -2172,11 +2172,11 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\text\TextEncodingDetectorICU.cpp"
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\text\TextEncodingDetector.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\text\TextEncodingDetector.h"
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\text\TextEncodingDetectorICU.cpp"
 					>
 				</File>
 				<File
@@ -2460,6 +2460,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\SuddenTerminationChromium.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\SystemTimeChromium.cpp"
 					>
 				</File>
@@ -4384,7 +4388,6 @@
 				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\CheckedRadioButtons.h"
 				>
 			</File>
-
 			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\ChildNodeList.cpp"
 				>
diff --git a/webkit/glue/chrome_client_impl.cc b/webkit/glue/chrome_client_impl.cc
index 4fc2790..40acbcc 100644
--- a/webkit/glue/chrome_client_impl.cc
+++ b/webkit/glue/chrome_client_impl.cc
@@ -587,18 +587,6 @@ void ChromeClientImpl::SetCursorForPlugin(const WebCursor& cursor) {
   ignore_next_set_cursor_ = true;
 }
 
-void ChromeClientImpl::enableSuddenTermination() {
-  WebViewDelegate* delegate = webview_->delegate();
-  if (delegate)
-    delegate->EnableSuddenTermination();
-}
-
-void ChromeClientImpl::disableSuddenTermination() {
-  WebViewDelegate* delegate = webview_->delegate();
-  if (delegate)
-    delegate->DisableSuddenTermination();
-}
-
 void ChromeClientImpl::formStateDidChange(const WebCore::Node*) {
   WebViewDelegate* delegate = webview_->delegate();
   if (delegate)
diff --git a/webkit/glue/chrome_client_impl.h b/webkit/glue/chrome_client_impl.h
index a29a2da..1c69413 100644
--- a/webkit/glue/chrome_client_impl.h
+++ b/webkit/glue/chrome_client_impl.h
@@ -128,9 +128,6 @@ class ChromeClientImpl : public WebCore::ChromeClientChromium {
   void SetCursor(const WebCursor& cursor);
   void SetCursorForPlugin(const WebCursor& cursor);
 
-  virtual void enableSuddenTermination();
-  virtual void disableSuddenTermination();
-
   virtual void formStateDidChange(const WebCore::Node*);
 
  private:
diff --git a/webkit/glue/webkitclient_impl.h b/webkit/glue/webkitclient_impl.h
index 6604021..5b9882c 100644
--- a/webkit/glue/webkitclient_impl.h
+++ b/webkit/glue/webkitclient_impl.h
@@ -32,6 +32,7 @@ class WebKitClientImpl : public WebKit::WebKitClient {
   virtual void setSharedTimerFireTime(double fireTime);
   virtual void stopSharedTimer();
   virtual void callOnMainThread(void (*func)());
+  virtual void suddenTerminationChanged(bool enabled) { }
 
  private:
   void DoTimeout() {
diff --git a/webkit/glue/webview_delegate.h b/webkit/glue/webview_delegate.h
index d2065c5..02a8a0c 100644
--- a/webkit/glue/webview_delegate.h
+++ b/webkit/glue/webview_delegate.h
@@ -455,12 +455,6 @@ class WebViewDelegate : virtual public WebWidgetDelegate {
                                        const AutofillForm& form) {
   }
 
-  virtual void EnableSuddenTermination() {
-  }
-
-  virtual void DisableSuddenTermination() {
-  }
-
   // Queries the browser for suggestions to be shown for the form text field
   // named |field_name|.  |text| is the text entered by the user so far and
   // |node_id| is the id of the node of the input field.
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 90660f0..7a8fb4f 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -2102,6 +2102,7 @@
         '../third_party/WebKit/WebCore/platform/chromium/SharedTimerChromium.cpp',
         '../third_party/WebKit/WebCore/platform/chromium/SoundChromiumPosix.cpp',
         '../third_party/WebKit/WebCore/platform/chromium/SoundChromiumWin.cpp',
+        '../third_party/WebKit/WebCore/platform/chromium/SuddenTerminationChromium.cpp',
         '../third_party/WebKit/WebCore/platform/chromium/SystemTimeChromium.cpp',
         '../third_party/WebKit/WebCore/platform/chromium/TemporaryLinkStubs.cpp',
         '../third_party/WebKit/WebCore/platform/chromium/WidgetChromium.cpp',