Call SkBitmap::lockPixels() prior to SkPicture::getPixels() to ensure that correct pointer is retur…

content/browser/renderer_host/render_widget_host_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/shared_memory.h"
 #include "base/timer.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/renderer_host/backing_store.h"
@@ skipping 449 matching lines @@
   canvas.FillRect(gfx::Rect(0, 2, 2, 2), SK_ColorWHITE);
   canvas.FillRect(gfx::Rect(2, 2, 2, 2), SK_ColorBLACK);
   const SkBitmap& background =
       canvas.sk_canvas()->getDevice()->accessBitmap(false);
 
   // Set the background and make sure we get back a copy.
   view->SetBackground(background);
   EXPECT_EQ(4, view->GetBackground().width());
   EXPECT_EQ(4, view->GetBackground().height());
   EXPECT_EQ(background.getSize(), view->GetBackground().getSize());
+  background.lockPixels();
+  view->GetBackground().lockPixels();
   EXPECT_TRUE(0 == memcmp(background.getPixels(),
                           view->GetBackground().getPixels(),
                           background.getSize()));
+  view->GetBackground().unlockPixels();
+  background.unlockPixels();
 
   const IPC::Message* set_background =
       process_->sink().GetUniqueMessageMatching(ViewMsg_SetBackground::ID);
   ASSERT_TRUE(set_background);
   Tuple1<SkBitmap> sent_background;
   ViewMsg_SetBackground::Read(set_background, &sent_background);
   EXPECT_EQ(background.getSize(), sent_background.a.getSize());
+  background.lockPixels();
+  sent_background.a.lockPixels();
   EXPECT_TRUE(0 == memcmp(background.getPixels(),
                           sent_background.a.getPixels(),
                           background.getSize()));
+  sent_background.a.unlockPixels();
+  background.unlockPixels();
 
 #if defined(OS_LINUX) || defined(USE_AURA)
   // See the comment above |InitAsChild(NULL)|.
   host_->SetView(NULL);
   static_cast<content::RenderWidgetHostViewPort*>(view.release())->Destroy();
 #endif
 
 #else
   // TODO(port): Mac does not have gfx::Canvas. Maybe we can just change this
   // test to use SkCanvas directly?
@@ skipping 281 matching lines @@
   SimulateKeyboardEvent(WebInputEvent::RawKeyDown);
   SimulateKeyboardEvent(WebInputEvent::RawKeyDown);
   SendInputEventACK(WebInputEvent::RawKeyDown, true);
 
   // Wait long enough for first timeout and see if it fired.
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE, MessageLoop::QuitClosure(), TimeDelta::FromMilliseconds(40));
   MessageLoop::current()->Run();
   EXPECT_TRUE(host_->unresponsive_timer_fired());
 }