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

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

Issue 982643003: Mac: Remove flag to disable threaded event handling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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/public/common/web_preferences.cc ('k') | content/renderer/render_view_impl.cc » ('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_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 546
547 is_impl_side_painting_enabled_ = 547 is_impl_side_painting_enabled_ =
548 !command_line.HasSwitch(switches::kDisableImplSidePainting); 548 !command_line.HasSwitch(switches::kDisableImplSidePainting);
549 cc_blink::WebLayerImpl::SetImplSidePaintingEnabled( 549 cc_blink::WebLayerImpl::SetImplSidePaintingEnabled(
550 is_impl_side_painting_enabled_); 550 is_impl_side_painting_enabled_);
551 551
552 is_zero_copy_enabled_ = command_line.HasSwitch(switches::kEnableZeroCopy); 552 is_zero_copy_enabled_ = command_line.HasSwitch(switches::kEnableZeroCopy);
553 is_one_copy_enabled_ = !command_line.HasSwitch(switches::kDisableOneCopy); 553 is_one_copy_enabled_ = !command_line.HasSwitch(switches::kDisableOneCopy);
554 554
555 #if defined(OS_MACOSX) && !defined(OS_IOS) 555 #if defined(OS_MACOSX) && !defined(OS_IOS)
556 is_elastic_overscroll_enabled_ = 556 is_elastic_overscroll_enabled_ = base::mac::IsOSLionOrLater();
557 !base::CommandLine::ForCurrentProcess()->HasSwitch(
558 switches::kDisableThreadedEventHandlingMac) &&
559 base::mac::IsOSLionOrLater();
560 if (is_elastic_overscroll_enabled_) { 557 if (is_elastic_overscroll_enabled_) {
561 base::ScopedCFTypeRef<CFStringRef> key( 558 base::ScopedCFTypeRef<CFStringRef> key(
562 base::SysUTF8ToCFStringRef("NSScrollViewRubberbanding")); 559 base::SysUTF8ToCFStringRef("NSScrollViewRubberbanding"));
563 Boolean key_exists = false; 560 Boolean key_exists = false;
564 Boolean value = CFPreferencesGetAppBooleanValue( 561 Boolean value = CFPreferencesGetAppBooleanValue(
565 key, kCFPreferencesCurrentApplication, &key_exists); 562 key, kCFPreferencesCurrentApplication, &key_exists);
566 if (key_exists && !value) 563 if (key_exists && !value)
567 is_elastic_overscroll_enabled_ = false; 564 is_elastic_overscroll_enabled_ = false;
568 } 565 }
569 #else 566 #else
(...skipping 1254 matching lines...) Expand 10 before | Expand all | Expand 10 after
1824 mojo::InterfaceRequest<mojo::ServiceProvider> services, 1821 mojo::InterfaceRequest<mojo::ServiceProvider> services,
1825 mojo::ServiceProviderPtr exposed_services) 1822 mojo::ServiceProviderPtr exposed_services)
1826 : services(services.Pass()), 1823 : services(services.Pass()),
1827 exposed_services(exposed_services.Pass()) { 1824 exposed_services(exposed_services.Pass()) {
1828 } 1825 }
1829 1826
1830 RenderThreadImpl::PendingRenderFrameConnect::~PendingRenderFrameConnect() { 1827 RenderThreadImpl::PendingRenderFrameConnect::~PendingRenderFrameConnect() {
1831 } 1828 }
1832 1829
1833 } // namespace content 1830 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/web_preferences.cc ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698