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

Side by Side Diff: Source/WebKit/chromium/src/WebSettingsImpl.cpp

Issue 11882024: Merge 139028 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 11 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 | « Source/WebKit/chromium/src/WebSettingsImpl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 bool WebSettingsImpl::applyPageScaleFactorInCompositor() const 721 bool WebSettingsImpl::applyPageScaleFactorInCompositor() const
722 { 722 {
723 return m_settings->applyPageScaleFactorInCompositor(); 723 return m_settings->applyPageScaleFactorInCompositor();
724 } 724 }
725 725
726 void WebSettingsImpl::setAllowCustomScrollbarInMainFrame(bool enabled) 726 void WebSettingsImpl::setAllowCustomScrollbarInMainFrame(bool enabled)
727 { 727 {
728 m_settings->setAllowCustomScrollbarInMainFrame(enabled); 728 m_settings->setAllowCustomScrollbarInMainFrame(enabled);
729 } 729 }
730 730
731 void WebSettingsImpl::setCompositedScrollingForFramesEnabled(bool enabled)
732 {
733 m_settings->setCompositedScrollingForFramesEnabled(enabled);
734 }
735
731 } // namespace WebKit 736 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebSettingsImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698