| 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/browser/renderer_host/render_view_host_impl.h" | 5 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 505 } else if (v8_cache_options == "heuristics-default-mobile") { | 505 } else if (v8_cache_options == "heuristics-default-mobile") { |
| 506 prefs.v8_cache_options = V8_CACHE_OPTIONS_HEURISTICS_DEFAULT_MOBILE; | 506 prefs.v8_cache_options = V8_CACHE_OPTIONS_HEURISTICS_DEFAULT_MOBILE; |
| 507 } else if (v8_cache_options == "recent") { | 507 } else if (v8_cache_options == "recent") { |
| 508 prefs.v8_cache_options = V8_CACHE_OPTIONS_RECENT; | 508 prefs.v8_cache_options = V8_CACHE_OPTIONS_RECENT; |
| 509 } else if (v8_cache_options == "recent-small") { | 509 } else if (v8_cache_options == "recent-small") { |
| 510 prefs.v8_cache_options = V8_CACHE_OPTIONS_RECENT_SMALL; | 510 prefs.v8_cache_options = V8_CACHE_OPTIONS_RECENT_SMALL; |
| 511 } else { | 511 } else { |
| 512 prefs.v8_cache_options = V8_CACHE_OPTIONS_DEFAULT; | 512 prefs.v8_cache_options = V8_CACHE_OPTIONS_DEFAULT; |
| 513 } | 513 } |
| 514 | 514 |
| 515 // TODO(marja): Clean up preferences + command line flag after streaming has | |
| 516 // launched in stable. | |
| 517 prefs.v8_script_streaming_enabled = true; | |
| 518 prefs.v8_script_streaming_mode = | |
| 519 V8_SCRIPT_STREAMING_MODE_ONLY_ASYNC_AND_DEFER; | |
| 520 | |
| 521 GetContentClient()->browser()->OverrideWebkitPrefs(this, url, &prefs); | 515 GetContentClient()->browser()->OverrideWebkitPrefs(this, url, &prefs); |
| 522 return prefs; | 516 return prefs; |
| 523 } | 517 } |
| 524 | 518 |
| 525 void RenderViewHostImpl::SuppressDialogsUntilSwapOut() { | 519 void RenderViewHostImpl::SuppressDialogsUntilSwapOut() { |
| 526 Send(new ViewMsg_SuppressDialogsUntilSwapOut(GetRoutingID())); | 520 Send(new ViewMsg_SuppressDialogsUntilSwapOut(GetRoutingID())); |
| 527 } | 521 } |
| 528 | 522 |
| 529 void RenderViewHostImpl::ClosePage() { | 523 void RenderViewHostImpl::ClosePage() { |
| 530 is_waiting_for_close_ack_ = true; | 524 is_waiting_for_close_ack_ = true; |
| (...skipping 941 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1472 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1466 FrameTree* frame_tree = delegate_->GetFrameTree(); |
| 1473 | 1467 |
| 1474 frame_tree->ResetForMainFrameSwap(); | 1468 frame_tree->ResetForMainFrameSwap(); |
| 1475 } | 1469 } |
| 1476 | 1470 |
| 1477 void RenderViewHostImpl::SelectWordAroundCaret() { | 1471 void RenderViewHostImpl::SelectWordAroundCaret() { |
| 1478 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1472 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
| 1479 } | 1473 } |
| 1480 | 1474 |
| 1481 } // namespace content | 1475 } // namespace content |
| OLD | NEW |