| 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 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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_geolocationClientProxy(adoptPtr(new GeolocationClientProxy(client ? clie
nt->geolocationClient() : 0))) | 362 , m_geolocationClientProxy(adoptPtr(new GeolocationClientProxy(client ? clie
nt->geolocationClient() : 0))) |
| 363 , m_userMediaClientImpl(this) | 363 , m_userMediaClientImpl(this) |
| 364 , m_midiClientProxy(adoptPtr(new MIDIClientProxy(client ? client->webMIDICli
ent() : 0))) | |
| 365 , m_flingModifier(0) | 364 , m_flingModifier(0) |
| 366 , m_flingSourceDevice(false) | 365 , m_flingSourceDevice(false) |
| 367 , m_fullscreenController(FullscreenController::create(this)) | 366 , m_fullscreenController(FullscreenController::create(this)) |
| 368 , m_showFPSCounter(false) | 367 , m_showFPSCounter(false) |
| 369 , m_showPaintRects(false) | 368 , m_showPaintRects(false) |
| 370 , m_showDebugBorders(false) | 369 , m_showDebugBorders(false) |
| 371 , m_continuousPaintingEnabled(false) | 370 , m_continuousPaintingEnabled(false) |
| 372 , m_showScrollBottleneckRects(false) | 371 , m_showScrollBottleneckRects(false) |
| 373 , m_baseBackgroundColor(Color::white) | 372 , m_baseBackgroundColor(Color::white) |
| 374 , m_backgroundColorOverride(Color::transparent) | 373 , m_backgroundColorOverride(Color::transparent) |
| 375 , m_zoomFactorOverride(0) | 374 , m_zoomFactorOverride(0) |
| 376 { | 375 { |
| 377 Page::PageClients pageClients; | 376 Page::PageClients pageClients; |
| 378 pageClients.chromeClient = &m_chromeClientImpl; | 377 pageClients.chromeClient = &m_chromeClientImpl; |
| 379 pageClients.contextMenuClient = &m_contextMenuClientImpl; | 378 pageClients.contextMenuClient = &m_contextMenuClientImpl; |
| 380 pageClients.editorClient = &m_editorClientImpl; | 379 pageClients.editorClient = &m_editorClientImpl; |
| 381 pageClients.dragClient = &m_dragClientImpl; | 380 pageClients.dragClient = &m_dragClientImpl; |
| 382 pageClients.inspectorClient = &m_inspectorClientImpl; | 381 pageClients.inspectorClient = &m_inspectorClientImpl; |
| 383 pageClients.backForwardClient = &m_backForwardClientImpl; | 382 pageClients.backForwardClient = &m_backForwardClientImpl; |
| 384 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; | 383 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; |
| 385 pageClients.storageClient = &m_storageClientImpl; | 384 pageClients.storageClient = &m_storageClientImpl; |
| 386 | 385 |
| 387 m_page = adoptPtr(new Page(pageClients)); | 386 m_page = adoptPtr(new Page(pageClients)); |
| 388 provideUserMediaTo(*m_page, &m_userMediaClientImpl); | 387 provideUserMediaTo(*m_page, &m_userMediaClientImpl); |
| 389 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl); | 388 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl); |
| 390 provideMIDITo(*m_page, m_midiClientProxy.get()); | 389 provideMIDITo(*m_page, MIDIClientProxy::create(client ? client->webMIDIClien
t() : 0)); |
| 391 #if ENABLE(INPUT_SPEECH) | 390 #if ENABLE(INPUT_SPEECH) |
| 392 provideSpeechInputTo(*m_page, SpeechInputClientImpl::create(client)); | 391 provideSpeechInputTo(*m_page, SpeechInputClientImpl::create(client)); |
| 393 #endif | 392 #endif |
| 394 provideSpeechRecognitionTo(*m_page, SpeechRecognitionClientProxy::create(cli
ent ? client->speechRecognizer() : 0)); | 393 provideSpeechRecognitionTo(*m_page, SpeechRecognitionClientProxy::create(cli
ent ? client->speechRecognizer() : 0)); |
| 395 provideNotification(*m_page, notificationPresenterImpl()); | 394 provideNotification(*m_page, notificationPresenterImpl()); |
| 396 provideNavigatorContentUtilsTo(*m_page, NavigatorContentUtilsClientImpl::cre
ate(this)); | 395 provideNavigatorContentUtilsTo(*m_page, NavigatorContentUtilsClientImpl::cre
ate(this)); |
| 397 | 396 |
| 398 provideContextFeaturesTo(*m_page, m_featureSwitchClient.get()); | 397 provideContextFeaturesTo(*m_page, m_featureSwitchClient.get()); |
| 399 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) | 398 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) |
| 400 DeviceOrientationInspectorAgent::provideTo(*m_page); | 399 DeviceOrientationInspectorAgent::provideTo(*m_page); |
| (...skipping 3575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3976 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 3975 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
| 3977 | 3976 |
| 3978 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 3977 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 3979 return false; | 3978 return false; |
| 3980 | 3979 |
| 3981 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 3980 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 3982 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 3981 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 3983 } | 3982 } |
| 3984 | 3983 |
| 3985 } // namespace blink | 3984 } // namespace blink |
| OLD | NEW |