Changeset 101058 in webkit
- Timestamp:
- Nov 23, 2011 2:02:27 AM (12 years ago)
- Location:
- trunk/Source/WebKit/chromium
- Files:
-
- 5 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/chromium/ChangeLog
r101055 r101058 1 2011-11-23 Tommy Widenflycht <tommyw@google.com> 2 3 [chromium] MediaStream API: Adding embedding code for GetUserMedia 4 https://bugs.webkit.org/show_bug.cgi?id=71678 5 6 This patch includes a fix for https://bugs.webkit.org/show_bug.cgi?id=72925. 7 8 Reviewed by Darin Fisher. 9 10 * WebKit.gyp: 11 * public/WebUserMediaClient.h: Added. 12 (WebKit::WebUserMediaClient::~WebUserMediaClient): 13 * public/WebUserMediaRequest.h: Added. 14 (WebKit::WebUserMediaRequest::WebUserMediaRequest): 15 (WebKit::WebUserMediaRequest::~WebUserMediaRequest): 16 (WebKit::WebUserMediaRequest::operator=): 17 (WebKit::WebUserMediaRequest::isNull): 18 (WebKit::operator==): 19 * public/WebViewClient.h: 20 (WebKit::WebViewClient::userMediaClient): 21 * src/UserMediaClientImpl.cpp: Added. 22 (WebKit::UserMediaClientImpl::UserMediaClientImpl): 23 (WebKit::UserMediaClientImpl::pageDestroyed): 24 (WebKit::UserMediaClientImpl::requestUserMedia): 25 (WebKit::UserMediaClientImpl::cancelUserMediaRequest): 26 * src/UserMediaClientImpl.h: Added. 27 * src/WebUserMediaRequest.cpp: Added. 28 (WebKit::WebUserMediaRequest::WebUserMediaRequest): 29 (WebKit::WebUserMediaRequest::reset): 30 (WebKit::WebUserMediaRequest::audio): 31 (WebKit::WebUserMediaRequest::video): 32 (WebKit::WebUserMediaRequest::cameraPreferenceUser): 33 (WebKit::WebUserMediaRequest::cameraPreferenceEnvironment): 34 (WebKit::WebUserMediaRequest::securityOrigin): 35 (WebKit::WebUserMediaRequest::requestSucceeded): 36 (WebKit::WebUserMediaRequest::requestFailed): 37 (WebKit::WebUserMediaRequest::equals): 38 (WebKit::WebUserMediaRequest::assign): 39 (WebKit::WebUserMediaRequest::operator UserMediaRequest*): 40 * src/WebViewImpl.cpp: 41 (WebKit::WebViewImpl::WebViewImpl): 42 * src/WebViewImpl.h: 43 1 44 2011-11-23 Antoine Labour <piman@chromium.org> 2 45 -
trunk/Source/WebKit/chromium/WebKit.gyp
r101021 r101058 328 328 'public/WebURLRequest.h', 329 329 'public/WebURLResponse.h', 330 'public/WebUserMediaClient.h', 331 'public/WebUserMediaRequest.h', 330 332 'public/WebVector.h', 331 333 'public/WebView.h', … … 455 457 'src/StorageNamespaceProxy.cpp', 456 458 'src/StorageNamespaceProxy.h', 459 'src/UserMediaClientImpl.h', 460 'src/UserMediaClientImpl.cpp', 457 461 'src/WebTextCheckingCompletionImpl.h', 458 462 'src/WebTextCheckingCompletionImpl.cpp', … … 638 642 'src/WebURLResponsePrivate.h', 639 643 'src/WebURLError.cpp', 644 'src/WebUserMediaRequest.cpp', 640 645 'src/WebViewImpl.cpp', 641 646 'src/WebViewImpl.h', -
trunk/Source/WebKit/chromium/public/WebViewClient.h
r100977 r101058 68 68 class WebURL; 69 69 class WebURLRequest; 70 class WebUserMediaClient; 70 71 class WebView; 71 72 class WebWidget; … … 320 321 } 321 322 323 // Media Streams ------------------------------------------------------- 324 325 virtual WebUserMediaClient* userMediaClient() { return 0; } 326 322 327 protected: 323 328 ~WebViewClient() { } -
trunk/Source/WebKit/chromium/src/WebViewImpl.cpp
r100977 r101058 371 371 , m_gestureRecognizer(WebCore::PlatformGestureRecognizer::create()) 372 372 #endif 373 #if ENABLE(MEDIA_STREAM) 374 , m_userMediaClientImpl(this) 375 #endif 373 376 { 374 377 // WebKit/win/WebView.cpp does the same thing, except they call the … … 393 396 pageClients.geolocationClient = m_geolocationClientProxy.get(); 394 397 pageClients.backForwardClient = BackForwardListChromium::create(this); 398 #if ENABLE(MEDIA_STREAM) 399 pageClients.userMediaClient = &m_userMediaClientImpl; 400 #endif 395 401 396 402 m_page = adoptPtr(new Page(pageClients)); -
trunk/Source/WebKit/chromium/src/WebViewImpl.h
r100977 r101058 49 49 #include "NotificationPresenterImpl.h" 50 50 #include "PageOverlay.h" 51 #include "UserMediaClientImpl.h" 51 52 #include "cc/CCLayerTreeHost.h" 52 53 #include <wtf/OwnPtr.h> … … 82 83 class GeolocationClientProxy; 83 84 class SpeechInputClientImpl; 85 class UserMediaClientImpl; 84 86 class WebAccessibilityObject; 85 87 class WebCompositorImpl; … … 626 628 OwnPtr<WebCore::PlatformGestureRecognizer> m_gestureRecognizer; 627 629 #endif 630 631 #if ENABLE(MEDIA_STREAM) 632 UserMediaClientImpl m_userMediaClientImpl; 633 #endif 628 634 }; 629 635
Note: See TracChangeset
for help on using the changeset viewer.