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

Issue 2471773002: Revert of Add CreateWindowCapturer() and CreateScreenCapturer() in DesktopCapturer (Closed)

Created:
4 years, 1 month ago by perkj_webrtc
Modified:
4 years, 1 month ago
Reviewers:
Sergey Ulanov, Hzj_jie
CC:
webrtc-reviews_webrtc.org, tterriberry_mozilla.com, Jamie
Target Ref:
refs/pending/heads/master
Project:
webrtc
Visibility:
Public.

Description

Revert of Add CreateWindowCapturer() and CreateScreenCapturer() in DesktopCapturer (patchset #2 id:40001 of https://codereview.webrtc.org/2468753002/ ) Reason for revert: Prevents WebRTC rolls into Chrome. https://build.chromium.org/p/chromium.linux/builders/Blimp%20Linux%20%28dbg%29/builds/14848/steps/compile/logs/stdio The reason for reverting is: Breaks https://build.chromium.org/p/chromium.linux/builders/Blimp%20Linux%20%28dbg%2... [881/894] SOLINK ./libcontent.so FAILED: libcontent.so libcontent.so.TOC ../../third_party/webrtc/modules/desktop_capture/desktop_capturer.cc:45: error: undefined reference to 'webrtc::DesktopCapturer::CreateRawWindowCapturer(webrtc::DesktopCaptureOptions const&)' ../../third_party/webrtc/modules/desktop_capture/desktop_capturer.cc:56: error: undefined reference to 'webrtc::DesktopCapturer::CreateRawScreenCapturer(webrtc::DesktopCaptureOptions const&)' clang: error: linker command failed with exit code 1 (use -v to see invocation) ninja: build stopped: subcommand failed. Original issue's description: > Add CreateWindowCapturer() and CreateScreenCapturer() in DesktopCapturer > > This change copies ScreenCapturerDifferWrapper to a new > DesktopCapturerDifferWrapper, and adds DesktopCapturer::CreateWindowCapturer and > DesktopCapturer::CreateScreenCapturer functions to replace > WindowCapturer::Create and ScreenCapturer::Create. > > BUG=webrtc:6513 > > Committed: https://crrev.com/b763e39beba92b45baa09542f949daabbe6258a3 > Cr-Commit-Position: refs/heads/master@{#14880} TBR=sergeyu@chromium.org,zijiehe@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6513 Committed: https://crrev.com/4d0ec05323dca55dde7b9a654c0f92c53dd5a216 Cr-Commit-Position: refs/heads/master@{#14884}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+50 lines, -813 lines) Patch
M webrtc/modules/BUILD.gn View 4 chunks +10 lines, -9 lines 0 comments Download
M webrtc/modules/desktop_capture/BUILD.gn View 5 chunks +1 line, -38 lines 0 comments Download
D webrtc/modules/desktop_capture/desktop_capture.gni View 1 chunk +0 lines, -11 lines 0 comments Download
M webrtc/modules/desktop_capture/desktop_capture.gypi View 1 chunk +0 lines, -2 lines 0 comments Download
M webrtc/modules/desktop_capture/desktop_capturer.h View 1 chunk +0 lines, -22 lines 0 comments Download
M webrtc/modules/desktop_capture/desktop_capturer.cc View 2 chunks +1 line, -29 lines 0 comments Download
D webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.h View 1 chunk +0 lines, -61 lines 0 comments Download
D webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.cc View 1 chunk +0 lines, -220 lines 0 comments Download
D webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc View 1 chunk +0 lines, -291 lines 0 comments Download
M webrtc/modules/desktop_capture/fake_desktop_capturer.h View 3 chunks +1 line, -15 lines 0 comments Download
D webrtc/modules/desktop_capture/mock_desktop_capturer_callback.h View 1 chunk +0 lines, -20 lines 0 comments Download
M webrtc/modules/desktop_capture/screen_capturer_differ_wrapper.h View 1 chunk +0 lines, -1 line 0 comments Download
M webrtc/modules/desktop_capture/screen_capturer_integration_test.cc View 10 chunks +18 lines, -19 lines 0 comments Download
M webrtc/modules/desktop_capture/screen_capturer_mac.mm View 1 chunk +0 lines, -15 lines 0 comments Download
M webrtc/modules/desktop_capture/screen_capturer_mock_objects.h View 1 chunk +14 lines, -2 lines 0 comments Download
M webrtc/modules/desktop_capture/screen_capturer_win.cc View 1 chunk +0 lines, -18 lines 0 comments Download
M webrtc/modules/desktop_capture/screen_capturer_x11.cc View 1 chunk +0 lines, -14 lines 0 comments Download
M webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h View 2 chunks +2 lines, -2 lines 0 comments Download
M webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc View 3 chunks +3 lines, -3 lines 0 comments Download
M webrtc/modules/desktop_capture/window_capturer_mac.mm View 1 chunk +0 lines, -7 lines 0 comments Download
M webrtc/modules/desktop_capture/window_capturer_win.cc View 1 chunk +0 lines, -6 lines 0 comments Download
M webrtc/modules/desktop_capture/window_capturer_x11.cc View 1 chunk +0 lines, -8 lines 0 comments Download

Messages

Total messages: 7 (3 generated)
perkj_webrtc
Created Revert of Add CreateWindowCapturer() and CreateScreenCapturer() in DesktopCapturer
4 years, 1 month ago (2016-11-02 10:13:00 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/2471773002/1
4 years, 1 month ago (2016-11-02 10:13:07 UTC) #3
commit-bot: I haz the power
Committed patchset #1 (id:1)
4 years, 1 month ago (2016-11-02 10:13:19 UTC) #5
commit-bot: I haz the power
4 years, 1 month ago (2016-11-02 10:13:32 UTC) #7
Message was sent while issue was closed.
Patchset 1 (id:??) landed as
https://crrev.com/4d0ec05323dca55dde7b9a654c0f92c53dd5a216
Cr-Commit-Position: refs/heads/master@{#14884}

Powered by Google App Engine
This is Rietveld 408576698