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

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

Issue 195053004: Create Pepper-based CDM for EME WD (Blink changes) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 9 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
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 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 , m_speechInputClient(SpeechInputClientImpl::create(client)) 359 , m_speechInputClient(SpeechInputClientImpl::create(client))
360 #endif 360 #endif
361 , m_speechRecognitionClient(SpeechRecognitionClientProxy::create(client ? cl ient->speechRecognizer() : 0)) 361 , m_speechRecognitionClient(SpeechRecognitionClientProxy::create(client ? cl ient->speechRecognizer() : 0))
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))) 364 , m_midiClientProxy(adoptPtr(new MIDIClientProxy(client ? client->webMIDICli ent() : 0)))
365 , m_navigatorContentUtilsClient(NavigatorContentUtilsClientImpl::create(this )) 365 , m_navigatorContentUtilsClient(NavigatorContentUtilsClientImpl::create(this ))
366 , m_flingModifier(0) 366 , m_flingModifier(0)
367 , m_flingSourceDevice(false) 367 , m_flingSourceDevice(false)
368 , m_fullscreenController(FullscreenController::create(this)) 368 , m_fullscreenController(FullscreenController::create(this))
369 , m_mediaKeysClientImpl(MediaKeysClientImpl::create())
369 , m_showFPSCounter(false) 370 , m_showFPSCounter(false)
370 , m_showPaintRects(false) 371 , m_showPaintRects(false)
371 , m_showDebugBorders(false) 372 , m_showDebugBorders(false)
372 , m_continuousPaintingEnabled(false) 373 , m_continuousPaintingEnabled(false)
373 , m_showScrollBottleneckRects(false) 374 , m_showScrollBottleneckRects(false)
374 , m_baseBackgroundColor(Color::white) 375 , m_baseBackgroundColor(Color::white)
375 , m_backgroundColorOverride(Color::transparent) 376 , m_backgroundColorOverride(Color::transparent)
376 , m_zoomFactorOverride(0) 377 , m_zoomFactorOverride(0)
377 { 378 {
378 Page::PageClients pageClients; 379 Page::PageClients pageClients;
379 pageClients.chromeClient = &m_chromeClientImpl; 380 pageClients.chromeClient = &m_chromeClientImpl;
380 pageClients.contextMenuClient = &m_contextMenuClientImpl; 381 pageClients.contextMenuClient = &m_contextMenuClientImpl;
381 pageClients.editorClient = &m_editorClientImpl; 382 pageClients.editorClient = &m_editorClientImpl;
382 pageClients.dragClient = &m_dragClientImpl; 383 pageClients.dragClient = &m_dragClientImpl;
383 pageClients.inspectorClient = &m_inspectorClientImpl; 384 pageClients.inspectorClient = &m_inspectorClientImpl;
384 pageClients.backForwardClient = &m_backForwardClientImpl; 385 pageClients.backForwardClient = &m_backForwardClientImpl;
385 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; 386 pageClients.spellCheckerClient = &m_spellCheckerClientImpl;
386 pageClients.storageClient = &m_storageClientImpl; 387 pageClients.storageClient = &m_storageClientImpl;
387 388
388 m_page = adoptPtr(new Page(pageClients)); 389 m_page = adoptPtr(new Page(pageClients));
389 provideUserMediaTo(*m_page, &m_userMediaClientImpl); 390 provideUserMediaTo(*m_page, &m_userMediaClientImpl);
391 provideMediaKeysTo(*m_page, m_mediaKeysClientImpl.get());
ddorwin 2014/03/12 01:01:09 Note how you've grouped it with user media here. :
jrummell 2014/03/17 20:48:37 :)
390 provideMIDITo(*m_page, m_midiClientProxy.get()); 392 provideMIDITo(*m_page, m_midiClientProxy.get());
391 #if ENABLE(INPUT_SPEECH) 393 #if ENABLE(INPUT_SPEECH)
392 provideSpeechInputTo(*m_page, m_speechInputClient.get()); 394 provideSpeechInputTo(*m_page, m_speechInputClient.get());
393 #endif 395 #endif
394 provideSpeechRecognitionTo(*m_page, m_speechRecognitionClient.get()); 396 provideSpeechRecognitionTo(*m_page, m_speechRecognitionClient.get());
395 provideNotification(*m_page, notificationPresenterImpl()); 397 provideNotification(*m_page, notificationPresenterImpl());
396 provideNavigatorContentUtilsTo(*m_page, m_navigatorContentUtilsClient.get()) ; 398 provideNavigatorContentUtilsTo(*m_page, m_navigatorContentUtilsClient.get()) ;
397 399
398 provideContextFeaturesTo(*m_page, m_featureSwitchClient.get()); 400 provideContextFeaturesTo(*m_page, m_featureSwitchClient.get());
399 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) 401 if (RuntimeEnabledFeatures::deviceOrientationEnabled())
(...skipping 3568 matching lines...) Expand 10 before | Expand all | Expand 10 after
3968 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 3970 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
3969 3971
3970 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 3972 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
3971 return false; 3973 return false;
3972 3974
3973 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 3975 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
3974 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 3976 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
3975 } 3977 }
3976 3978
3977 } // namespace blink 3979 } // namespace blink
OLDNEW
« Source/web/WebViewImpl.h ('K') | « Source/web/WebViewImpl.h ('k') | Source/web/web.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698