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

Side by Side Diff: third_party/WebKit/Source/core/input/EventHandler.cpp

Issue 1835773002: Rename AtomicString::string() to AtomicString::getString(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Windows Created 4 years, 8 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) 4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
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 1435 matching lines...) Expand 10 before | Expand all | Expand 10 after
1446 if (keywords.isNull()) 1446 if (keywords.isNull())
1447 continue; 1447 continue;
1448 1448
1449 DragOperation dragOperation = DragOperationNone; 1449 DragOperation dragOperation = DragOperationNone;
1450 for (unsigned i = 0; i < keywords.size(); i++) { 1450 for (unsigned i = 0; i < keywords.size(); i++) {
1451 DragOperation op = convertDropZoneOperationToDragOperation(keywords[ i]); 1451 DragOperation op = convertDropZoneOperationToDragOperation(keywords[ i]);
1452 if (op != DragOperationNone) { 1452 if (op != DragOperationNone) {
1453 if (dragOperation == DragOperationNone) 1453 if (dragOperation == DragOperationNone)
1454 dragOperation = op; 1454 dragOperation = op;
1455 } else { 1455 } else {
1456 matched = matched || dataTransfer->hasDropZoneType(keywords[i].s tring()); 1456 matched = matched || dataTransfer->hasDropZoneType(keywords[i].g etString());
1457 } 1457 }
1458 1458
1459 if (matched && dragOperation != DragOperationNone) 1459 if (matched && dragOperation != DragOperationNone)
1460 break; 1460 break;
1461 } 1461 }
1462 if (matched) { 1462 if (matched) {
1463 dataTransfer->setDropEffect(convertDragOperationToDropZoneOperation( dragOperation)); 1463 dataTransfer->setDropEffect(convertDragOperationToDropZoneOperation( dragOperation));
1464 return true; 1464 return true;
1465 } 1465 }
1466 } 1466 }
(...skipping 2506 matching lines...) Expand 10 before | Expand all | Expand 10 after
3973 PlatformEvent::Modifiers EventHandler::accessKeyModifiers() 3973 PlatformEvent::Modifiers EventHandler::accessKeyModifiers()
3974 { 3974 {
3975 #if OS(MACOSX) 3975 #if OS(MACOSX)
3976 return static_cast<PlatformEvent::Modifiers>(PlatformEvent::CtrlKey | Platfo rmEvent::AltKey); 3976 return static_cast<PlatformEvent::Modifiers>(PlatformEvent::CtrlKey | Platfo rmEvent::AltKey);
3977 #else 3977 #else
3978 return PlatformEvent::AltKey; 3978 return PlatformEvent::AltKey;
3979 #endif 3979 #endif
3980 } 3980 }
3981 3981
3982 } // namespace blink 3982 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698