OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2013 Google, Inc. All rights reserved. | 2 * Copyright (C) 2016 Google, Inc. All rights reserved. |
Timothy Loh
2016/01/25 00:40:00
short license?
nainar
2016/01/25 03:48:24
Done.
| |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
12 * | 12 * |
13 * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY |
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 */ | 24 */ |
25 | 25 |
26 #ifndef FetchInitiatorInfo_h | 26 #include "core/frame/Deprecation.h" |
27 #define FetchInitiatorInfo_h | |
28 | 27 |
29 #include "wtf/Allocator.h" | 28 #include "core/frame/FrameConsole.h" |
30 #include "wtf/text/AtomicString.h" | 29 #include "core/frame/FrameHost.h" |
31 #include "wtf/text/TextPosition.h" | 30 #include "core/frame/LocalFrame.h" |
31 #include "core/frame/UseCounter.h" | |
32 #include "core/inspector/ConsoleMessage.h" | |
32 | 33 |
33 namespace blink { | 34 namespace blink { |
34 | 35 |
35 struct FetchInitiatorInfo { | 36 Deprecation::Deprecation() |
36 DISALLOW_NEW(); | 37 { |
37 FetchInitiatorInfo() | 38 m_CSSPropertyDeprecationBits.ensureSize(lastUnresolvedCSSProperty + 1); |
38 : name() | 39 m_CSSPropertyDeprecationBits.clearAll(); |
39 , position(TextPosition::belowRangePosition()) | 40 } |
40 , startTime(0.0) | 41 |
41 { | 42 Deprecation::~Deprecation() |
43 { | |
44 m_CSSPropertyDeprecationBits.clearAll(); | |
45 } | |
46 | |
47 void Deprecation::showConsoleWarning(const LocalFrame* frame, CSSPropertyID prop ertyID) | |
48 { | |
49 FrameHost* host = frame ? frame->host() : nullptr; | |
50 if (!frame && frame->host() && !host->deprecation().isSuppressed(propertyID) ) | |
Timothy Loh
2016/01/25 00:40:00
this condition makes no sense :/
alancutter (OOO until 2018)
2016/01/25 03:13:36
I think you want:
if (!host || host->deprecation(
nainar
2016/01/25 03:48:24
Fixed.
| |
51 return; | |
52 | |
53 String message = deprecationMessage(propertyID); | |
54 if (!message.isEmpty()) { | |
55 host->deprecation().suppress(propertyID); | |
56 frame->console().addMessage(ConsoleMessage::create(DeprecationMessageSou rce, WarningMessageLevel, message)); | |
42 } | 57 } |
58 } | |
43 | 59 |
44 // When adding members, CrossThreadFetchInitiatorInfoData should be | 60 String Deprecation::deprecationMessage(CSSPropertyID cssPropertyID) |
45 // updated. | 61 { |
46 AtomicString name; | 62 switch (cssPropertyID) { |
47 TextPosition position; | 63 case CSSPropertyWebkitBackgroundComposite: |
48 double startTime; | 64 return UseCounter::willBeRemoved("'-webkit-background-composite'", 51, " 6607299456008192"); |
49 }; | 65 default: |
50 | 66 return emptyString(); |
51 // Encode AtomicString as String to cross threads. | |
52 struct CrossThreadFetchInitiatorInfoData { | |
53 DISALLOW_NEW(); | |
54 explicit CrossThreadFetchInitiatorInfoData(const FetchInitiatorInfo& info) | |
55 : name(info.name.string().isolatedCopy()) | |
56 , position(info.position) | |
57 , startTime(info.startTime) | |
58 { | |
59 } | 67 } |
60 | 68 } |
61 operator FetchInitiatorInfo() const | |
62 { | |
63 FetchInitiatorInfo info; | |
64 info.name = AtomicString(name); | |
65 info.position = position; | |
66 info.startTime = startTime; | |
67 return info; | |
68 } | |
69 | |
70 String name; | |
71 TextPosition position; | |
72 double startTime; | |
73 }; | |
74 | 69 |
75 } // namespace blink | 70 } // namespace blink |
76 | |
77 #endif | |
OLD | NEW |