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

Side by Side Diff: Source/core/fetch/CSSStyleSheetResource.h

Issue 1169713004: Allow lax MIME type parsing for same-origin CSS in quirks mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Comment. Created 5 years, 6 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
« no previous file with comments | « Source/core/css/StyleSheetContents.cpp ('k') | Source/core/fetch/CSSStyleSheetResource.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) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
3 Copyright (C) 2001 Dirk Mueller <mueller@kde.org> 3 Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
4 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 4 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
5 Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 5 Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple 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 20 matching lines...) Expand all
31 #include "platform/heap/Handle.h" 31 #include "platform/heap/Handle.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 class CSSParserContext; 35 class CSSParserContext;
36 class ResourceClient; 36 class ResourceClient;
37 class StyleSheetContents; 37 class StyleSheetContents;
38 38
39 class CSSStyleSheetResource final : public StyleSheetResource { 39 class CSSStyleSheetResource final : public StyleSheetResource {
40 public: 40 public:
41 enum class MIMETypeCheck { Strict, Lax };
42
41 CSSStyleSheetResource(const ResourceRequest&, const String& charset); 43 CSSStyleSheetResource(const ResourceRequest&, const String& charset);
42 virtual ~CSSStyleSheetResource(); 44 virtual ~CSSStyleSheetResource();
43 DECLARE_VIRTUAL_TRACE(); 45 DECLARE_VIRTUAL_TRACE();
44 46
45 const String sheetText(bool* hasValidMIMEType = 0) const; 47 const String sheetText(MIMETypeCheck = MIMETypeCheck::Strict) const;
46 48
47 const AtomicString mimeType() const; 49 const AtomicString mimeType() const;
48 50
49 virtual void didAddClient(ResourceClient*) override; 51 virtual void didAddClient(ResourceClient*) override;
50 52
51 PassRefPtrWillBeRawPtr<StyleSheetContents> restoreParsedStyleSheet(const CSS ParserContext&); 53 PassRefPtrWillBeRawPtr<StyleSheetContents> restoreParsedStyleSheet(const CSS ParserContext&);
52 void saveParsedStyleSheet(PassRefPtrWillBeRawPtr<StyleSheetContents>); 54 void saveParsedStyleSheet(PassRefPtrWillBeRawPtr<StyleSheetContents>);
53 55
54 protected: 56 protected:
55 virtual bool isSafeToUnlock() const override; 57 virtual bool isSafeToUnlock() const override;
56 virtual void destroyDecodedDataIfPossible() override; 58 virtual void destroyDecodedDataIfPossible() override;
57 59
58 private: 60 private:
59 bool canUseSheet(bool* hasValidMIMEType) const; 61 bool canUseSheet(MIMETypeCheck) const;
60 virtual void dispose() override; 62 virtual void dispose() override;
61 virtual void checkNotify() override; 63 virtual void checkNotify() override;
62 64
63 String m_decodedSheetText; 65 String m_decodedSheetText;
64 66
65 RefPtrWillBeMember<StyleSheetContents> m_parsedStyleSheetCache; 67 RefPtrWillBeMember<StyleSheetContents> m_parsedStyleSheetCache;
66 }; 68 };
67 69
68 DEFINE_RESOURCE_TYPE_CASTS(CSSStyleSheet); 70 DEFINE_RESOURCE_TYPE_CASTS(CSSStyleSheet);
69 71
70 } 72 }
71 73
72 #endif 74 #endif
OLDNEW
« no previous file with comments | « Source/core/css/StyleSheetContents.cpp ('k') | Source/core/fetch/CSSStyleSheetResource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698