| 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 #include "core/page/InjectedStyleSheets.h" | 77 #include "core/page/InjectedStyleSheets.h" |
| 78 #include "core/page/Page.h" | 78 #include "core/page/Page.h" |
| 79 #include "core/page/PagePopupClient.h" | 79 #include "core/page/PagePopupClient.h" |
| 80 #include "core/page/PointerLockController.h" | 80 #include "core/page/PointerLockController.h" |
| 81 #include "core/page/ScopedPageLoadDeferrer.h" | 81 #include "core/page/ScopedPageLoadDeferrer.h" |
| 82 #include "core/page/TouchDisambiguation.h" | 82 #include "core/page/TouchDisambiguation.h" |
| 83 #include "core/rendering/RenderView.h" | 83 #include "core/rendering/RenderView.h" |
| 84 #include "core/rendering/RenderWidget.h" | 84 #include "core/rendering/RenderWidget.h" |
| 85 #include "core/rendering/TextAutosizer.h" | 85 #include "core/rendering/TextAutosizer.h" |
| 86 #include "core/rendering/compositing/RenderLayerCompositor.h" | 86 #include "core/rendering/compositing/RenderLayerCompositor.h" |
| 87 #include "modules/credentialmanager/CredentialManagerClient.h" |
| 87 #include "modules/device_orientation/DeviceOrientationInspectorAgent.h" | 88 #include "modules/device_orientation/DeviceOrientationInspectorAgent.h" |
| 88 #include "modules/encryptedmedia/MediaKeysController.h" | 89 #include "modules/encryptedmedia/MediaKeysController.h" |
| 89 #include "modules/filesystem/InspectorFileSystemAgent.h" | 90 #include "modules/filesystem/InspectorFileSystemAgent.h" |
| 90 #include "modules/indexeddb/InspectorIndexedDBAgent.h" | 91 #include "modules/indexeddb/InspectorIndexedDBAgent.h" |
| 91 #include "modules/push_messaging/PushController.h" | 92 #include "modules/push_messaging/PushController.h" |
| 92 #include "platform/ContextMenu.h" | 93 #include "platform/ContextMenu.h" |
| 93 #include "platform/ContextMenuItem.h" | 94 #include "platform/ContextMenuItem.h" |
| 94 #include "platform/Cursor.h" | 95 #include "platform/Cursor.h" |
| 95 #include "platform/KeyboardCodes.h" | 96 #include "platform/KeyboardCodes.h" |
| 96 #include "platform/NotImplemented.h" | 97 #include "platform/NotImplemented.h" |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 322 toWebLocalFrameImpl(frame)->initializeCoreFrame(&page()->frameHost(), 0,
nullAtom, nullAtom); | 323 toWebLocalFrameImpl(frame)->initializeCoreFrame(&page()->frameHost(), 0,
nullAtom, nullAtom); |
| 323 else | 324 else |
| 324 toWebRemoteFrameImpl(frame)->initializeCoreFrame(&page()->frameHost(), 0
, nullAtom); | 325 toWebRemoteFrameImpl(frame)->initializeCoreFrame(&page()->frameHost(), 0
, nullAtom); |
| 325 } | 326 } |
| 326 | 327 |
| 327 void WebViewImpl::setAutofillClient(WebAutofillClient* autofillClient) | 328 void WebViewImpl::setAutofillClient(WebAutofillClient* autofillClient) |
| 328 { | 329 { |
| 329 m_autofillClient = autofillClient; | 330 m_autofillClient = autofillClient; |
| 330 } | 331 } |
| 331 | 332 |
| 333 void WebViewImpl::setCredentialManagerClient(WebCredentialManagerClient* webCred
entialManagerClient) |
| 334 { |
| 335 ASSERT(m_page); |
| 336 provideCredentialManagerClientTo(*m_page, new CredentialManagerClient(webCre
dentialManagerClient)); |
| 337 } |
| 338 |
| 332 void WebViewImpl::setDevToolsAgentClient(WebDevToolsAgentClient* devToolsClient) | 339 void WebViewImpl::setDevToolsAgentClient(WebDevToolsAgentClient* devToolsClient) |
| 333 { | 340 { |
| 334 if (devToolsClient) | 341 if (devToolsClient) |
| 335 m_devToolsAgent = adoptPtr(new WebDevToolsAgentImpl(this, devToolsClient
)); | 342 m_devToolsAgent = adoptPtr(new WebDevToolsAgentImpl(this, devToolsClient
)); |
| 336 else | 343 else |
| 337 m_devToolsAgent.clear(); | 344 m_devToolsAgent.clear(); |
| 338 } | 345 } |
| 339 | 346 |
| 340 void WebViewImpl::setPrerendererClient(WebPrerendererClient* prerendererClient) | 347 void WebViewImpl::setPrerendererClient(WebPrerendererClient* prerendererClient) |
| 341 { | 348 { |
| (...skipping 3926 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4268 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4275 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
| 4269 | 4276 |
| 4270 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4277 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 4271 return false; | 4278 return false; |
| 4272 | 4279 |
| 4273 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4280 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4274 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4281 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4275 } | 4282 } |
| 4276 | 4283 |
| 4277 } // namespace blink | 4284 } // namespace blink |
| OLD | NEW |