Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #ifndef WebTransitionElementData_h | 31 #ifndef WebTransitionElementData_h |
| 32 #define WebTransitionElementData_h | 32 #define WebTransitionElementData_h |
| 33 | 33 |
| 34 #if INSIDE_BLINK | |
| 35 #include "core/dom/Document.h" | |
|
Nate Chapin
2014/11/13 19:27:30
Including core/ from public/web/ is a layering vio
Zhen Wang
2014/11/13 21:56:03
I see. Assigning the values in FrameLoaderClientIm
| |
| 36 #endif | |
| 34 #include "../platform/WebRect.h" | 37 #include "../platform/WebRect.h" |
| 35 #include "../platform/WebString.h" | 38 #include "../platform/WebString.h" |
| 36 #include "../platform/WebVector.h" | 39 #include "../platform/WebVector.h" |
| 37 | 40 |
| 38 namespace blink { | 41 namespace blink { |
| 39 | 42 |
| 40 struct WebTransitionElement { | 43 struct WebTransitionElement { |
| 41 WebString id; | 44 WebString id; |
| 42 WebRect rect; | 45 WebRect rect; |
| 46 | |
| 47 WebTransitionElement() | |
| 48 : id(WebString()) | |
| 49 , rect(WebRect()) { } | |
| 50 | |
| 51 #if INSIDE_BLINK | |
| 52 WebTransitionElement(const Document::TransitionElement& element) | |
| 53 : id(element.id) | |
| 54 , rect(element.rect) { } | |
| 55 #endif | |
| 43 }; | 56 }; |
| 44 | 57 |
| 45 struct WebTransitionElementData { | 58 struct WebTransitionElementData { |
| 46 WebString scope; | 59 WebString scope; |
| 47 WebString selector; | 60 WebString selector; |
| 48 WebString markup; | 61 WebString markup; |
| 49 WebVector<WebTransitionElement> elements; | 62 WebVector<WebTransitionElement> elements; |
| 50 | 63 |
| 51 WebTransitionElementData(const WebString& scope, const WebString& selector, const WebString& markup, const WebVector<WebTransitionElement>& elements) | 64 WebTransitionElementData(const WebString& scope, const WebString& selector, const WebString& markup, const WebVector<WebTransitionElement>& elements) |
| 52 : scope(scope) | 65 : scope(scope) |
| 53 , selector(selector) | 66 , selector(selector) |
| 54 , markup(markup) | 67 , markup(markup) |
| 55 , elements(elements) { } | 68 , elements(elements) { } |
| 56 }; | 69 }; |
| 57 | 70 |
| 58 } // namespace blink | 71 } // namespace blink |
| 59 | 72 |
| 60 #endif | 73 #endif |
| OLD | NEW |