| 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 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 , m_tabsToLinks(false) | 352 , m_tabsToLinks(false) |
| 353 , m_layerTreeView(0) | 353 , m_layerTreeView(0) |
| 354 , m_rootLayer(0) | 354 , m_rootLayer(0) |
| 355 , m_rootGraphicsLayer(0) | 355 , m_rootGraphicsLayer(0) |
| 356 , m_rootTransformLayer(0) | 356 , m_rootTransformLayer(0) |
| 357 , m_graphicsLayerFactory(adoptPtr(new GraphicsLayerFactoryChromium(this))) | 357 , m_graphicsLayerFactory(adoptPtr(new GraphicsLayerFactoryChromium(this))) |
| 358 , m_isAcceleratedCompositingActive(false) | 358 , m_isAcceleratedCompositingActive(false) |
| 359 , m_layerTreeViewCommitsDeferred(false) | 359 , m_layerTreeViewCommitsDeferred(false) |
| 360 , m_compositorCreationFailed(false) | 360 , m_compositorCreationFailed(false) |
| 361 , m_recreatingGraphicsContext(false) | 361 , m_recreatingGraphicsContext(false) |
| 362 , m_speechRecognitionClient(SpeechRecognitionClientProxy::create(client ? cl
ient->speechRecognizer() : 0)) | |
| 363 , m_geolocationClientProxy(adoptPtr(new GeolocationClientProxy(client ? clie
nt->geolocationClient() : 0))) | 362 , m_geolocationClientProxy(adoptPtr(new GeolocationClientProxy(client ? clie
nt->geolocationClient() : 0))) |
| 364 , m_userMediaClientImpl(this) | 363 , m_userMediaClientImpl(this) |
| 365 , m_midiClientProxy(adoptPtr(new MIDIClientProxy(client ? client->webMIDICli
ent() : 0))) | 364 , m_midiClientProxy(adoptPtr(new MIDIClientProxy(client ? client->webMIDICli
ent() : 0))) |
| 366 , m_flingModifier(0) | 365 , m_flingModifier(0) |
| 367 , m_flingSourceDevice(false) | 366 , m_flingSourceDevice(false) |
| 368 , m_fullscreenController(FullscreenController::create(this)) | 367 , m_fullscreenController(FullscreenController::create(this)) |
| 369 , m_showFPSCounter(false) | 368 , m_showFPSCounter(false) |
| 370 , m_showPaintRects(false) | 369 , m_showPaintRects(false) |
| 371 , m_showDebugBorders(false) | 370 , m_showDebugBorders(false) |
| 372 , m_continuousPaintingEnabled(false) | 371 , m_continuousPaintingEnabled(false) |
| (...skipping 12 matching lines...) Expand all Loading... |
| 385 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; | 384 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; |
| 386 pageClients.storageClient = &m_storageClientImpl; | 385 pageClients.storageClient = &m_storageClientImpl; |
| 387 | 386 |
| 388 m_page = adoptPtr(new Page(pageClients)); | 387 m_page = adoptPtr(new Page(pageClients)); |
| 389 provideUserMediaTo(*m_page, &m_userMediaClientImpl); | 388 provideUserMediaTo(*m_page, &m_userMediaClientImpl); |
| 390 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl); | 389 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl); |
| 391 provideMIDITo(*m_page, m_midiClientProxy.get()); | 390 provideMIDITo(*m_page, m_midiClientProxy.get()); |
| 392 #if ENABLE(INPUT_SPEECH) | 391 #if ENABLE(INPUT_SPEECH) |
| 393 provideSpeechInputTo(*m_page, SpeechInputClientImpl::create(client)); | 392 provideSpeechInputTo(*m_page, SpeechInputClientImpl::create(client)); |
| 394 #endif | 393 #endif |
| 395 provideSpeechRecognitionTo(*m_page, m_speechRecognitionClient.get()); | 394 provideSpeechRecognitionTo(*m_page, SpeechRecognitionClientProxy::create(cli
ent ? client->speechRecognizer() : 0)); |
| 396 provideNotification(*m_page, notificationPresenterImpl()); | 395 provideNotification(*m_page, notificationPresenterImpl()); |
| 397 provideNavigatorContentUtilsTo(*m_page, NavigatorContentUtilsClientImpl::cre
ate(this)); | 396 provideNavigatorContentUtilsTo(*m_page, NavigatorContentUtilsClientImpl::cre
ate(this)); |
| 398 | 397 |
| 399 provideContextFeaturesTo(*m_page, m_featureSwitchClient.get()); | 398 provideContextFeaturesTo(*m_page, m_featureSwitchClient.get()); |
| 400 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) | 399 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) |
| 401 DeviceOrientationInspectorAgent::provideTo(*m_page); | 400 DeviceOrientationInspectorAgent::provideTo(*m_page); |
| 402 provideGeolocationTo(*m_page, m_geolocationClientProxy.get()); | 401 provideGeolocationTo(*m_page, m_geolocationClientProxy.get()); |
| 403 m_geolocationClientProxy->setController(GeolocationController::from(m_page.g
et())); | 402 m_geolocationClientProxy->setController(GeolocationController::from(m_page.g
et())); |
| 404 | 403 |
| 405 provideLocalFileSystemTo(*m_page, LocalFileSystemClient::create()); | 404 provideLocalFileSystemTo(*m_page, LocalFileSystemClient::create()); |
| (...skipping 3575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3981 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 3980 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
| 3982 | 3981 |
| 3983 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 3982 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 3984 return false; | 3983 return false; |
| 3985 | 3984 |
| 3986 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 3985 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 3987 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 3986 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 3988 } | 3987 } |
| 3989 | 3988 |
| 3990 } // namespace blink | 3989 } // namespace blink |
| OLD | NEW |