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

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

Issue 2515413002: Revert workaround due to perf regression (Closed)
Patch Set: Created 4 years, 1 month 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
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 874 matching lines...) Expand 10 before | Expand all | Expand 10 after
885 // Disable antialiasing of clips for 2d canvas if requested on the command 885 // Disable antialiasing of clips for 2d canvas if requested on the command
886 // line. 886 // line.
887 settings->setAntialiasedClips2dCanvasEnabled( 887 settings->setAntialiasedClips2dCanvasEnabled(
888 prefs.antialiased_clips_2d_canvas_enabled); 888 prefs.antialiased_clips_2d_canvas_enabled);
889 889
890 // Set MSAA sample count for 2d canvas if requested on the command line (or 890 // Set MSAA sample count for 2d canvas if requested on the command line (or
891 // default value if not). 891 // default value if not).
892 settings->setAccelerated2dCanvasMSAASampleCount( 892 settings->setAccelerated2dCanvasMSAASampleCount(
893 prefs.accelerated_2d_canvas_msaa_sample_count); 893 prefs.accelerated_2d_canvas_msaa_sample_count);
894 894
895 // Force readback from 2D canvas to use software code path. crbug.com/665656
896 settings->setForceSoftwareReadbackFrom2DCanvas(
897 prefs.force_software_readback_from_2d_canvas);
898
899 // Tabs to link is not part of the settings. WebCore calls 895 // Tabs to link is not part of the settings. WebCore calls
900 // ChromeClient::tabsToLinks which is part of the glue code. 896 // ChromeClient::tabsToLinks which is part of the glue code.
901 web_view->setTabsToLinks(prefs.tabs_to_links); 897 web_view->setTabsToLinks(prefs.tabs_to_links);
902 898
903 settings->setAllowRunningOfInsecureContent( 899 settings->setAllowRunningOfInsecureContent(
904 prefs.allow_running_insecure_content); 900 prefs.allow_running_insecure_content);
905 settings->setDisableReadingFromCanvas(prefs.disable_reading_from_canvas); 901 settings->setDisableReadingFromCanvas(prefs.disable_reading_from_canvas);
906 settings->setStrictMixedContentChecking(prefs.strict_mixed_content_checking); 902 settings->setStrictMixedContentChecking(prefs.strict_mixed_content_checking);
907 903
908 settings->setStrictlyBlockBlockableMixedContent( 904 settings->setStrictlyBlockBlockableMixedContent(
(...skipping 1873 matching lines...) Expand 10 before | Expand all | Expand 10 after
2782 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); 2778 INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
2783 } 2779 }
2784 2780
2785 std::unique_ptr<InputEventAck> ack( 2781 std::unique_ptr<InputEventAck> ack(
2786 new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type, 2782 new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type,
2787 INPUT_EVENT_ACK_STATE_NOT_CONSUMED)); 2783 INPUT_EVENT_ACK_STATE_NOT_CONSUMED));
2788 OnInputEventAck(std::move(ack)); 2784 OnInputEventAck(std::move(ack));
2789 } 2785 }
2790 2786
2791 } // namespace content 2787 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/web_preferences.cc ('k') | content/test/gpu/gpu_tests/webgl2_conformance_expectations.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698