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 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
307 void WebView::didExitModalLoop() | 307 void WebView::didExitModalLoop() |
308 { | 308 { |
309 ASSERT(pageLoadDeferrerStack().size()); | 309 ASSERT(pageLoadDeferrerStack().size()); |
310 | 310 |
311 delete pageLoadDeferrerStack().last(); | 311 delete pageLoadDeferrerStack().last(); |
312 pageLoadDeferrerStack().removeLast(); | 312 pageLoadDeferrerStack().removeLast(); |
313 } | 313 } |
314 | 314 |
315 void WebViewImpl::setMainFrame(WebFrame* frame) | 315 void WebViewImpl::setMainFrame(WebFrame* frame) |
316 { | 316 { |
317 toWebLocalFrameImpl(frame)->initializeAsMainFrame(page()); | 317 frame->initializeAsMainFrame(this); |
318 } | 318 } |
319 | 319 |
320 void WebViewImpl::setAutofillClient(WebAutofillClient* autofillClient) | 320 void WebViewImpl::setAutofillClient(WebAutofillClient* autofillClient) |
321 { | 321 { |
322 m_autofillClient = autofillClient; | 322 m_autofillClient = autofillClient; |
323 } | 323 } |
324 | 324 |
325 void WebViewImpl::setDevToolsAgentClient(WebDevToolsAgentClient* devToolsClient) | 325 void WebViewImpl::setDevToolsAgentClient(WebDevToolsAgentClient* devToolsClient) |
326 { | 326 { |
327 if (devToolsClient) | 327 if (devToolsClient) |
(...skipping 3776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4104 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4104 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
4105 | 4105 |
4106 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4106 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
4107 return false; | 4107 return false; |
4108 | 4108 |
4109 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4109 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
4110 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4110 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
4111 } | 4111 } |
4112 | 4112 |
4113 } // namespace blink | 4113 } // namespace blink |
OLD | NEW |