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

Side by Side Diff: Source/core/html/HTMLImageElement.cpp

Issue 22604008: Allow SVG images to not taint the canvas with drawImage/drawPattern (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Apple Inc. All rights reserv ed. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Apple Inc. All rights reserv ed.
5 * Copyright (C) 2010 Google Inc. All rights reserved. 5 * Copyright (C) 2010 Google Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 10 matching lines...) Expand all
21 */ 21 */
22 22
23 #include "config.h" 23 #include "config.h"
24 #include "core/html/HTMLImageElement.h" 24 #include "core/html/HTMLImageElement.h"
25 25
26 #include "CSSPropertyNames.h" 26 #include "CSSPropertyNames.h"
27 #include "HTMLNames.h" 27 #include "HTMLNames.h"
28 #include "bindings/v8/ScriptEventListener.h" 28 #include "bindings/v8/ScriptEventListener.h"
29 #include "core/dom/Attribute.h" 29 #include "core/dom/Attribute.h"
30 #include "core/dom/EventNames.h" 30 #include "core/dom/EventNames.h"
31 #include "core/html/HTMLAnchorElement.h"
31 #include "core/html/HTMLFormElement.h" 32 #include "core/html/HTMLFormElement.h"
32 #include "core/html/parser/HTMLParserIdioms.h" 33 #include "core/html/parser/HTMLParserIdioms.h"
33 #include "core/loader/cache/ImageResource.h" 34 #include "core/loader/cache/ImageResource.h"
34 #include "core/rendering/RenderImage.h" 35 #include "core/rendering/RenderImage.h"
35 36
36 using namespace std; 37 using namespace std;
37 38
38 namespace WebCore { 39 namespace WebCore {
39 40
40 using namespace HTMLNames; 41 using namespace HTMLNames;
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 } 108 }
108 109
109 void HTMLImageElement::parseAttribute(const QualifiedName& name, const AtomicStr ing& value) 110 void HTMLImageElement::parseAttribute(const QualifiedName& name, const AtomicStr ing& value)
110 { 111 {
111 if (name == altAttr) { 112 if (name == altAttr) {
112 if (renderer() && renderer()->isImage()) 113 if (renderer() && renderer()->isImage())
113 toRenderImage(renderer())->updateAltText(); 114 toRenderImage(renderer())->updateAltText();
114 } else if (name == srcAttr) 115 } else if (name == srcAttr)
115 m_imageLoader.updateFromElementIgnoringPreviousError(); 116 m_imageLoader.updateFromElementIgnoringPreviousError();
116 else if (name == usemapAttr) 117 else if (name == usemapAttr)
117 setIsLink(!value.isNull()); 118 setIsLink(!value.isNull() && !shouldProhibitLinks(this));
abarth-chromium 2013/08/12 19:47:44 Can we have an ASSERT in setIsLink?
pdr. 2013/08/19 23:16:17 Done.
118 else if (name == onbeforeloadAttr) 119 else if (name == onbeforeloadAttr)
119 setAttributeEventListener(eventNames().beforeloadEvent, createAttributeE ventListener(this, name, value)); 120 setAttributeEventListener(eventNames().beforeloadEvent, createAttributeE ventListener(this, name, value));
120 else if (name == compositeAttr) { 121 else if (name == compositeAttr) {
121 // FIXME: images don't support blend modes in their compositing attribut e. 122 // FIXME: images don't support blend modes in their compositing attribut e.
122 BlendMode blendOp = BlendModeNormal; 123 BlendMode blendOp = BlendModeNormal;
123 if (!parseCompositeAndBlendOperator(value, m_compositeOperator, blendOp) ) 124 if (!parseCompositeAndBlendOperator(value, m_compositeOperator, blendOp) )
124 m_compositeOperator = CompositeSourceOver; 125 m_compositeOperator = CompositeSourceOver;
125 } else 126 } else
126 HTMLElement::parseAttribute(name, value); 127 HTMLElement::parseAttribute(name, value);
127 } 128 }
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 362
362 Image* HTMLImageElement::imageContents() 363 Image* HTMLImageElement::imageContents()
363 { 364 {
364 if (!m_imageLoader.imageComplete()) 365 if (!m_imageLoader.imageComplete())
365 return 0; 366 return 0;
366 367
367 return m_imageLoader.image()->image(); 368 return m_imageLoader.image()->image();
368 } 369 }
369 370
370 } 371 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698