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

Side by Side Diff: WebCore/editing/DeleteButton.cpp

Issue 3366025: Merge 67246 - 2010-09-109 Peter Kasting <pkasting@google.com>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/
Patch Set: Created 10 years, 3 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 | « WebCore/ChangeLog ('k') | WebCore/html/HTMLAnchorElement.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) 2006, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 { 43 {
44 } 44 }
45 45
46 PassRefPtr<DeleteButton> DeleteButton::create(Document* document) 46 PassRefPtr<DeleteButton> DeleteButton::create(Document* document)
47 { 47 {
48 return adoptRef(new DeleteButton(document)); 48 return adoptRef(new DeleteButton(document));
49 } 49 }
50 50
51 void DeleteButton::defaultEventHandler(Event* event) 51 void DeleteButton::defaultEventHandler(Event* event)
52 { 52 {
53 // FIXME: Is it really import to check the type of the event? 53 if (event->type() == eventNames().clickEvent) {
54 // Seems OK to respond to any event named click even if it does not have the correct type. 54 document()->frame()->editor()->deleteButtonController()->deleteTarget();
55 if (event->isMouseEvent()) { 55 event->setDefaultHandled();
56 if (event->type() == eventNames().clickEvent) { 56 return;
57 document()->frame()->editor()->deleteButtonController()->deleteTarge t();
58 event->setDefaultHandled();
59 // FIXME: Shouldn't we return here instead of falling through?
60 }
61 } 57 }
62 58
63 HTMLImageElement::defaultEventHandler(event); 59 HTMLImageElement::defaultEventHandler(event);
64 } 60 }
65 61
66 } // namespace 62 } // namespace
OLDNEW
« no previous file with comments | « WebCore/ChangeLog ('k') | WebCore/html/HTMLAnchorElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698