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

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

Issue 732323004: Add use counter for credentialed CORS access from null origins. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: tweak spelling Created 6 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 unified diff | Download patch
« no previous file with comments | « Source/core/frame/UseCounter.h ('k') | Source/core/imagebitmap/ImageBitmapFactories.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 597
598 *status = NormalSourceImageStatus; 598 *status = NormalSourceImageStatus;
599 return sourceImage->imageForDefaultFrame(); 599 return sourceImage->imageForDefaultFrame();
600 } 600 }
601 601
602 bool HTMLImageElement::wouldTaintOrigin(SecurityOrigin* destinationSecurityOrigi n) const 602 bool HTMLImageElement::wouldTaintOrigin(SecurityOrigin* destinationSecurityOrigi n) const
603 { 603 {
604 ImageResource* image = cachedImage(); 604 ImageResource* image = cachedImage();
605 if (!image) 605 if (!image)
606 return false; 606 return false;
607 return !image->isAccessAllowed(destinationSecurityOrigin); 607 return !image->isAccessAllowed(&document(), destinationSecurityOrigin);
608 } 608 }
609 609
610 FloatSize HTMLImageElement::sourceSize() const 610 FloatSize HTMLImageElement::sourceSize() const
611 { 611 {
612 ImageResource* image = cachedImage(); 612 ImageResource* image = cachedImage();
613 if (!image) 613 if (!image)
614 return FloatSize(); 614 return FloatSize();
615 615
616 return FloatSize(image->imageSizeForRenderer(renderer(), 1.0f)); 616 return FloatSize(image->imageSizeForRenderer(renderer(), 1.0f));
617 } 617 }
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
712 } 712 }
713 713
714 void HTMLImageElement::setUseFallbackContent() 714 void HTMLImageElement::setUseFallbackContent()
715 { 715 {
716 m_useFallbackContent = true; 716 m_useFallbackContent = true;
717 if (document().inStyleRecalc()) 717 if (document().inStyleRecalc())
718 return; 718 return;
719 ensureUserAgentShadowRoot(); 719 ensureUserAgentShadowRoot();
720 } 720 }
721 } 721 }
OLDNEW
« no previous file with comments | « Source/core/frame/UseCounter.h ('k') | Source/core/imagebitmap/ImageBitmapFactories.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698