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

Side by Side Diff: Source/web/WebPluginContainerImpl.cpp

Issue 925913002: Fixed WebDragData's wrong dependency. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2014 Opera Software ASA. All rights reserved. 3 * Copyright (C) 2014 Opera Software ASA. 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 792 matching lines...) Expand 10 before | Expand all | Expand 10 after
803 dragStatus = WebDragStatusLeave; 803 dragStatus = WebDragStatusLeave;
804 else if (event->type() == EventTypeNames::dragover) 804 else if (event->type() == EventTypeNames::dragover)
805 dragStatus = WebDragStatusOver; 805 dragStatus = WebDragStatusOver;
806 else if (event->type() == EventTypeNames::drop) 806 else if (event->type() == EventTypeNames::drop)
807 dragStatus = WebDragStatusDrop; 807 dragStatus = WebDragStatusDrop;
808 808
809 if (dragStatus == WebDragStatusUnknown) 809 if (dragStatus == WebDragStatusUnknown)
810 return; 810 return;
811 811
812 DataTransfer* dataTransfer = event->dataTransfer(); 812 DataTransfer* dataTransfer = event->dataTransfer();
813 WebDragData dragData(dataTransfer->dataObject()); 813 WebDragData dragData = dataTransfer->dataObject()->toWebDragData();
814 WebDragOperationsMask dragOperationMask = static_cast<WebDragOperationsMask> (dataTransfer->sourceOperation()); 814 WebDragOperationsMask dragOperationMask = static_cast<WebDragOperationsMask> (dataTransfer->sourceOperation());
815 WebPoint dragScreenLocation(event->screenX(), event->screenY()); 815 WebPoint dragScreenLocation(event->screenX(), event->screenY());
816 WebPoint dragLocation(event->absoluteLocation().x() - location().x(), event- >absoluteLocation().y() - location().y()); 816 WebPoint dragLocation(event->absoluteLocation().x() - location().x(), event- >absoluteLocation().y() - location().y());
817 817
818 m_webPlugin->handleDragStatusUpdate(dragStatus, dragData, dragOperationMask, dragLocation, dragScreenLocation); 818 m_webPlugin->handleDragStatusUpdate(dragStatus, dragData, dragOperationMask, dragLocation, dragScreenLocation);
819 } 819 }
820 820
821 void WebPluginContainerImpl::handleWheelEvent(WheelEvent* event) 821 void WebPluginContainerImpl::handleWheelEvent(WheelEvent* event)
822 { 822 {
823 WebMouseWheelEventBuilder webEvent(this, m_element->renderer(), *event); 823 WebMouseWheelEventBuilder webEvent(this, m_element->renderer(), *event);
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
981 981
982 return clipRect; 982 return clipRect;
983 } 983 }
984 984
985 bool WebPluginContainerImpl::pluginShouldPersist() const 985 bool WebPluginContainerImpl::pluginShouldPersist() const
986 { 986 {
987 return m_webPlugin->shouldPersist(); 987 return m_webPlugin->shouldPersist();
988 } 988 }
989 989
990 } // namespace blink 990 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698