| 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 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 void WebView::didExitModalLoop() | 292 void WebView::didExitModalLoop() |
| 293 { | 293 { |
| 294 ASSERT(pageGroupLoadDeferrerStack().size()); | 294 ASSERT(pageGroupLoadDeferrerStack().size()); |
| 295 | 295 |
| 296 delete pageGroupLoadDeferrerStack().last(); | 296 delete pageGroupLoadDeferrerStack().last(); |
| 297 pageGroupLoadDeferrerStack().removeLast(); | 297 pageGroupLoadDeferrerStack().removeLast(); |
| 298 } | 298 } |
| 299 | 299 |
| 300 void WebViewImpl::setMainFrame(WebFrame* frame) | 300 void WebViewImpl::setMainFrame(WebFrame* frame) |
| 301 { | 301 { |
| 302 // NOTE: The WebFrameImpl takes a reference to itself within | |
| 303 // initializeAsMainFrame() and releases that reference once the | |
| 304 // corresponding Frame is destroyed. | |
| 305 toWebFrameImpl(frame)->initializeAsMainFrame(page()); | 302 toWebFrameImpl(frame)->initializeAsMainFrame(page()); |
| 306 } | 303 } |
| 307 | 304 |
| 308 void WebViewImpl::setAutofillClient(WebAutofillClient* autofillClient) | 305 void WebViewImpl::setAutofillClient(WebAutofillClient* autofillClient) |
| 309 { | 306 { |
| 310 m_autofillClient = autofillClient; | 307 m_autofillClient = autofillClient; |
| 311 } | 308 } |
| 312 | 309 |
| 313 void WebViewImpl::setDevToolsAgentClient(WebDevToolsAgentClient* devToolsClient) | 310 void WebViewImpl::setDevToolsAgentClient(WebDevToolsAgentClient* devToolsClient) |
| 314 { | 311 { |
| (...skipping 3844 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4159 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4156 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
| 4160 | 4157 |
| 4161 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4158 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 4162 return false; | 4159 return false; |
| 4163 | 4160 |
| 4164 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4161 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4165 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4162 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4166 } | 4163 } |
| 4167 | 4164 |
| 4168 } // namespace blink | 4165 } // namespace blink |
| OLD | NEW |