| 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 22 matching lines...) Expand all Loading... |
| 33 | 33 |
| 34 #include "core/frame/LocalFrame.h" | 34 #include "core/frame/LocalFrame.h" |
| 35 #include "core/loader/DocumentLoader.h" | 35 #include "core/loader/DocumentLoader.h" |
| 36 #include "core/loader/FrameLoaderTypes.h" | 36 #include "core/loader/FrameLoaderTypes.h" |
| 37 | 37 |
| 38 namespace blink { | 38 namespace blink { |
| 39 | 39 |
| 40 PerformanceNavigation::PerformanceNavigation(LocalFrame* frame) | 40 PerformanceNavigation::PerformanceNavigation(LocalFrame* frame) |
| 41 : DOMWindowProperty(frame) | 41 : DOMWindowProperty(frame) |
| 42 { | 42 { |
| 43 ScriptWrappable::init(this); | |
| 44 } | 43 } |
| 45 | 44 |
| 46 unsigned short PerformanceNavigation::type() const | 45 unsigned short PerformanceNavigation::type() const |
| 47 { | 46 { |
| 48 if (!m_frame) | 47 if (!m_frame) |
| 49 return TYPE_NAVIGATE; | 48 return TYPE_NAVIGATE; |
| 50 | 49 |
| 51 DocumentLoader* documentLoader = m_frame->loader().documentLoader(); | 50 DocumentLoader* documentLoader = m_frame->loader().documentLoader(); |
| 52 if (!documentLoader) | 51 if (!documentLoader) |
| 53 return TYPE_NAVIGATE; | 52 return TYPE_NAVIGATE; |
| (...skipping 19 matching lines...) Expand all Loading... |
| 73 return 0; | 72 return 0; |
| 74 | 73 |
| 75 DocumentLoadTiming* timing = loader->timing(); | 74 DocumentLoadTiming* timing = loader->timing(); |
| 76 if (timing->hasCrossOriginRedirect()) | 75 if (timing->hasCrossOriginRedirect()) |
| 77 return 0; | 76 return 0; |
| 78 | 77 |
| 79 return timing->redirectCount(); | 78 return timing->redirectCount(); |
| 80 } | 79 } |
| 81 | 80 |
| 82 } // namespace blink | 81 } // namespace blink |
| OLD | NEW |