Source/WebKit/chromium/src/WebSettingsImpl.h - Issue 11862015: Merge 139356

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

Unified Diff: Source/WebKit/chromium/src/WebSettingsImpl.h

Issue 11862015: Merge 139356 (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:

Index: Source/WebKit/chromium/src/WebSettingsImpl.h

===================================================================

--- Source/WebKit/chromium/src/WebSettingsImpl.h (revision 139470)

+++ Source/WebKit/chromium/src/WebSettingsImpl.h (working copy)

@@ -172,7 +172,7 @@

bool showPaintRects() const { return m_showPaintRects; }

bool renderVSyncEnabled() const { return m_renderVSyncEnabled; }

bool lowLatencyRenderingEnabled() const { return m_lowLatencyRenderingEnabled; }

- bool applyDeviceScaleFactorInCompositor() const { return m_applyDeviceScaleFactorInCompositor; }

+ bool applyDeviceScaleFactorInCompositor() const;

bool applyPageScaleFactorInCompositor() const;

bool autoZoomFocusedNodeToLegibleScale() const { return m_autoZoomFocusedNodeToLegibleScale; }

bool gestureTapHighlightEnabled() const { return m_gestureTapHighlightEnabled; }

@@ -190,7 +190,6 @@

bool m_renderVSyncEnabled;

bool m_lowLatencyRenderingEnabled;

bool m_viewportEnabled;

- bool m_applyDeviceScaleFactorInCompositor;

bool m_gestureTapHighlightEnabled;

bool m_autoZoomFocusedNodeToLegibleScale;

bool m_deferredImageDecodingEnabled;