Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(169)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 2875793002: Why this CL triggers an OilPan crash.
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | third_party/WebKit/Source/core/page/FrameTree.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 const mojom::CreateViewParams& params, 605 const mojom::CreateViewParams& params,
606 const RenderWidget::ShowCallback& show_callback) { 606 const RenderWidget::ShowCallback& show_callback) {
607 bool was_created_by_renderer = !show_callback.is_null(); 607 bool was_created_by_renderer = !show_callback.is_null();
608 #if defined(OS_ANDROID) 608 #if defined(OS_ANDROID)
609 // TODO(sgurun): crbug.com/325351 Needed only for android webview's deprecated 609 // TODO(sgurun): crbug.com/325351 Needed only for android webview's deprecated
610 // HandleNavigation codepath. 610 // HandleNavigation codepath.
611 was_created_by_renderer_ = was_created_by_renderer; 611 was_created_by_renderer_ = was_created_by_renderer;
612 #endif 612 #endif
613 display_mode_ = params.initial_size.display_mode; 613 display_mode_ = params.initial_size.display_mode;
614 614
615 webview_ = WebView::Create(this, is_hidden() 615 browsing_instance_id_ = params.browsing_instance_id;
616 ? blink::kWebPageVisibilityStateHidden 616 webview_ =
617 : blink::kWebPageVisibilityStateVisible); 617 WebView::Create(this,
618 is_hidden() ? blink::kWebPageVisibilityStateHidden
619 : blink::kWebPageVisibilityStateVisible,
620 params.browsing_instance_id);
618 RenderWidget::Init(show_callback, webview_->GetWidget()); 621 RenderWidget::Init(show_callback, webview_->GetWidget());
619 622
620 g_view_map.Get().insert(std::make_pair(webview(), this)); 623 g_view_map.Get().insert(std::make_pair(webview(), this));
621 g_routing_id_view_map.Get().insert(std::make_pair(GetRoutingID(), this)); 624 g_routing_id_view_map.Get().insert(std::make_pair(GetRoutingID(), this));
622 625
623 const base::CommandLine& command_line = 626 const base::CommandLine& command_line =
624 *base::CommandLine::ForCurrentProcess(); 627 *base::CommandLine::ForCurrentProcess();
625 628
626 if (command_line.HasSwitch(switches::kStatsCollectionController)) 629 if (command_line.HasSwitch(switches::kStatsCollectionController))
627 stats_collection_observer_.reset(new StatsCollectionObserver(this)); 630 stats_collection_observer_.reset(new StatsCollectionObserver(this));
(...skipping 834 matching lines...) Expand 10 before | Expand all | Expand 10 after
1462 DCHECK_EQ(GetRoutingID(), creator_frame->render_view()->GetRoutingID()); 1465 DCHECK_EQ(GetRoutingID(), creator_frame->render_view()->GetRoutingID());
1463 1466
1464 view_params.window_was_created_with_opener = true; 1467 view_params.window_was_created_with_opener = true;
1465 view_params.renderer_preferences = renderer_preferences_; 1468 view_params.renderer_preferences = renderer_preferences_;
1466 view_params.web_preferences = webkit_preferences_; 1469 view_params.web_preferences = webkit_preferences_;
1467 view_params.view_id = reply->route_id; 1470 view_params.view_id = reply->route_id;
1468 view_params.main_frame_routing_id = reply->main_frame_route_id; 1471 view_params.main_frame_routing_id = reply->main_frame_route_id;
1469 view_params.main_frame_widget_routing_id = reply->main_frame_widget_route_id; 1472 view_params.main_frame_widget_routing_id = reply->main_frame_widget_route_id;
1470 view_params.session_storage_namespace_id = 1473 view_params.session_storage_namespace_id =
1471 reply->cloned_session_storage_namespace_id; 1474 reply->cloned_session_storage_namespace_id;
1475 view_params.browsing_instance_id =
1476 creator_frame->render_view()->browsing_instance_id_;
1472 view_params.swapped_out = false; 1477 view_params.swapped_out = false;
1473 // WebCore will take care of setting the correct name. 1478 // WebCore will take care of setting the correct name.
1474 view_params.replicated_frame_state = FrameReplicationState(); 1479 view_params.replicated_frame_state = FrameReplicationState();
1475 view_params.hidden = is_background_tab; 1480 view_params.hidden = is_background_tab;
1476 view_params.never_visible = never_visible; 1481 view_params.never_visible = never_visible;
1477 view_params.initial_size = initial_size; 1482 view_params.initial_size = initial_size;
1478 view_params.enable_auto_resize = false; 1483 view_params.enable_auto_resize = false;
1479 view_params.min_size = gfx::Size(); 1484 view_params.min_size = gfx::Size();
1480 view_params.max_size = gfx::Size(); 1485 view_params.max_size = gfx::Size();
1481 view_params.page_zoom_level = page_zoom_level_; 1486 view_params.page_zoom_level = page_zoom_level_;
(...skipping 1187 matching lines...) Expand 10 before | Expand all | Expand 10 after
2669 input_event.GetCoalescedEventsPointers(), latency_info, 2674 input_event.GetCoalescedEventsPointers(), latency_info,
2670 dispatch_type); 2675 dispatch_type);
2671 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; 2676 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
2672 } 2677 }
2673 idle_user_detector_->ActivityDetected(); 2678 idle_user_detector_->ActivityDetected();
2674 return RenderWidget::HandleInputEvent(input_event, latency_info, 2679 return RenderWidget::HandleInputEvent(input_event, latency_info,
2675 dispatch_type); 2680 dispatch_type);
2676 } 2681 }
2677 2682
2678 } // namespace content 2683 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | third_party/WebKit/Source/core/page/FrameTree.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698