Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Side by Side Diff: third_party/WebKit/Source/core/timing/PerformanceNavigation.cpp

Issue 2655143002: Drop replacesCurrentHistoryItem, NavigationType (Closed)
Patch Set: More compile fixes Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 : ContextClient(frame) {} 43 : ContextClient(frame) {}
44 44
45 unsigned short PerformanceNavigation::type() const { 45 unsigned short PerformanceNavigation::type() const {
46 if (!frame()) 46 if (!frame())
47 return kTypeNavigate; 47 return kTypeNavigate;
48 48
49 DocumentLoader* documentLoader = frame()->loader().documentLoader(); 49 DocumentLoader* documentLoader = frame()->loader().documentLoader();
50 if (!documentLoader) 50 if (!documentLoader)
51 return kTypeNavigate; 51 return kTypeNavigate;
52 52
53 switch (documentLoader->getNavigationType()) { 53 switch (documentLoader->loadType()) {
54 case NavigationTypeReload: 54 case FrameLoadTypeReload:
55 case FrameLoadTypeReloadMainResource:
55 return kTypeReload; 56 return kTypeReload;
56 case NavigationTypeBackForward: 57 case FrameLoadTypeBackForward:
58 case FrameLoadTypeInitialHistoryLoad:
57 return kTypeBackForward; 59 return kTypeBackForward;
58 default: 60 default:
59 return kTypeNavigate; 61 return kTypeNavigate;
60 } 62 }
61 } 63 }
62 64
63 unsigned short PerformanceNavigation::redirectCount() const { 65 unsigned short PerformanceNavigation::redirectCount() const {
64 if (!frame()) 66 if (!frame())
65 return 0; 67 return 0;
66 68
(...skipping 14 matching lines...) Expand all
81 result.addNumber("type", type()); 83 result.addNumber("type", type());
82 result.addNumber("redirectCount", redirectCount()); 84 result.addNumber("redirectCount", redirectCount());
83 return result.scriptValue(); 85 return result.scriptValue();
84 } 86 }
85 87
86 DEFINE_TRACE(PerformanceNavigation) { 88 DEFINE_TRACE(PerformanceNavigation) {
87 ContextClient::trace(visitor); 89 ContextClient::trace(visitor);
88 } 90 }
89 91
90 } // namespace blink 92 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/timing/PerformanceBaseTest.cpp ('k') | third_party/WebKit/Source/web/FrameLoaderClientImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698