Source/WebKit/chromium/src/WebSettingsImpl.cpp - Issue 11882024: Merge 139028

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

OLD	NEW
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 Loading...
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

OLD	NEW

« no previous file with comments | « Source/WebKit/chromium/src/WebSettingsImpl.h ('k') | no next file » | no next file with comments »