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

Side by Side Diff: Source/core/testing/InternalSettings.cpp

Issue 945363006: Remove setPageScaleFactor from InternalSettings::resetToConsistentState. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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 | « no previous file | 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2013 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 147
148 InternalSettings::InternalSettings(Page& page) 148 InternalSettings::InternalSettings(Page& page)
149 : InternalSettingsGenerated(&page) 149 : InternalSettingsGenerated(&page)
150 , m_page(&page) 150 , m_page(&page)
151 , m_backup(&page.settings()) 151 , m_backup(&page.settings())
152 { 152 {
153 } 153 }
154 154
155 void InternalSettings::resetToConsistentState() 155 void InternalSettings::resetToConsistentState()
156 { 156 {
157 page()->setPageScaleFactor(1, IntPoint(0, 0));
158
159 m_backup.restoreTo(settings()); 157 m_backup.restoreTo(settings());
160 m_backup = Backup(settings()); 158 m_backup = Backup(settings());
161 m_backup.m_originalTextAutosizingEnabled = settings()->textAutosizingEnabled (); 159 m_backup.m_originalTextAutosizingEnabled = settings()->textAutosizingEnabled ();
162 160
163 InternalSettingsGenerated::resetToConsistentState(); 161 InternalSettingsGenerated::resetToConsistentState();
164 } 162 }
165 163
166 Settings* InternalSettings::settings() const 164 Settings* InternalSettings::settings() const
167 { 165 {
168 if (!page()) 166 if (!page())
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 RuntimeEnabledFeatures::setLinkHeaderEnabled(enabled); 477 RuntimeEnabledFeatures::setLinkHeaderEnabled(enabled);
480 } 478 }
481 479
482 void InternalSettings::setDnsPrefetchLogging(bool enabled, ExceptionState& excep tionState) 480 void InternalSettings::setDnsPrefetchLogging(bool enabled, ExceptionState& excep tionState)
483 { 481 {
484 InternalSettingsGuardForSettings(); 482 InternalSettingsGuardForSettings();
485 settings()->setLogDnsPrefetchAndPreconnect(enabled); 483 settings()->setLogDnsPrefetchAndPreconnect(enabled);
486 } 484 }
487 485
488 } 486 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698