| 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 30 matching lines...) Expand all Loading... |
| 41 #include "HTMLNames.h" | 41 #include "HTMLNames.h" |
| 42 #include "LinkHighlight.h" | 42 #include "LinkHighlight.h" |
| 43 #include "LocalFileSystemClient.h" | 43 #include "LocalFileSystemClient.h" |
| 44 #include "MIDIClientProxy.h" | 44 #include "MIDIClientProxy.h" |
| 45 #include "PinchViewports.h" | 45 #include "PinchViewports.h" |
| 46 #include "PopupContainer.h" | 46 #include "PopupContainer.h" |
| 47 #include "PrerendererClientImpl.h" | 47 #include "PrerendererClientImpl.h" |
| 48 #include "RuntimeEnabledFeatures.h" | 48 #include "RuntimeEnabledFeatures.h" |
| 49 #include "SpeechInputClientImpl.h" | 49 #include "SpeechInputClientImpl.h" |
| 50 #include "SpeechRecognitionClientProxy.h" | 50 #include "SpeechRecognitionClientProxy.h" |
| 51 #include "StorageQuotaClientImpl.h" |
| 51 #include "ValidationMessageClientImpl.h" | 52 #include "ValidationMessageClientImpl.h" |
| 52 #include "ViewportAnchor.h" | 53 #include "ViewportAnchor.h" |
| 53 #include "WebAXObject.h" | 54 #include "WebAXObject.h" |
| 54 #include "WebActiveWheelFlingParameters.h" | 55 #include "WebActiveWheelFlingParameters.h" |
| 55 #include "WebAutofillClient.h" | 56 #include "WebAutofillClient.h" |
| 56 #include "WebDevToolsAgentImpl.h" | 57 #include "WebDevToolsAgentImpl.h" |
| 57 #include "WebDevToolsAgentPrivate.h" | 58 #include "WebDevToolsAgentPrivate.h" |
| 58 #include "WebFrameImpl.h" | 59 #include "WebFrameImpl.h" |
| 59 #include "WebHelperPluginImpl.h" | 60 #include "WebHelperPluginImpl.h" |
| 60 #include "WebHitTestResult.h" | 61 #include "WebHitTestResult.h" |
| (...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 403 provideSpeechRecognitionTo(m_page.get(), m_speechRecognitionClient.get()); | 404 provideSpeechRecognitionTo(m_page.get(), m_speechRecognitionClient.get()); |
| 404 provideNotification(m_page.get(), notificationPresenterImpl()); | 405 provideNotification(m_page.get(), notificationPresenterImpl()); |
| 405 provideNavigatorContentUtilsTo(m_page.get(), m_navigatorContentUtilsClient.g
et()); | 406 provideNavigatorContentUtilsTo(m_page.get(), m_navigatorContentUtilsClient.g
et()); |
| 406 | 407 |
| 407 provideContextFeaturesTo(m_page.get(), m_featureSwitchClient.get()); | 408 provideContextFeaturesTo(m_page.get(), m_featureSwitchClient.get()); |
| 408 provideGeolocationTo(m_page.get(), m_geolocationClientProxy.get()); | 409 provideGeolocationTo(m_page.get(), m_geolocationClientProxy.get()); |
| 409 m_geolocationClientProxy->setController(GeolocationController::from(m_page.g
et())); | 410 m_geolocationClientProxy->setController(GeolocationController::from(m_page.g
et())); |
| 410 | 411 |
| 411 provideLocalFileSystemTo(m_page.get(), LocalFileSystemClient::create()); | 412 provideLocalFileSystemTo(m_page.get(), LocalFileSystemClient::create()); |
| 412 provideDatabaseClientTo(m_page.get(), DatabaseClientImpl::create()); | 413 provideDatabaseClientTo(m_page.get(), DatabaseClientImpl::create()); |
| 414 provideStorageQuotaClientTo(m_page.get(), StorageQuotaClientImpl::create()); |
| 413 m_validationMessage = ValidationMessageClientImpl::create(*this); | 415 m_validationMessage = ValidationMessageClientImpl::create(*this); |
| 414 m_page->setValidationMessageClient(m_validationMessage.get()); | 416 m_page->setValidationMessageClient(m_validationMessage.get()); |
| 415 provideWorkerGlobalScopeProxyProviderTo(m_page.get(), WorkerGlobalScopeProxy
ProviderImpl::create()); | 417 provideWorkerGlobalScopeProxyProviderTo(m_page.get(), WorkerGlobalScopeProxy
ProviderImpl::create()); |
| 416 | 418 |
| 417 m_page->setGroupType(Page::SharedPageGroup); | 419 m_page->setGroupType(Page::SharedPageGroup); |
| 418 | 420 |
| 419 if (m_client) { | 421 if (m_client) { |
| 420 setDeviceScaleFactor(m_client->screenInfo().deviceScaleFactor); | 422 setDeviceScaleFactor(m_client->screenInfo().deviceScaleFactor); |
| 421 setVisibilityState(m_client->visibilityState(), true); | 423 setVisibilityState(m_client->visibilityState(), true); |
| 422 } | 424 } |
| (...skipping 3579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4002 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4004 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
| 4003 | 4005 |
| 4004 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4006 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 4005 return false; | 4007 return false; |
| 4006 | 4008 |
| 4007 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4009 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4008 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4010 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4009 } | 4011 } |
| 4010 | 4012 |
| 4011 } // namespace blink | 4013 } // namespace blink |
| OLD | NEW |