| 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 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 381 pageClients.contextMenuClient = &m_contextMenuClientImpl; | 381 pageClients.contextMenuClient = &m_contextMenuClientImpl; |
| 382 pageClients.editorClient = &m_editorClientImpl; | 382 pageClients.editorClient = &m_editorClientImpl; |
| 383 pageClients.dragClient = &m_dragClientImpl; | 383 pageClients.dragClient = &m_dragClientImpl; |
| 384 pageClients.inspectorClient = &m_inspectorClientImpl; | 384 pageClients.inspectorClient = &m_inspectorClientImpl; |
| 385 pageClients.backForwardClient = &m_backForwardClientImpl; | 385 pageClients.backForwardClient = &m_backForwardClientImpl; |
| 386 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; | 386 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; |
| 387 pageClients.storageClient = &m_storageClientImpl; | 387 pageClients.storageClient = &m_storageClientImpl; |
| 388 | 388 |
| 389 m_page = adoptPtr(new Page(pageClients)); | 389 m_page = adoptPtr(new Page(pageClients)); |
| 390 provideUserMediaTo(*m_page, &m_userMediaClientImpl); | 390 provideUserMediaTo(*m_page, &m_userMediaClientImpl); |
| 391 provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl); |
| 391 provideMIDITo(*m_page, m_midiClientProxy.get()); | 392 provideMIDITo(*m_page, m_midiClientProxy.get()); |
| 392 #if ENABLE(INPUT_SPEECH) | 393 #if ENABLE(INPUT_SPEECH) |
| 393 provideSpeechInputTo(*m_page, m_speechInputClient.get()); | 394 provideSpeechInputTo(*m_page, m_speechInputClient.get()); |
| 394 #endif | 395 #endif |
| 395 provideSpeechRecognitionTo(*m_page, m_speechRecognitionClient.get()); | 396 provideSpeechRecognitionTo(*m_page, m_speechRecognitionClient.get()); |
| 396 provideNotification(*m_page, notificationPresenterImpl()); | 397 provideNotification(*m_page, notificationPresenterImpl()); |
| 397 provideNavigatorContentUtilsTo(*m_page, m_navigatorContentUtilsClient.get())
; | 398 provideNavigatorContentUtilsTo(*m_page, m_navigatorContentUtilsClient.get())
; |
| 398 | 399 |
| 399 provideContextFeaturesTo(*m_page, m_featureSwitchClient.get()); | 400 provideContextFeaturesTo(*m_page, m_featureSwitchClient.get()); |
| 400 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) | 401 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) |
| (...skipping 3597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3998 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 3999 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
| 3999 | 4000 |
| 4000 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4001 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 4001 return false; | 4002 return false; |
| 4002 | 4003 |
| 4003 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4004 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4004 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4005 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4005 } | 4006 } |
| 4006 | 4007 |
| 4007 } // namespace blink | 4008 } // namespace blink |
| OLD | NEW |