Source/core/css/CSSImageValue.h - Issue 47923008: Block execution of failed 'crossorigin' <script>s.

Side by Side Diff: Source/core/css/CSSImageValue.h

Issue 47923008: Block execution of failed 'crossorigin' <script>s. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Remove RequestOriginPolicy + suggested improvements Created 7 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 unified diff | Download patch

« no previous file with comments | « LayoutTests/http/tests/security/script-onerror-crossorigin-same-origin-expected.txt ('k') | Source/core/css/CSSImageValue.cpp » ('j') | Source/core/fetch/ResourceFetcher.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)	2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)

3 * Copyright (C) 2004, 2005, 2006, 2008, 2012 Apple Inc. All rights reserved.	3 * Copyright (C) 2004, 2005, 2006, 2008, 2012 Apple Inc. All rights reserved.

4 *	4 *

5 * This library is free software; you can redistribute it and/or	5 * This library is free software; you can redistribute it and/or

6 * modify it under the terms of the GNU Library General Public	6 * modify it under the terms of the GNU Library General Public

7 * License as published by the Free Software Foundation; either	7 * License as published by the Free Software Foundation; either

8 * version 2 of the License, or (at your option) any later version.	8 * version 2 of the License, or (at your option) any later version.

9 *	9 *

10 * This library is distributed in the hope that it will be useful,	10 * This library is distributed in the hope that it will be useful,

(...skipping 20 matching lines...) Expand all Loading...
31 class StyleFetchedImage;	31 class StyleFetchedImage;

32 class StyleImage;	32 class StyleImage;

33 class RenderObject;	33 class RenderObject;

34	34

35 class CSSImageValue : public CSSValue {	35 class CSSImageValue : public CSSValue {

36 public:	36 public:

37 static PassRefPtr<CSSImageValue> create(const String& url) { return adoptRef (new CSSImageValue(url)); }	37 static PassRefPtr<CSSImageValue> create(const String& url) { return adoptRef (new CSSImageValue(url)); }

38 static PassRefPtr<CSSImageValue> create(const String& url, StyleImage* image ) { return adoptRef(new CSSImageValue(url, image)); }	38 static PassRefPtr<CSSImageValue> create(const String& url, StyleImage* image ) { return adoptRef(new CSSImageValue(url, image)); }

39 ~CSSImageValue();	39 ~CSSImageValue();

40	40

41 StyleFetchedImage* cachedImage(ResourceFetcher*, const ResourceLoaderOptions &);	41 StyleFetchedImage* cachedImage(ResourceFetcher*, const ResourceLoaderOptions &, OriginRestriction);

42 StyleFetchedImage* cachedImage(ResourceFetcher* loader) { return cachedImage (loader, ResourceFetcher::defaultResourceOptions()); }	42 StyleFetchedImage* cachedImage(ResourceFetcher* fetcher) { return cachedImag e(fetcher, ResourceFetcher::defaultResourceOptions(), RestrictToSameOrigin); }

43 // Returns a StyleFetchedImage if the image is cached already, otherwise a S tylePendingImage.	43 // Returns a StyleFetchedImage if the image is cached already, otherwise a S tylePendingImage.

44 StyleImage* cachedOrPendingImage();	44 StyleImage* cachedOrPendingImage();

45	45

46 const String& url() { return m_url; }	46 const String& url() { return m_url; }

47	47

48 String customCSSText() const;	48 String customCSSText() const;

49	49

50 PassRefPtr<CSSValue> cloneForCSSOM() const;	50 PassRefPtr<CSSValue> cloneForCSSOM() const;

51	51

52 bool hasFailedOrCanceledSubresources() const;	52 bool hasFailedOrCanceledSubresources() const;

(...skipping 12 matching lines...) Expand all Loading...
65 RefPtr<StyleImage> m_image;	65 RefPtr<StyleImage> m_image;

66 bool m_accessedImage;	66 bool m_accessedImage;

67 AtomicString m_initiatorName;	67 AtomicString m_initiatorName;

68 };	68 };

69	69

70 DEFINE_CSS_VALUE_TYPE_CASTS(CSSImageValue, isImageValue());	70 DEFINE_CSS_VALUE_TYPE_CASTS(CSSImageValue, isImageValue());

71	71

72 } // namespace WebCore	72 } // namespace WebCore

73	73

74 #endif // CSSImageValue_h	74 #endif // CSSImageValue_h

OLD	NEW