| 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 26 matching lines...) Expand all Loading... |
| 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 } | 43 } |
| 44 | 44 |
| 45 unsigned short PerformanceNavigation::type() const | 45 unsigned short PerformanceNavigation::type() const |
| 46 { | 46 { |
| 47 if (!m_frame) | 47 if (!localFrame()) |
| 48 return TYPE_NAVIGATE; | 48 return TYPE_NAVIGATE; |
| 49 | 49 |
| 50 DocumentLoader* documentLoader = m_frame->loader().documentLoader(); | 50 DocumentLoader* documentLoader = localFrame()->loader().documentLoader(); |
| 51 if (!documentLoader) | 51 if (!documentLoader) |
| 52 return TYPE_NAVIGATE; | 52 return TYPE_NAVIGATE; |
| 53 | 53 |
| 54 switch (documentLoader->navigationType()) { | 54 switch (documentLoader->navigationType()) { |
| 55 case NavigationTypeReload: | 55 case NavigationTypeReload: |
| 56 return TYPE_RELOAD; | 56 return TYPE_RELOAD; |
| 57 case NavigationTypeBackForward: | 57 case NavigationTypeBackForward: |
| 58 return TYPE_BACK_FORWARD; | 58 return TYPE_BACK_FORWARD; |
| 59 default: | 59 default: |
| 60 return TYPE_NAVIGATE; | 60 return TYPE_NAVIGATE; |
| 61 } | 61 } |
| 62 } | 62 } |
| 63 | 63 |
| 64 unsigned short PerformanceNavigation::redirectCount() const | 64 unsigned short PerformanceNavigation::redirectCount() const |
| 65 { | 65 { |
| 66 if (!m_frame) | 66 if (!localFrame()) |
| 67 return 0; | 67 return 0; |
| 68 | 68 |
| 69 DocumentLoader* loader = m_frame->loader().documentLoader(); | 69 DocumentLoader* loader = localFrame()->loader().documentLoader(); |
| 70 if (!loader) | 70 if (!loader) |
| 71 return 0; | 71 return 0; |
| 72 | 72 |
| 73 DocumentLoadTiming* timing = loader->timing(); | 73 DocumentLoadTiming* timing = loader->timing(); |
| 74 if (timing->hasCrossOriginRedirect()) | 74 if (timing->hasCrossOriginRedirect()) |
| 75 return 0; | 75 return 0; |
| 76 | 76 |
| 77 return timing->redirectCount(); | 77 return timing->redirectCount(); |
| 78 } | 78 } |
| 79 | 79 |
| 80 void PerformanceNavigation::trace(Visitor* visitor) | 80 void PerformanceNavigation::trace(Visitor* visitor) |
| 81 { | 81 { |
| 82 DOMWindowProperty::trace(visitor); | 82 DOMWindowProperty::trace(visitor); |
| 83 } | 83 } |
| 84 | 84 |
| 85 } // namespace blink | 85 } // namespace blink |
| OLD | NEW |