| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 12 matching lines...) Expand all Loading... |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 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 #include "core/timing/PerformanceNavigation.h" | 31 #include "core/timing/PerformanceNavigation.h" |
| 32 | 32 |
| 33 #include "bindings/core/v8/ScriptValue.h" |
| 34 #include "bindings/core/v8/V8ObjectBuilder.h" |
| 33 #include "core/frame/LocalFrame.h" | 35 #include "core/frame/LocalFrame.h" |
| 34 #include "core/loader/DocumentLoader.h" | 36 #include "core/loader/DocumentLoader.h" |
| 35 #include "core/loader/FrameLoaderTypes.h" | 37 #include "core/loader/FrameLoaderTypes.h" |
| 36 | 38 |
| 37 namespace blink { | 39 namespace blink { |
| 38 | 40 |
| 39 PerformanceNavigation::PerformanceNavigation(LocalFrame* frame) | 41 PerformanceNavigation::PerformanceNavigation(LocalFrame* frame) |
| 40 : DOMWindowProperty(frame) {} | 42 : DOMWindowProperty(frame) {} |
| 41 | 43 |
| 42 unsigned short PerformanceNavigation::type() const { | 44 unsigned short PerformanceNavigation::type() const { |
| (...skipping 22 matching lines...) Expand all Loading... |
| 65 if (!loader) | 67 if (!loader) |
| 66 return 0; | 68 return 0; |
| 67 | 69 |
| 68 const DocumentLoadTiming& timing = loader->timing(); | 70 const DocumentLoadTiming& timing = loader->timing(); |
| 69 if (timing.hasCrossOriginRedirect()) | 71 if (timing.hasCrossOriginRedirect()) |
| 70 return 0; | 72 return 0; |
| 71 | 73 |
| 72 return timing.redirectCount(); | 74 return timing.redirectCount(); |
| 73 } | 75 } |
| 74 | 76 |
| 77 ScriptValue PerformanceNavigation::toJSONForBinding( |
| 78 ScriptState* scriptState) const { |
| 79 V8ObjectBuilder result(scriptState); |
| 80 result.addNumber("type", type()); |
| 81 result.addNumber("redirectCount", redirectCount()); |
| 82 return result.scriptValue(); |
| 83 } |
| 84 |
| 75 DEFINE_TRACE(PerformanceNavigation) { | 85 DEFINE_TRACE(PerformanceNavigation) { |
| 76 DOMWindowProperty::trace(visitor); | 86 DOMWindowProperty::trace(visitor); |
| 77 } | 87 } |
| 78 | 88 |
| 79 } // namespace blink | 89 } // namespace blink |
| OLD | NEW |