Changeset 109817 in webkit
- Timestamp:
- Mar 5, 2012 4:47:10 PM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r109812 r109817 1 2012-03-05 MORITA Hajime <morrita@google.com> 2 3 https://bugs.webkit.org/show_bug.cgi?id=80257 4 Lifecycle of InternalSettings should be simplified. 5 6 Reviewed by Ryosuke Niwa. 7 8 - Moved settings update code to separate restoreTo() method. 9 - Eliminated flags which indidate the changed field. 10 Now these modifiable parameters are backed up at the initialization. 11 12 No new tests. Refactoring. 13 14 * testing/InternalSettings.cpp: 15 (WebCore::InternalSettings::create): 16 (WebCore::InternalSettings::InternalSettings): 17 (WebCore): 18 (WebCore::InternalSettings::restoreTo): 19 * testing/InternalSettings.h: 20 (InternalSettings): 21 * testing/Internals.cpp: 22 (WebCore::Internals::reset): 23 1 24 2012-03-05 Anders Carlsson <andersca@apple.com> 2 25 -
trunk/Source/WebCore/testing/InternalSettings.cpp
r107665 r109817 80 80 81 81 82 PassRefPtr<InternalSettings> InternalSettings::create(Frame* frame , InternalSettings* old)83 { 84 return adoptRef(new InternalSettings(frame , old));82 PassRefPtr<InternalSettings> InternalSettings::create(Frame* frame) 83 { 84 return adoptRef(new InternalSettings(frame)); 85 85 } 86 86 … … 89 89 } 90 90 91 InternalSettings::InternalSettings(Frame* frame , InternalSettings* old)91 InternalSettings::InternalSettings(Frame* frame) 92 92 : FrameDestructionObserver(frame) 93 , m_ passwordEchoDurationInSecondsBackup(0)94 , m_ passwordEchoDurationInSecondsBackedUp(false)95 , m_passwordEchoEnabledBackedUp(false) 96 { 97 if (old && settings()) { 98 if (old->m_passwordEchoDurationInSecondsBackedUp) 99 settings()->setPasswordEchoDurationInSeconds(old->m_passwordEchoDurationInSecondsBackup); 100 if (old->m_passwordEchoEnabledBackedUp) 101 settings()->setPasswordEchoEnabled(old->m_passwordEchoEnabledBackup);102 }93 , m_originalPasswordEchoDurationInSeconds(settings()->passwordEchoDurationInSeconds()) 94 , m_originalPasswordEchoEnabled(settings()->passwordEchoEnabled()) 95 96 { 97 } 98 99 void InternalSettings::restoreTo(Settings* settings) 100 { 101 settings->setPasswordEchoDurationInSeconds(m_originalPasswordEchoDurationInSeconds); 102 settings->setPasswordEchoEnabled(m_originalPasswordEchoEnabled); 103 103 } 104 104 … … 174 174 { 175 175 InternalSettingsGuardForSettings(); 176 if (!m_passwordEchoEnabledBackedUp) {177 m_passwordEchoEnabledBackup = settings()->passwordEchoEnabled();178 m_passwordEchoEnabledBackedUp = true;179 }180 176 settings()->setPasswordEchoEnabled(enabled); 181 177 } … … 184 180 { 185 181 InternalSettingsGuardForSettings(); 186 if (!m_passwordEchoDurationInSecondsBackedUp) {187 m_passwordEchoDurationInSecondsBackup = settings()->passwordEchoDurationInSeconds();188 m_passwordEchoDurationInSecondsBackedUp = true;189 }190 182 settings()->setPasswordEchoDurationInSeconds(durationInSeconds); 191 183 } -
trunk/Source/WebCore/testing/InternalSettings.h
r107665 r109817 44 44 public FrameDestructionObserver { 45 45 public: 46 static PassRefPtr<InternalSettings> create(Frame* , InternalSettings* old);46 static PassRefPtr<InternalSettings> create(Frame*); 47 47 virtual ~InternalSettings(); 48 48 … … 63 63 void setTouchEventEmulationEnabled(bool enabled, ExceptionCode&); 64 64 65 void restoreTo(Settings*); 66 65 67 private: 66 InternalSettings(Frame* , InternalSettings* old);68 InternalSettings(Frame*); 67 69 68 70 Settings* settings() const; … … 70 72 Page* page() const; 71 73 72 double m_passwordEchoDurationInSecondsBackup; 73 bool m_passwordEchoEnabledBackup : 1; 74 bool m_passwordEchoDurationInSecondsBackedUp : 1; 75 bool m_passwordEchoEnabledBackedUp : 1; 74 double m_originalPasswordEchoDurationInSeconds; 75 bool m_originalPasswordEchoEnabled; 76 76 }; 77 77 -
trunk/Source/WebCore/testing/Internals.cpp
r109402 r109817 435 435 436 436 observeFrame(document->frame()); 437 m_settings = InternalSettings::create(document->frame(), m_settings.get()); 437 438 if (m_settings) 439 m_settings->restoreTo(document->page()->settings()); 440 m_settings = InternalSettings::create(document->frame()); 438 441 if (Page* page = document->page()) 439 442 page->setPagination(Page::Pagination());
Note: See TracChangeset
for help on using the changeset viewer.