| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2006 Apple Computer, 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 void set_plugin_delegate(WebPluginDelegate* plugin_delegate) { | 210 void set_plugin_delegate(WebPluginDelegate* plugin_delegate) { |
| 211 plugin_delegate_ = plugin_delegate; | 211 plugin_delegate_ = plugin_delegate; |
| 212 } | 212 } |
| 213 | 213 |
| 214 WebCore::Frame* frame() const { | 214 WebCore::Frame* frame() const { |
| 215 return frame_; | 215 return frame_; |
| 216 } | 216 } |
| 217 | 217 |
| 218 static WebFrameImpl* FromFrame(WebCore::Frame* frame); | 218 static WebFrameImpl* FromFrame(WebCore::Frame* frame); |
| 219 | 219 |
| 220 WebViewImpl* webview_impl() const { | 220 WebViewImpl* GetWebViewImpl() const; |
| 221 return webview_impl_; | |
| 222 } | |
| 223 | 221 |
| 224 WebCore::FrameView* frameview() const { | 222 WebCore::FrameView* frameview() const { |
| 225 return frame_ ? frame_->view() : NULL; | 223 return frame_ ? frame_->view() : NULL; |
| 226 } | 224 } |
| 227 | 225 |
| 228 // Update the given datasource with currently_loading_request's info. | 226 // Update the given datasource with currently_loading_request's info. |
| 229 // If currently_loading_request is NULL, does nothing. | 227 // If currently_loading_request is NULL, does nothing. |
| 230 void CacheCurrentRequestInfo(WebDataSourceImpl* datasource); | 228 void CacheCurrentRequestInfo(WebDataSourceImpl* datasource); |
| 231 | 229 |
| 232 void set_currently_loading_history_item(WebHistoryItemImpl* item); | 230 void set_currently_loading_history_item(WebHistoryItemImpl* item); |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 | 295 |
| 298 // Used to check for leaks of this object. | 296 // Used to check for leaks of this object. |
| 299 static int live_object_count_; | 297 static int live_object_count_; |
| 300 | 298 |
| 301 WebFrameLoaderClient frame_loader_client_; | 299 WebFrameLoaderClient frame_loader_client_; |
| 302 | 300 |
| 303 // This is a factory for creating cancelable tasks for this frame that run | 301 // This is a factory for creating cancelable tasks for this frame that run |
| 304 // asynchronously in order to scope string matches during a find operation. | 302 // asynchronously in order to scope string matches during a find operation. |
| 305 ScopedRunnableMethodFactory<WebFrameImpl> scope_matches_factory_; | 303 ScopedRunnableMethodFactory<WebFrameImpl> scope_matches_factory_; |
| 306 | 304 |
| 307 // This is a weak pointer to our containing WebViewImpl. | |
| 308 WebViewImpl* webview_impl_; | |
| 309 | |
| 310 // This is a weak pointer to our corresponding WebCore frame. A reference to | 305 // This is a weak pointer to our corresponding WebCore frame. A reference to |
| 311 // ourselves is held while frame_ is valid. See our Closing method. | 306 // ourselves is held while frame_ is valid. See our Closing method. |
| 312 WebCore::Frame* frame_; | 307 WebCore::Frame* frame_; |
| 313 | 308 |
| 314 // This holds the request passed to LoadRequest, for access by the | 309 // This holds the request passed to LoadRequest, for access by the |
| 315 // WebFrameLoaderClient. Unfortunately we have no other way to pass this | 310 // WebFrameLoaderClient. Unfortunately we have no other way to pass this |
| 316 // information to him. Only non-NULL during a call to LoadRequest. | 311 // information to him. Only non-NULL during a call to LoadRequest. |
| 317 const WebRequest* currently_loading_request_; | 312 const WebRequest* currently_loading_request_; |
| 318 | 313 |
| 319 // Similar to currently_loading_request_, except this will be set when | 314 // Similar to currently_loading_request_, except this will be set when |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 429 // The input fields that are interested in edit events and their associated | 424 // The input fields that are interested in edit events and their associated |
| 430 // listeners. | 425 // listeners. |
| 431 typedef HashMap<RefPtr<WebCore::HTMLInputElement>, | 426 typedef HashMap<RefPtr<WebCore::HTMLInputElement>, |
| 432 webkit_glue::PasswordAutocompleteListener*> PasswordListenerMap; | 427 webkit_glue::PasswordAutocompleteListener*> PasswordListenerMap; |
| 433 PasswordListenerMap password_listeners_; | 428 PasswordListenerMap password_listeners_; |
| 434 | 429 |
| 435 DISALLOW_COPY_AND_ASSIGN(WebFrameImpl); | 430 DISALLOW_COPY_AND_ASSIGN(WebFrameImpl); |
| 436 }; | 431 }; |
| 437 | 432 |
| 438 #endif // WEBKIT_GLUE_WEBFRAME_IMPL_H_ | 433 #endif // WEBKIT_GLUE_WEBFRAME_IMPL_H_ |
| OLD | NEW |