From 3d988d5dca3a77097a7176d7e753e43b1e6214b0 Mon Sep 17 00:00:00 2001 From: "rsesek@chromium.org" Date: Wed, 28 Jul 2010 16:22:44 +0000 Subject: Revert 53892 - Initial scriptable object implementation. Broke ChromiumOS ARM build, reverting. Errors from log: remoting/client/plugin/chromoting_scriptable_object.cc: In member function 'virtual bool remoting::ChromotingScriptableObject::HasProperty(const pp::Var&, pp::Var*)': remoting/client/plugin/chromoting_scriptable_object.cc:48: error: NULL used in arithmetic remoting/client/plugin/chromoting_scriptable_object.cc: In member function 'virtual bool remoting::ChromotingScriptableObject::HasMethod(const pp::Var&, pp::Var*)': remoting/client/plugin/chromoting_scriptable_object.cc:63: error: NULL used in arithmetic BUG=50248 TEST=write javascript to manually setup connection. Review URL: http://codereview.chromium.org/3064009 TBR=ajwong@chromium.org Review URL: http://codereview.chromium.org/3020038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53949 0039d316-1c4b-4281-b951-d872f2087c98 --- remoting/client/x11_view.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'remoting/client/x11_view.cc') diff --git a/remoting/client/x11_view.cc b/remoting/client/x11_view.cc index ef3116b..fe30291 100644 --- a/remoting/client/x11_view.cc +++ b/remoting/client/x11_view.cc @@ -73,7 +73,7 @@ void X11View::TearDown() { void X11View::Paint() { // Don't bother attempting to paint if the display hasn't been set up. - if (!display_ || !window_ || !height_ || !width_ || !frame_) { + if (!display_ || !window_ || !height_ || !width_) { return; } @@ -146,8 +146,6 @@ void X11View::SetHostScreenSize(int width, int height) { width_ = width; height_ = height; XResizeWindow(display_, window_, width_, height_); - media::VideoFrame::CreateFrame(media::VideoFrame::RGB32, width_, height_, - base::TimeDelta(), base::TimeDelta(), &frame_); } void X11View::InitPaintTarget() { -- cgit v1.1