| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 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 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 void WebView::didExitModalLoop() | 283 void WebView::didExitModalLoop() |
| 284 { | 284 { |
| 285 ASSERT(pageGroupLoadDeferrerStack().size()); | 285 ASSERT(pageGroupLoadDeferrerStack().size()); |
| 286 | 286 |
| 287 delete pageGroupLoadDeferrerStack().last(); | 287 delete pageGroupLoadDeferrerStack().last(); |
| 288 pageGroupLoadDeferrerStack().removeLast(); | 288 pageGroupLoadDeferrerStack().removeLast(); |
| 289 } | 289 } |
| 290 | 290 |
| 291 void WebViewImpl::setMainFrame(WebFrame* frame) | 291 void WebViewImpl::setMainFrame(WebFrame* frame) |
| 292 { | 292 { |
| 293 // NOTE: The WebFrameImpl takes a reference to itself within | |
| 294 // initializeAsMainFrame() and releases that reference once the | |
| 295 // corresponding Frame is destroyed. | |
| 296 toWebFrameImpl(frame)->initializeAsMainFrame(page()); | 293 toWebFrameImpl(frame)->initializeAsMainFrame(page()); |
| 297 } | 294 } |
| 298 | 295 |
| 299 void WebViewImpl::setAutofillClient(WebAutofillClient* autofillClient) | 296 void WebViewImpl::setAutofillClient(WebAutofillClient* autofillClient) |
| 300 { | 297 { |
| 301 m_autofillClient = autofillClient; | 298 m_autofillClient = autofillClient; |
| 302 } | 299 } |
| 303 | 300 |
| 304 void WebViewImpl::setDevToolsAgentClient(WebDevToolsAgentClient* devToolsClient) | 301 void WebViewImpl::setDevToolsAgentClient(WebDevToolsAgentClient* devToolsClient) |
| 305 { | 302 { |
| (...skipping 3710 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4016 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4013 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
| 4017 | 4014 |
| 4018 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4015 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 4019 return false; | 4016 return false; |
| 4020 | 4017 |
| 4021 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4018 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4022 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4019 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4023 } | 4020 } |
| 4024 | 4021 |
| 4025 } // namespace blink | 4022 } // namespace blink |
| OLD | NEW |