| 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 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 493 } else if (v8_cache_options == "code-compressed") { | 493 } else if (v8_cache_options == "code-compressed") { |
| 494 prefs.v8_cache_options = V8_CACHE_OPTIONS_CODE_COMPRESSED; | 494 prefs.v8_cache_options = V8_CACHE_OPTIONS_CODE_COMPRESSED; |
| 495 } else if (v8_cache_options == "none") { | 495 } else if (v8_cache_options == "none") { |
| 496 prefs.v8_cache_options = V8_CACHE_OPTIONS_NONE; | 496 prefs.v8_cache_options = V8_CACHE_OPTIONS_NONE; |
| 497 } else if (v8_cache_options == "parse-memory") { | 497 } else if (v8_cache_options == "parse-memory") { |
| 498 prefs.v8_cache_options = V8_CACHE_OPTIONS_PARSE_MEMORY; | 498 prefs.v8_cache_options = V8_CACHE_OPTIONS_PARSE_MEMORY; |
| 499 } else if (v8_cache_options == "heuristics") { | 499 } else if (v8_cache_options == "heuristics") { |
| 500 prefs.v8_cache_options = V8_CACHE_OPTIONS_HEURISTICS; | 500 prefs.v8_cache_options = V8_CACHE_OPTIONS_HEURISTICS; |
| 501 } else if (v8_cache_options == "heuristics-mobile") { | 501 } else if (v8_cache_options == "heuristics-mobile") { |
| 502 prefs.v8_cache_options = V8_CACHE_OPTIONS_HEURISTICS_MOBILE; | 502 prefs.v8_cache_options = V8_CACHE_OPTIONS_HEURISTICS_MOBILE; |
| 503 } else if (v8_cache_options == "heuristics-default") { |
| 504 prefs.v8_cache_options = V8_CACHE_OPTIONS_HEURISTICS_DEFAULT; |
| 505 } else if (v8_cache_options == "heuristics-default-mobile") { |
| 506 prefs.v8_cache_options = V8_CACHE_OPTIONS_HEURISTICS_DEFAULT_MOBILE; |
| 507 } else if (v8_cache_options == "recent") { |
| 508 prefs.v8_cache_options = V8_CACHE_OPTIONS_RECENT; |
| 509 } else if (v8_cache_options == "recent-small") { |
| 510 prefs.v8_cache_options = V8_CACHE_OPTIONS_RECENT_SMALL; |
| 503 } else { | 511 } else { |
| 504 prefs.v8_cache_options = V8_CACHE_OPTIONS_DEFAULT; | 512 prefs.v8_cache_options = V8_CACHE_OPTIONS_DEFAULT; |
| 505 } | 513 } |
| 506 | 514 |
| 507 // TODO(marja): Clean up preferences + command line flag after streaming has | 515 // TODO(marja): Clean up preferences + command line flag after streaming has |
| 508 // launched in stable. | 516 // launched in stable. |
| 509 prefs.v8_script_streaming_enabled = true; | 517 prefs.v8_script_streaming_enabled = true; |
| 510 prefs.v8_script_streaming_mode = | 518 prefs.v8_script_streaming_mode = |
| 511 V8_SCRIPT_STREAMING_MODE_ONLY_ASYNC_AND_DEFER; | 519 V8_SCRIPT_STREAMING_MODE_ONLY_ASYNC_AND_DEFER; |
| 512 | 520 |
| (...skipping 958 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1471 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1479 FrameTree* frame_tree = delegate_->GetFrameTree(); |
| 1472 | 1480 |
| 1473 frame_tree->ResetForMainFrameSwap(); | 1481 frame_tree->ResetForMainFrameSwap(); |
| 1474 } | 1482 } |
| 1475 | 1483 |
| 1476 void RenderViewHostImpl::SelectWordAroundCaret() { | 1484 void RenderViewHostImpl::SelectWordAroundCaret() { |
| 1477 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1485 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
| 1478 } | 1486 } |
| 1479 | 1487 |
| 1480 } // namespace content | 1488 } // namespace content |
| OLD | NEW |