OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
120 case NavigationTypeReload: | 120 case NavigationTypeReload: |
121 return WebNavigationTypeReload; | 121 return WebNavigationTypeReload; |
122 case NavigationTypeFormResubmitted: | 122 case NavigationTypeFormResubmitted: |
123 return WebNavigationTypeFormResubmitted; | 123 return WebNavigationTypeFormResubmitted; |
124 case NavigationTypeOther: | 124 case NavigationTypeOther: |
125 default: | 125 default: |
126 return WebNavigationTypeOther; | 126 return WebNavigationTypeOther; |
127 } | 127 } |
128 } | 128 } |
129 | 129 |
130 WebURL WebDataSourceImpl::endOfRedirectChain() const | 130 const KURL& WebDataSourceImpl::endOfRedirectChain() const |
131 { | 131 { |
132 ASSERT(!m_redirectChain.isEmpty()); | 132 ASSERT(!m_redirectChain.isEmpty()); |
133 return m_redirectChain.last(); | 133 return m_redirectChain.last(); |
134 } | 134 } |
135 | 135 |
136 void WebDataSourceImpl::clearRedirectChain() | 136 void WebDataSourceImpl::clearRedirectChain() |
137 { | 137 { |
138 m_redirectChain.clear(); | 138 m_redirectChain.clear(); |
139 } | 139 } |
140 | 140 |
141 void WebDataSourceImpl::appendRedirect(const WebURL& url) | 141 void WebDataSourceImpl::appendRedirect(const KURL& url) |
142 { | 142 { |
143 m_redirectChain.append(url); | 143 m_redirectChain.append(url); |
144 } | 144 } |
145 | 145 |
146 void WebDataSourceImpl::setNextPluginLoadObserver(PassOwnPtr<WebPluginLoadObserver> observer) | 146 void WebDataSourceImpl::setNextPluginLoadObserver(PassOwnPtr<WebPluginLoadObserver> observer) |
147 { | 147 { |
148 // This call should always be followed up with the creation of a | 148 // This call should always be followed up with the creation of a |
149 // WebDataSourceImpl, so we should never leak this object. | 149 // WebDataSourceImpl, so we should never leak this object. |
150 m_nextPluginLoadObserver = observer.release(); | 150 m_nextPluginLoadObserver = observer.release(); |
151 } | 151 } |
(...skipping 12 matching lines...) Expand all Loading... |
164 m_nextPluginLoadObserver = 0; | 164 m_nextPluginLoadObserver = 0; |
165 } | 165 } |
166 } | 166 } |
167 } | 167 } |
168 | 168 |
169 WebDataSourceImpl::~WebDataSourceImpl() | 169 WebDataSourceImpl::~WebDataSourceImpl() |
170 { | 170 { |
171 } | 171 } |
172 | 172 |
173 } // namespace WebKit | 173 } // namespace WebKit |
OLD | NEW |