| 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_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 873 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 884 // Disable antialiasing of clips for 2d canvas if requested on the command | 884 // Disable antialiasing of clips for 2d canvas if requested on the command |
| 885 // line. | 885 // line. |
| 886 settings->setAntialiasedClips2dCanvasEnabled( | 886 settings->setAntialiasedClips2dCanvasEnabled( |
| 887 prefs.antialiased_clips_2d_canvas_enabled); | 887 prefs.antialiased_clips_2d_canvas_enabled); |
| 888 | 888 |
| 889 // Set MSAA sample count for 2d canvas if requested on the command line (or | 889 // Set MSAA sample count for 2d canvas if requested on the command line (or |
| 890 // default value if not). | 890 // default value if not). |
| 891 settings->setAccelerated2dCanvasMSAASampleCount( | 891 settings->setAccelerated2dCanvasMSAASampleCount( |
| 892 prefs.accelerated_2d_canvas_msaa_sample_count); | 892 prefs.accelerated_2d_canvas_msaa_sample_count); |
| 893 | 893 |
| 894 // Force readback from 2D canvas to use software code path. crbug.com/665656 |
| 895 settings->setForceSoftwareReadbackFrom2DCanvas( |
| 896 prefs.force_software_readback_from_2d_canvas); |
| 897 |
| 894 // Tabs to link is not part of the settings. WebCore calls | 898 // Tabs to link is not part of the settings. WebCore calls |
| 895 // ChromeClient::tabsToLinks which is part of the glue code. | 899 // ChromeClient::tabsToLinks which is part of the glue code. |
| 896 web_view->setTabsToLinks(prefs.tabs_to_links); | 900 web_view->setTabsToLinks(prefs.tabs_to_links); |
| 897 | 901 |
| 898 settings->setAllowRunningOfInsecureContent( | 902 settings->setAllowRunningOfInsecureContent( |
| 899 prefs.allow_running_insecure_content); | 903 prefs.allow_running_insecure_content); |
| 900 settings->setDisableReadingFromCanvas(prefs.disable_reading_from_canvas); | 904 settings->setDisableReadingFromCanvas(prefs.disable_reading_from_canvas); |
| 901 settings->setStrictMixedContentChecking(prefs.strict_mixed_content_checking); | 905 settings->setStrictMixedContentChecking(prefs.strict_mixed_content_checking); |
| 902 | 906 |
| 903 settings->setStrictlyBlockBlockableMixedContent( | 907 settings->setStrictlyBlockBlockableMixedContent( |
| (...skipping 1873 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2777 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); | 2781 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
| 2778 } | 2782 } |
| 2779 | 2783 |
| 2780 std::unique_ptr<InputEventAck> ack( | 2784 std::unique_ptr<InputEventAck> ack( |
| 2781 new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type, | 2785 new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type, |
| 2782 INPUT_EVENT_ACK_STATE_NOT_CONSUMED)); | 2786 INPUT_EVENT_ACK_STATE_NOT_CONSUMED)); |
| 2783 OnInputEventAck(std::move(ack)); | 2787 OnInputEventAck(std::move(ack)); |
| 2784 } | 2788 } |
| 2785 | 2789 |
| 2786 } // namespace content | 2790 } // namespace content |
| OLD | NEW |