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

Unified Diff: third_party/WebKit/Source/core/page/DragController.cpp

Issue 2469873002: [ImageResource 4] Split ImageResource into Resource and Image parts (Closed)
Patch Set: comments Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/page/DragController.cpp
diff --git a/third_party/WebKit/Source/core/page/DragController.cpp b/third_party/WebKit/Source/core/page/DragController.cpp
index f3985d05d27c33aaf004c880911d0c058974908b..2b8ef63663592f7b367b77e1fcbfddb8cc8b7a2a 100644
--- a/third_party/WebKit/Source/core/page/DragController.cpp
+++ b/third_party/WebKit/Source/core/page/DragController.cpp
@@ -46,7 +46,7 @@
#include "core/editing/commands/DragAndDropCommand.h"
#include "core/editing/serializers/Serialization.h"
#include "core/events/TextEvent.h"
-#include "core/fetch/ImageResource.h"
+#include "core/fetch/ImageResourceContent.h"
#include "core/fetch/ResourceFetcher.h"
#include "core/frame/FrameHost.h"
#include "core/frame/FrameView.h"
@@ -828,7 +828,7 @@ Node* DragController::draggableNode(const LocalFrame* src,
return node;
}
-static ImageResource* getImageResource(Element* element) {
+static ImageResourceContent* getImageResource(Element* element) {
DCHECK(element);
LayoutObject* layoutObject = element->layoutObject();
if (!layoutObject || !layoutObject->isImage())
@@ -839,7 +839,7 @@ static ImageResource* getImageResource(Element* element) {
static Image* getImage(Element* element) {
DCHECK(element);
- ImageResource* cachedImage = getImageResource(element);
+ ImageResourceContent* cachedImage = getImageResource(element);
return (cachedImage && !cachedImage->errorOccurred())
? cachedImage->getImage()
: nullptr;

Powered by Google App Engine
This is Rietveld 408576698