OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/render_widget.h" | 5 #include "content/renderer/render_widget.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 } | 208 } |
209 | 209 |
210 // static | 210 // static |
211 RenderWidget* RenderWidget::Create(int32 opener_id, | 211 RenderWidget* RenderWidget::Create(int32 opener_id, |
212 WebKit::WebPopupType popup_type, | 212 WebKit::WebPopupType popup_type, |
213 const WebKit::WebScreenInfo& screen_info) { | 213 const WebKit::WebScreenInfo& screen_info) { |
214 DCHECK(opener_id != MSG_ROUTING_NONE); | 214 DCHECK(opener_id != MSG_ROUTING_NONE); |
215 scoped_refptr<RenderWidget> widget( | 215 scoped_refptr<RenderWidget> widget( |
216 new RenderWidget(popup_type, screen_info, false)); | 216 new RenderWidget(popup_type, screen_info, false)); |
217 if (widget->Init(opener_id)) { // adds reference on success. | 217 if (widget->Init(opener_id)) { // adds reference on success. |
218 return widget; | 218 return widget.get(); |
219 } | 219 } |
220 return NULL; | 220 return NULL; |
221 } | 221 } |
222 | 222 |
223 // static | 223 // static |
224 WebWidget* RenderWidget::CreateWebWidget(RenderWidget* render_widget) { | 224 WebWidget* RenderWidget::CreateWebWidget(RenderWidget* render_widget) { |
225 switch (render_widget->popup_type_) { | 225 switch (render_widget->popup_type_) { |
226 case WebKit::WebPopupTypeNone: // Nothing to create. | 226 case WebKit::WebPopupTypeNone: // Nothing to create. |
227 break; | 227 break; |
228 case WebKit::WebPopupTypeSelect: | 228 case WebKit::WebPopupTypeSelect: |
(...skipping 2150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2379 | 2379 |
2380 if (!context->Initialize( | 2380 if (!context->Initialize( |
2381 attributes, | 2381 attributes, |
2382 false /* bind generates resources */, | 2382 false /* bind generates resources */, |
2383 CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE)
) | 2383 CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE)
) |
2384 return NULL; | 2384 return NULL; |
2385 return context.release(); | 2385 return context.release(); |
2386 } | 2386 } |
2387 | 2387 |
2388 } // namespace content | 2388 } // namespace content |
OLD | NEW |