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

Side by Side Diff: Source/core/html/HTMLInputElement.cpp

Issue 298963003: Oilpan: Move ClickHandlingState to heap (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/html/forms/CheckboxInputType.h » ('j') | 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 6 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
7 * Copyright (C) 2007 Samuel Weinig (sam@webkit.org) 7 * Copyright (C) 2007 Samuel Weinig (sam@webkit.org)
8 * Copyright (C) 2010 Google Inc. All rights reserved. 8 * Copyright (C) 2010 Google Inc. All rights reserved.
9 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 9 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
10 * Copyright (C) 2012 Samsung Electronics. All rights reserved. 10 * Copyright (C) 2012 Samsung Electronics. All rights reserved.
(...skipping 1064 matching lines...) Expand 10 before | Expand all | Expand 10 after
1075 void* HTMLInputElement::preDispatchEventHandler(Event* event) 1075 void* HTMLInputElement::preDispatchEventHandler(Event* event)
1076 { 1076 {
1077 if (event->type() == EventTypeNames::textInput && m_inputTypeView->shouldSub mitImplicitly(event)) { 1077 if (event->type() == EventTypeNames::textInput && m_inputTypeView->shouldSub mitImplicitly(event)) {
1078 event->stopPropagation(); 1078 event->stopPropagation();
1079 return 0; 1079 return 0;
1080 } 1080 }
1081 if (event->type() != EventTypeNames::click) 1081 if (event->type() != EventTypeNames::click)
1082 return 0; 1082 return 0;
1083 if (!event->isMouseEvent() || toMouseEvent(event)->button() != LeftButton) 1083 if (!event->isMouseEvent() || toMouseEvent(event)->button() != LeftButton)
1084 return 0; 1084 return 0;
1085 #if ENABLE(OILPAN)
1086 return m_inputTypeView->willDispatchClick();
1087 #else
1085 // FIXME: Check whether there are any cases where this actually ends up leak ing. 1088 // FIXME: Check whether there are any cases where this actually ends up leak ing.
1086 return m_inputTypeView->willDispatchClick().leakPtr(); 1089 return m_inputTypeView->willDispatchClick().leakPtr();
1090 #endif
1087 } 1091 }
1088 1092
1089 void HTMLInputElement::postDispatchEventHandler(Event* event, void* dataFromPreD ispatch) 1093 void HTMLInputElement::postDispatchEventHandler(Event* event, void* dataFromPreD ispatch)
1090 { 1094 {
1091 OwnPtr<ClickHandlingState> state = adoptPtr(static_cast<ClickHandlingState*> (dataFromPreDispatch)); 1095 OwnPtrWillBeRawPtr<ClickHandlingState> state = adoptPtrWillBeNoop(static_cas t<ClickHandlingState*>(dataFromPreDispatch));
1092 if (!state) 1096 if (!state)
1093 return; 1097 return;
1094 m_inputTypeView->didDispatchClick(event, *state); 1098 m_inputTypeView->didDispatchClick(event, *state);
1095 } 1099 }
1096 1100
1097 void HTMLInputElement::defaultEventHandler(Event* evt) 1101 void HTMLInputElement::defaultEventHandler(Event* evt)
1098 { 1102 {
1099 if (evt->isMouseEvent() && evt->type() == EventTypeNames::click && toMouseEv ent(evt)->button() == LeftButton) { 1103 if (evt->isMouseEvent() && evt->type() == EventTypeNames::click && toMouseEv ent(evt)->button() == LeftButton) {
1100 m_inputTypeView->handleClickEvent(toMouseEvent(evt)); 1104 m_inputTypeView->handleClickEvent(toMouseEvent(evt));
1101 if (evt->defaultHandled()) 1105 if (evt->defaultHandled())
(...skipping 752 matching lines...) Expand 10 before | Expand all | Expand 10 after
1854 return m_inputTypeView->customStyleForRenderer(originalStyleForRenderer()); 1858 return m_inputTypeView->customStyleForRenderer(originalStyleForRenderer());
1855 } 1859 }
1856 #endif 1860 #endif
1857 1861
1858 bool HTMLInputElement::shouldDispatchFormControlChangeEvent(String& oldValue, St ring& newValue) 1862 bool HTMLInputElement::shouldDispatchFormControlChangeEvent(String& oldValue, St ring& newValue)
1859 { 1863 {
1860 return m_inputType->shouldDispatchFormControlChangeEvent(oldValue, newValue) ; 1864 return m_inputType->shouldDispatchFormControlChangeEvent(oldValue, newValue) ;
1861 } 1865 }
1862 1866
1863 } // namespace 1867 } // namespace
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/forms/CheckboxInputType.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698