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

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

Issue 2469873002: [ImageResource 4] Split ImageResource into Resource and Image parts (Closed)
Patch Set: style Created 4 years 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 8a439f75018f8ab3745ac250cef85eef87e3e3f3..ef4d262305f5e02a27fbb81b4342444aef5772b6 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"
@@ -829,7 +829,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())
@@ -840,7 +840,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