Bug 93769

Summary: Stop Y-flipping CrOS/ARM video textures
Product: WebKit Reporter: Ami Fischman <fischman>
Component: New BugsAssignee: Ami Fischman <fischman>
Status: RESOLVED FIXED    
Severity: Normal CC: cc-bugs, eric.carlson, feature-media-reviews, fischman, jamesr, kbr, webkit.review.bot
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
Patch
none
Patch
none
Patch none

Description Ami Fischman 2012-08-11 13:57:28 PDT
Stop Y-flipping CROS/ARM video textures
Comment 1 Ami Fischman 2012-08-11 13:58:51 PDT
Created attachment 157878 [details]
Patch
Comment 2 Eric Seidel (no email) 2012-08-12 02:40:08 PDT
Comment on attachment 157878 [details]
Patch

OK.
Comment 3 WebKit Review Bot 2012-08-12 03:40:47 PDT
Comment on attachment 157878 [details]
Patch

Rejecting attachment 157878 [details] from commit-queue.

Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2

Last 500 characters of output:
FLICT (content): Merge conflict in Source/WebCore/ChangeLog
Failed to merge in the changes.
Patch failed at 0001 CSSComputedStyleDeclaration::cssText() should use StringBuilder

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

rebase refs/remotes/origin/master: command returned error: 1

Died at Tools/Scripts/update-webkit line 164.

Full output: http://queues.webkit.org/results/13484329
Comment 4 Ami Fischman 2012-08-12 09:54:49 PDT
Created attachment 157903 [details]
Patch
Comment 5 Ami Fischman 2012-08-12 09:55:38 PDT
Created attachment 157904 [details]
Patch
Comment 6 WebKit Review Bot 2012-08-12 10:40:41 PDT
Comment on attachment 157904 [details]
Patch

Clearing flags on attachment: 157904

Committed r125378: <http://trac.webkit.org/changeset/125378>
Comment 7 WebKit Review Bot 2012-08-12 10:40:45 PDT
All reviewed patches have been landed.  Closing bug.