Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google, Inc. All rights reserved. | 2 * Copyright (C) 2016 Google, Inc. All rights reserved. |
| 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::showDeprecationWarning(const LocalFrame* frame, CSSPropertyID propertyID) | |
| 48 { | |
| 49 if (!frame) | |
| 50 return; | |
| 51 FrameHost* host = frame->host(); | |
| 52 if (!host) | |
| 53 return; | |
|
alancutter (OOO until 2018)
2016/01/21 02:45:57
These ifs can be combined, I'd put isSuppressed()
nainar
2016/01/21 02:55:47
Done.
| |
| 54 | |
| 55 String message = deprecationMessage(propertyID); | |
| 56 if (!host->deprecation().isSuppressed(propertyID) && !message.isEmpty()) { | |
| 57 host->deprecation().suppress(propertyID); | |
| 58 frame->console().addMessage(ConsoleMessage::create(DeprecationMessageSou rce, WarningMessageLevel, message)); | |
| 42 } | 59 } |
| 60 } | |
| 43 | 61 |
| 44 // When adding members, CrossThreadFetchInitiatorInfoData should be | 62 String Deprecation::deprecationMessage(CSSPropertyID cssPropertyID) |
| 45 // updated. | 63 { |
| 46 AtomicString name; | 64 switch (cssPropertyID) { |
| 47 TextPosition position; | 65 case CSSPropertyWebkitBackgroundComposite: |
| 48 double startTime; | 66 return UseCounter::willBeRemoved("'-webkit-background-composite'", 51, " 6607299456008192"); |
| 49 }; | 67 default: |
| 50 | 68 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 } | 69 } |
| 60 | 70 } |
| 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 | 71 |
| 75 } // namespace blink | 72 } // namespace blink |
| 76 | |
| 77 #endif | |
| OLD | NEW |