| 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 411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 422 } | 422 } |
| 423 | 423 |
| 424 void WebView::didExitModalLoop() | 424 void WebView::didExitModalLoop() |
| 425 { | 425 { |
| 426 ASSERT(pageLoadDeferrerStack().size()); | 426 ASSERT(pageLoadDeferrerStack().size()); |
| 427 pageLoadDeferrerStack().removeLast(); | 427 pageLoadDeferrerStack().removeLast(); |
| 428 } | 428 } |
| 429 | 429 |
| 430 void WebViewImpl::setMainFrame(WebFrame* frame) | 430 void WebViewImpl::setMainFrame(WebFrame* frame) |
| 431 { | 431 { |
| 432 frame->toImplBase()->initializeCoreFrame(&page()->frameHost(), 0, nullAtom,
nullAtom); | 432 frame->toImplBase()->initializeCoreFrame(&page()->frameHost(), 0, nullAtom,
nullAtom, nullAtom); |
| 433 } | 433 } |
| 434 | 434 |
| 435 void WebViewImpl::setCredentialManagerClient(WebCredentialManagerClient* webCred
entialManagerClient) | 435 void WebViewImpl::setCredentialManagerClient(WebCredentialManagerClient* webCred
entialManagerClient) |
| 436 { | 436 { |
| 437 ASSERT(m_page); | 437 ASSERT(m_page); |
| 438 provideCredentialManagerClientTo(*m_page, new CredentialManagerClient(webCre
dentialManagerClient)); | 438 provideCredentialManagerClientTo(*m_page, new CredentialManagerClient(webCre
dentialManagerClient)); |
| 439 } | 439 } |
| 440 | 440 |
| 441 void WebViewImpl::setPrerendererClient(WebPrerendererClient* prerendererClient) | 441 void WebViewImpl::setPrerendererClient(WebPrerendererClient* prerendererClient) |
| 442 { | 442 { |
| (...skipping 4190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4633 { | 4633 { |
| 4634 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than | 4634 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than |
| 4635 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. | 4635 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. |
| 4636 if (!page()) | 4636 if (!page()) |
| 4637 return 1; | 4637 return 1; |
| 4638 | 4638 |
| 4639 return page()->deviceScaleFactor(); | 4639 return page()->deviceScaleFactor(); |
| 4640 } | 4640 } |
| 4641 | 4641 |
| 4642 } // namespace blink | 4642 } // namespace blink |
| OLD | NEW |