Bug 193586 – Revert r238815, it broke WK1 video fullscreen on Mac

• Component: Media
• Status: RESOLVED FIXED

[Eric Carlson]

Revert r238815, it broke WK1 video fullscreen on Mac

[Eric Carlson]

<rdar://problem/47358941>

[Eric Carlson]

Created attachment 359534 [details]
Patch

[EWS Watchlist]

Attachment 359534 [details] did not pass style-queue:


ERROR: Source/WebKitLegacy/mac/WebView/WebVideoFullscreenHUDWindowController.mm:494:  The parameter name "videoElement" adds no information, so it should be removed.  [readability/parameter_name] [5]
Total errors found: 1 in 11 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Eric Carlson]

Created attachment 359538 [details]
Patch

[EWS Watchlist]

Attachment 359538 [details] did not pass style-queue:


ERROR: Source/WebKitLegacy/mac/WebView/WebVideoFullscreenHUDWindowController.mm:27:  Found header this file implements before WebCore config.h. Should be: config.h, primary header, blank line, and then alphabetically sorted.  [build/include_order] [4]
ERROR: Source/WebKitLegacy/mac/WebView/WebVideoFullscreenHUDWindowController.mm:493:  The parameter name "videoElement" adds no information, so it should be removed.  [readability/parameter_name] [5]
ERROR: Source/WebKitLegacy/mac/WebView/WebVideoFullscreenController.mm:26:  Found header this file implements before WebCore config.h. Should be: config.h, primary header, blank line, and then alphabetically sorted.  [build/include_order] [4]
Total errors found: 3 in 12 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[WebKit Commit Bot]

Comment on attachment 359538 [details]
Patch

Rejecting attachment 359538 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 359538, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Logging in as [e-mail]...
Fetching: https://bugs.webkit.org/attachment.cgi?id=359538&action=edit
Fetching: https://bugs.webkit.org/show_bug.cgi?id=193586&ctype=xml&excludefield=attachmentdata
Processing 1 patch from 1 bug.
Updating working directory
Processing patch 359538 from bug 193586.
Fetching: https://bugs.webkit.org/attachment.cgi?id=359538
Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Jer Noble']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Parsed 12 diffs from patch file(s).
patching file Source/WebCore/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/WebKitLegacy/ChangeLog
patching file Source/WebKitLegacy/mac/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/WebCore/PlatformMac.cmake
patching file Source/WebCore/WebCore.xcodeproj/project.pbxproj
Hunk #1 FAILED at 6430.
Hunk #2 succeeded at 17129 with fuzz 2 (offset 92 lines).
Hunk #3 FAILED at 25700.
Hunk #4 succeeded at 32442 (offset 1 line).
2 out of 4 hunks FAILED -- saving rejects to file Source/WebCore/WebCore.xcodeproj/project.pbxproj.rej
patching file Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
patching file Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj
patching file Source/WebKitLegacy/mac/WebView/WebVideoFullscreenController.h
patching file Source/WebKitLegacy/mac/WebView/WebVideoFullscreenController.mm
patching file Source/WebKitLegacy/mac/WebView/WebVideoFullscreenHUDWindowController.h
patching file Source/WebKitLegacy/mac/WebView/WebVideoFullscreenHUDWindowController.mm
patching file Source/WebKitLegacy/mac/WebView/WebView.mm
Hunk #2 succeeded at 9380 (offset -8 lines).
Hunk #3 succeeded at 9397 (offset -8 lines).

Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Jer Noble']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Parsed 12 diffs from patch file(s).
patching file Source/WebCore/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/WebKitLegacy/ChangeLog
patching file Source/WebKitLegacy/mac/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/WebCore/PlatformMac.cmake
patching file Source/WebCore/WebCore.xcodeproj/project.pbxproj
Hunk #1 FAILED at 6430.
Hunk #2 succeeded at 17129 with fuzz 2 (offset 92 lines).
Hunk #3 FAILED at 25700.
Hunk #4 succeeded at 32442 (offset 1 line).
2 out of 4 hunks FAILED -- saving rejects to file Source/WebCore/WebCore.xcodeproj/project.pbxproj.rej
patching file Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
patching file Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj
patching file Source/WebKitLegacy/mac/WebView/WebVideoFullscreenController.h
patching file Source/WebKitLegacy/mac/WebView/WebVideoFullscreenController.mm
patching file Source/WebKitLegacy/mac/WebView/WebVideoFullscreenHUDWindowController.h
patching file Source/WebKitLegacy/mac/WebView/WebVideoFullscreenHUDWindowController.mm
patching file Source/WebKitLegacy/mac/WebView/WebView.mm
Hunk #2 succeeded at 9380 (offset -8 lines).
Hunk #3 succeeded at 9397 (offset -8 lines).

Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Jer Noble']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit
Updating OpenSource
From https://git.webkit.org/git/WebKit
   c789475f06c..35847c83606  master     -> origin/master
Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ...
Currently at 240176 = c789475f06cb430583a98f69cc13a9d31270167b
r240177 = ab48d3a26378bbfd9e1bf8de74c60fe677dd337a
r240178 = 65645bd5f618f808f74aec667599066053d37a83
r240179 = c1b35a255f327430a28782c20d81314f6961a24e
r240180 = 35847c836067053837f23b5101da6bcee46f5abd
Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc
First, rewinding head to replay your work on top of it...
Fast-forwarded master to refs/remotes/origin/master.

Full output: https://webkit-queues.webkit.org/results/10802040

[Eric Carlson]

Created attachment 359550 [details]
Rabased patch for landing

[EWS Watchlist]

Attachment 359550 [details] did not pass style-queue:


ERROR: Source/WebKitLegacy/mac/WebView/WebVideoFullscreenHUDWindowController.mm:27:  Found header this file implements before WebCore config.h. Should be: config.h, primary header, blank line, and then alphabetically sorted.  [build/include_order] [4]
ERROR: Source/WebKitLegacy/mac/WebView/WebVideoFullscreenHUDWindowController.mm:493:  The parameter name "videoElement" adds no information, so it should be removed.  [readability/parameter_name] [5]
ERROR: Source/WebKitLegacy/mac/WebView/WebVideoFullscreenController.mm:26:  Found header this file implements before WebCore config.h. Should be: config.h, primary header, blank line, and then alphabetically sorted.  [build/include_order] [4]
Total errors found: 3 in 11 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[WebKit Commit Bot]

Comment on attachment 359550 [details]
Rabased patch for landing

Clearing flags on attachment: 359550

Committed r240190: <https://trac.webkit.org/changeset/240190>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.