diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-06 00:54:22 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-06 00:54:22 +0000 |
| commit | b8ad87497d718d0492b639e0f976ea94d5525642 (patch) | |
| tree | 73b22a6924567ca247665862f6e8f63f22136b58 /content/ppapi_plugin | |
| parent | a20d1f1abccf05e38666ea48ef034bd4c1dba12a (diff) | |
| download | chromium_src-b8ad87497d718d0492b639e0f976ea94d5525642.zip chromium_src-b8ad87497d718d0492b639e0f976ea94d5525642.tar.gz chromium_src-b8ad87497d718d0492b639e0f976ea94d5525642.tar.bz2 | |
Only check library load failure for broker.
The CHECK added in r115913 checks both ppapi and broker libraries. This caused a huge number of crashes on Windows fro ppapi. The reason of this is still unknown. But we will limit the CHECK only on broker case to avoid these crashes.
BUG=109155
TEST=none
Review URL: http://codereview.chromium.org/9108022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116606 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/ppapi_plugin')
| -rw-r--r-- | content/ppapi_plugin/ppapi_thread.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc index 94e27dd..e989785 100644 --- a/content/ppapi_plugin/ppapi_thread.cc +++ b/content/ppapi_plugin/ppapi_thread.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -246,9 +246,9 @@ void PpapiThread::OnMsgCreateChannel(base::ProcessHandle host_process_handle, if (!library_.is_valid() || // Plugin couldn't be loaded. !SetupRendererChannel(host_process_handle, renderer_id, &channel_handle)) { - // Add CHECK to investigate the root cause of crbug.com/103957. Will remove - // after the bug is fixed. - CHECK(library_.is_valid()); + // TODO(xhwang): Add CHECK to investigate the root cause of + // crbug.com/103957. Will remove after the bug is fixed. + CHECK(!is_broker_ || library_.is_valid()); Send(new PpapiHostMsg_ChannelCreated(IPC::ChannelHandle())); return; } |