Source/core/testing/InternalSettings.cpp - Issue 146683003: Settings should not call into inspector

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/core/testing/InternalSettings.cpp

Issue 146683003: Settings should not call into inspector (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: incorporated review comments Created 6 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/core/testing/InternalSettings.cpp

diff --git a/Source/core/testing/InternalSettings.cpp b/Source/core/testing/InternalSettings.cpp

index 074c6ed9e5dcb5bc3322131c8fc2b681c3f3f3ef..e872b38371e00d2a0c78dbcbb954c9636eb285b6 100644

--- a/Source/core/testing/InternalSettings.cpp

+++ b/Source/core/testing/InternalSettings.cpp

@@ -32,6 +32,7 @@

#include "core/dom/ExceptionCode.h"

#include "core/page/Page.h"

#include "core/frame/Settings.h"

+#include "core/inspector/InspectorInstrumentation.h"

#include "platform/ColorChooser.h"

#include "platform/Supplementable.h"

#include "platform/text/LocaleToScriptMapping.h"

@@ -153,6 +154,7 @@ void InternalSettings::resetToConsistentState()

m_backup.restoreTo(settings());

m_backup = Backup(settings());

+ m_backup.m_originalTextAutosizingEnabled = InspectorInstrumentation::overrideTextAutosizing(page(), settings()->textAutosizingEnabled());

InternalSettingsGenerated::resetToConsistentState();

}

« no previous file with comments | « Source/core/rendering/TextAutosizer.cpp ('k') | Source/web/WebFrameImpl.cpp » ('j') | no next file with comments »