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

Unified Diff: Source/web/ContextMenuClientImpl.cpp

Issue 1112513005: Reload image bypassing the cache (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Using ExtraData Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: Source/web/ContextMenuClientImpl.cpp
diff --git a/Source/web/ContextMenuClientImpl.cpp b/Source/web/ContextMenuClientImpl.cpp
index e7d9688ba2e7411ecc4141a9c6953e01668ff079..e11fbdd30de09dd84dc258fd26ff1a7d3bbb3e4f 100644
--- a/Source/web/ContextMenuClientImpl.cpp
+++ b/Source/web/ContextMenuClientImpl.cpp
@@ -46,6 +46,7 @@
#include "core/frame/Settings.h"
#include "core/html/HTMLAnchorElement.h"
#include "core/html/HTMLFormElement.h"
+#include "core/html/HTMLImageElement.h"
#include "core/html/HTMLInputElement.h"
#include "core/html/HTMLMediaElement.h"
#include "core/html/HTMLPlugInElement.h"
@@ -60,12 +61,12 @@
#include "core/page/Page.h"
#include "platform/ContextMenu.h"
#include "platform/Widget.h"
+#include "platform/exported/WrappedResourceResponse.h"
#include "platform/text/TextBreakIterator.h"
#include "platform/weborigin/KURL.h"
#include "public/platform/WebPoint.h"
#include "public/platform/WebString.h"
#include "public/platform/WebURL.h"
-#include "public/platform/WebURLResponse.h"
#include "public/platform/WebVector.h"
#include "public/web/WebContextMenuData.h"
#include "public/web/WebFormElement.h"
@@ -230,6 +231,13 @@ void ContextMenuClientImpl::showContextMenu(const ContextMenu* defaultMenu)
// An image can be null for many reasons, like being blocked, no image
// data received from server yet.
data.hasImageContents = r.image() && !r.image()->isNull();
+ if (data.hasImageContents) {
+ HTMLImageElement* imageElement = toHTMLImageElement(r.innerNodeOrImageMapImage());
+ if (imageElement && imageElement->getResponse())
Nate Chapin 2015/05/05 22:05:44 Oh, I forgot. Since response() shouldn't return nu
megjablon 2015/05/06 18:33:01 Done.
+ data.imageResponseExtraData = WrappedResourceResponse(imageElement->getResponse()).extraData();
+ else
+ data.imageResponseExtraData = 0;
Nate Chapin 2015/05/05 22:03:49 This else clause isn't necessary if this is proper
megjablon 2015/05/06 18:33:01 Done.
+ }
} else if (!r.absoluteMediaURL().isEmpty()) {
data.srcURL = r.absoluteMediaURL();

Powered by Google App Engine
This is Rietveld 408576698