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

Side by Side Diff: third_party/WebKit/Source/core/html/forms/CheckboxInputType.cpp

Issue 1366983003: Prevent CheckboxInputType from being freed by change event handlers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix tests again Created 5 years, 2 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 | « third_party/WebKit/LayoutTests/fast/forms/checkbox/checkbox-change-event-free-expected.txt ('k') | 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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2011 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 are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 if (state->indeterminate) 81 if (state->indeterminate)
82 element().setIndeterminate(false); 82 element().setIndeterminate(false);
83 83
84 element().setChecked(!state->checked, DispatchChangeEvent); 84 element().setChecked(!state->checked, DispatchChangeEvent);
85 m_isInClickHandler = true; 85 m_isInClickHandler = true;
86 return state.release(); 86 return state.release();
87 } 87 }
88 88
89 void CheckboxInputType::didDispatchClick(Event* event, const ClickHandlingState& state) 89 void CheckboxInputType::didDispatchClick(Event* event, const ClickHandlingState& state)
90 { 90 {
91 // Prevent change event handlers from indirectly freeing the
92 // CheckboxInputType via a modification of the "type" attribute on the
93 // HTMLInputElement.
94 RefPtrWillBeRawPtr<CheckboxInputType> protect(this);
95
91 if (event->defaultPrevented() || event->defaultHandled()) { 96 if (event->defaultPrevented() || event->defaultHandled()) {
92 element().setIndeterminate(state.indeterminate); 97 element().setIndeterminate(state.indeterminate);
93 element().setChecked(state.checked); 98 element().setChecked(state.checked);
94 } else { 99 } else {
95 element().dispatchChangeEventIfNeeded(); 100 element().dispatchChangeEventIfNeeded();
96 } 101 }
97 m_isInClickHandler = false; 102 m_isInClickHandler = false;
98 // The work we did in willDispatchClick was default handling. 103 // The work we did in willDispatchClick was default handling.
99 event->setDefaultHandled(); 104 event->setDefaultHandled();
100 } 105 }
101 106
102 bool CheckboxInputType::shouldAppearIndeterminate() const 107 bool CheckboxInputType::shouldAppearIndeterminate() const
103 { 108 {
104 return element().indeterminate(); 109 return element().indeterminate();
105 } 110 }
106 111
107 } // namespace blink 112 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/forms/checkbox/checkbox-change-event-free-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698