Revert bug fix because interactive_ui_tests are failing.

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

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

2 files changed, 3 insertions, 28 deletions

diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc
index d6da3c1..5bed201 100644
--- a/chrome/renderer/render_widget.cc
+++ b/chrome/renderer/render_widget.cc
@@ -605,21 +605,12 @@ void RenderWidget::Blur(WebWidget* webwidget) {
   Send(new ViewHostMsg_Blur(routing_id_));
 }
 
-void RenderWidget::DoDeferredClose() {
-  Send(new ViewHostMsg_Close(routing_id_));
-}
-
 void RenderWidget::CloseWidgetSoon(WebWidget* webwidget) {
   // If a page calls window.close() twice, we'll end up here twice, but that's
   // OK.  It is safe to send multiple Close messages.
 
-  // Ask the RenderWidgetHost to initiate close.  We could be called from deep
-  // in Javascript.  If we ask the RendwerWidgetHost to close now, the window
-  // could be closed before the JS finishes executing.  So instead, post a
-  // message back to the message loop, which won't run until the JS is
-  // complete, and then the Close message can be sent.
-  MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
-      this, &RenderWidget::DoDeferredClose));
+  // Ask the RenderWidgetHost to initiate close.
+  Send(new ViewHostMsg_Close(routing_id_));
 }
 
 void RenderWidget::GenerateFullRepaint() {
@@ -639,7 +630,7 @@ void RenderWidget::GetWindowRect(WebWidget* webwidget, WebRect* result) {
   *result = rect;
 }
 
-void RenderWidget::DoDeferredSetWindowRect(const WebRect& pos) {
+void RenderWidget::SetWindowRect(WebWidget* webwidget, const WebRect& pos) {
   if (did_show_) {
     Send(new ViewHostMsg_RequestMove(routing_id_, pos));
   } else {
@@ -647,16 +638,6 @@ void RenderWidget::DoDeferredSetWindowRect(const WebRect& pos) {
   }
 }
 
-void RenderWidget::SetWindowRect(WebWidget* webwidget, const WebRect& pos) {
-  // We could be called from deep in Javascript.  If we ask the
-  // RenderWidgetHost to resize now, the window could be resized while the
-  // JS is still running.  This causes a number of interesting side effects
-  // when manipulating window sizes from Javascript.  Avoid races by posting
-  // a message back to the MessageLoop to do it later.
-  MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
-      this, &RenderWidget::DoDeferredSetWindowRect, pos));
-}
-
 void RenderWidget::GetRootWindowRect(WebWidget* webwidget, WebRect* result) {
   gfx::Rect rect;
   Send(new ViewHostMsg_GetRootWindowRect(routing_id_, host_window_, &rect));
diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h
index eb3575a..62777e8 100644
--- a/chrome/renderer/render_widget.h
+++ b/chrome/renderer/render_widget.h
@@ -24,10 +24,6 @@
 class RenderThreadBase;
 struct WebPluginGeometry;
 
-namespace WebKit {
-struct WebRect;
-}
-
 // RenderWidget provides a communication bridge between a WebWidget and
 // a RenderWidgetHost, the latter of which lives in a different process.
 class RenderWidget : public IPC::Channel::Listener,
@@ -123,8 +119,6 @@ class RenderWidget : public IPC::Channel::Listener,
 
   void DoDeferredPaint();
   void DoDeferredScroll();
-  void DoDeferredClose();
-  void DoDeferredSetWindowRect(const WebKit::WebRect& pos);
 
   // This method is called immediately after PaintRect but before the
   // corresponding paint or scroll message is send to the widget host.