Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Side by Side Diff: Source/web/WebViewImpl.cpp

Issue 110183002: Remove #if ENABLE(NAVIGATOR_CONTENT_UTILS) from blink (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased #2 Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/web/WebViewImpl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 , m_layerTreeViewCommitsDeferred(false) 364 , m_layerTreeViewCommitsDeferred(false)
365 , m_compositorCreationFailed(false) 365 , m_compositorCreationFailed(false)
366 , m_recreatingGraphicsContext(false) 366 , m_recreatingGraphicsContext(false)
367 #if ENABLE(INPUT_SPEECH) 367 #if ENABLE(INPUT_SPEECH)
368 , m_speechInputClient(SpeechInputClientImpl::create(client)) 368 , m_speechInputClient(SpeechInputClientImpl::create(client))
369 #endif 369 #endif
370 , m_speechRecognitionClient(SpeechRecognitionClientProxy::create(client ? cl ient->speechRecognizer() : 0)) 370 , m_speechRecognitionClient(SpeechRecognitionClientProxy::create(client ? cl ient->speechRecognizer() : 0))
371 , m_geolocationClientProxy(adoptPtr(new GeolocationClientProxy(client ? clie nt->geolocationClient() : 0))) 371 , m_geolocationClientProxy(adoptPtr(new GeolocationClientProxy(client ? clie nt->geolocationClient() : 0)))
372 , m_userMediaClientImpl(this) 372 , m_userMediaClientImpl(this)
373 , m_midiClientProxy(adoptPtr(new MIDIClientProxy(client ? client->webMIDICli ent() : 0))) 373 , m_midiClientProxy(adoptPtr(new MIDIClientProxy(client ? client->webMIDICli ent() : 0)))
374 #if ENABLE(NAVIGATOR_CONTENT_UTILS)
375 , m_navigatorContentUtilsClient(NavigatorContentUtilsClientImpl::create(this )) 374 , m_navigatorContentUtilsClient(NavigatorContentUtilsClientImpl::create(this ))
376 #endif
377 , m_flingModifier(0) 375 , m_flingModifier(0)
378 , m_flingSourceDevice(false) 376 , m_flingSourceDevice(false)
379 , m_fullscreenController(FullscreenController::create(this)) 377 , m_fullscreenController(FullscreenController::create(this))
380 , m_showFPSCounter(false) 378 , m_showFPSCounter(false)
381 , m_showPaintRects(false) 379 , m_showPaintRects(false)
382 , m_showDebugBorders(false) 380 , m_showDebugBorders(false)
383 , m_continuousPaintingEnabled(false) 381 , m_continuousPaintingEnabled(false)
384 , m_showScrollBottleneckRects(false) 382 , m_showScrollBottleneckRects(false)
385 , m_baseBackgroundColor(Color::white) 383 , m_baseBackgroundColor(Color::white)
386 , m_backgroundColorOverride(Color::transparent) 384 , m_backgroundColorOverride(Color::transparent)
(...skipping 10 matching lines...) Expand all
397 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; 395 pageClients.spellCheckerClient = &m_spellCheckerClientImpl;
398 396
399 m_page = adoptPtr(new Page(pageClients)); 397 m_page = adoptPtr(new Page(pageClients));
400 provideUserMediaTo(m_page.get(), &m_userMediaClientImpl); 398 provideUserMediaTo(m_page.get(), &m_userMediaClientImpl);
401 provideMIDITo(m_page.get(), m_midiClientProxy.get()); 399 provideMIDITo(m_page.get(), m_midiClientProxy.get());
402 #if ENABLE(INPUT_SPEECH) 400 #if ENABLE(INPUT_SPEECH)
403 provideSpeechInputTo(m_page.get(), m_speechInputClient.get()); 401 provideSpeechInputTo(m_page.get(), m_speechInputClient.get());
404 #endif 402 #endif
405 provideSpeechRecognitionTo(m_page.get(), m_speechRecognitionClient.get()); 403 provideSpeechRecognitionTo(m_page.get(), m_speechRecognitionClient.get());
406 provideNotification(m_page.get(), notificationPresenterImpl()); 404 provideNotification(m_page.get(), notificationPresenterImpl());
407 #if ENABLE(NAVIGATOR_CONTENT_UTILS)
408 provideNavigatorContentUtilsTo(m_page.get(), m_navigatorContentUtilsClient.g et()); 405 provideNavigatorContentUtilsTo(m_page.get(), m_navigatorContentUtilsClient.g et());
409 #endif
410 406
411 provideContextFeaturesTo(m_page.get(), m_featureSwitchClient.get()); 407 provideContextFeaturesTo(m_page.get(), m_featureSwitchClient.get());
412 provideGeolocationTo(m_page.get(), m_geolocationClientProxy.get()); 408 provideGeolocationTo(m_page.get(), m_geolocationClientProxy.get());
413 m_geolocationClientProxy->setController(GeolocationController::from(m_page.g et())); 409 m_geolocationClientProxy->setController(GeolocationController::from(m_page.g et()));
414 410
415 provideLocalFileSystemTo(m_page.get(), LocalFileSystemClient::create()); 411 provideLocalFileSystemTo(m_page.get(), LocalFileSystemClient::create());
416 provideDatabaseClientTo(m_page.get(), DatabaseClientImpl::create()); 412 provideDatabaseClientTo(m_page.get(), DatabaseClientImpl::create());
417 m_validationMessage = ValidationMessageClientImpl::create(*this); 413 m_validationMessage = ValidationMessageClientImpl::create(*this);
418 m_page->setValidationMessageClient(m_validationMessage.get()); 414 m_page->setValidationMessageClient(m_validationMessage.get());
419 provideWorkerGlobalScopeProxyProviderTo(m_page.get(), WorkerGlobalScopeProxy ProviderImpl::create()); 415 provideWorkerGlobalScopeProxyProviderTo(m_page.get(), WorkerGlobalScopeProxy ProviderImpl::create());
(...skipping 3593 matching lines...) Expand 10 before | Expand all | Expand 10 after
4013 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 4009 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
4014 4010
4015 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 4011 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
4016 return false; 4012 return false;
4017 4013
4018 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 4014 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
4019 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4015 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4020 } 4016 }
4021 4017
4022 } // namespace blink 4018 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebViewImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698