|
|
Created:
6 years, 1 month ago by kouhei (in TOK) Modified:
6 years, 1 month ago CC:
blink-reviews Base URL:
https://chromium.googlesource.com/chromium/blink.git@master Project:
blink Visibility:
Public. |
DescriptionResolve enum value collision on UseCounter.h
r184341 and r184316 both added a new use counter with enum value 574.
This CL resolves the collision.
BUG=None
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=184534
Patch Set 1 #
Total comments: 1
Patch Set 2 : RenderRuby should be later #Patch Set 3 : remove an empty line #Patch Set 4 : remove an empty line #Patch Set 5 : rebase #Messages
Total messages: 28 (11 generated)
kouhei@chromium.org changed reviewers: + haraken@chromium.org, leviw@chromium.org, philipj@opera.com
LGTM We should consider auto-generating UseCounter.h from an .in file.
The CQ bit was checked by kouhei@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/684783003/1
On 2014/10/28 10:29:11, haraken wrote: > LGTM > > We should consider auto-generating UseCounter.h from an .in file. There are gaps where entries have been removed, how would that be represented? LGTM.
https://codereview.chromium.org/684783003/diff/1/Source/core/frame/UseCounter.h File Source/core/frame/UseCounter.h (right): https://codereview.chromium.org/684783003/diff/1/Source/core/frame/UseCounter... Source/core/frame/UseCounter.h:547: WindowPostMessage = 575, It would have been "more correct" to move RenderRuby down & renumber it, as it was landed later.
The CQ bit was unchecked by kouhei@chromium.org
On 2014/10/28 10:37:07, sof wrote: > https://codereview.chromium.org/684783003/diff/1/Source/core/frame/UseCounter.h > File Source/core/frame/UseCounter.h (right): > > https://codereview.chromium.org/684783003/diff/1/Source/core/frame/UseCounter... > Source/core/frame/UseCounter.h:547: WindowPostMessage = 575, > It would have been "more correct" to move RenderRuby down & renumber it, as it > was landed later. Done.
The CQ bit was checked by kouhei@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/684783003/20001
On 2014/10/28 10:39:52, kouhei wrote: > On 2014/10/28 10:37:07, sof wrote: > > > https://codereview.chromium.org/684783003/diff/1/Source/core/frame/UseCounter.h > > File Source/core/frame/UseCounter.h (right): > > > > > https://codereview.chromium.org/684783003/diff/1/Source/core/frame/UseCounter... > > Source/core/frame/UseCounter.h:547: WindowPostMessage = 575, > > It would have been "more correct" to move RenderRuby down & renumber it, as it > > was landed later. > > Done. thanks, lgtm.
Why is there an extra blank line between these? You didn't add it, but you preserved it :)
On 2014/10/28 10:45:19, philipj wrote: > Why is there an extra blank line between these? You didn't add it, but you > preserved it :) Removed it :)
The CQ bit was checked by kouhei@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/684783003/60001
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: win_blink_rel on tryserver.blink (http://build.chromium.org/p/tryserver.blink/builders/win_blink_rel/builds/33937)
The CQ bit was checked by kouhei@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/684783003/60001
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for Source/core/frame/UseCounter.h: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file Source/core/frame/UseCounter.h Hunk #1 FAILED at 542. 1 out of 1 hunk FAILED -- saving rejects to file Source/core/frame/UseCounter.h.rej Patch: Source/core/frame/UseCounter.h Index: Source/core/frame/UseCounter.h diff --git a/Source/core/frame/UseCounter.h b/Source/core/frame/UseCounter.h index e86def6ec4f9d1960bbdf4e3e0bdcee56a72322a..37d396144679574b559d1b53129cf7e54dfb1b3c 100644 --- a/Source/core/frame/UseCounter.h +++ b/Source/core/frame/UseCounter.h @@ -542,10 +542,9 @@ public: QuotedAnimationName = 571, QuotedKeyframesRule = 572, SrcsetDroppedCandidate = 573, - RenderRuby = 574, - WindowPostMessage = 574, WindowPostMessageWithLegacyTargetOriginArgument = 575, + RenderRuby = 576, // Add new features immediately above this line. Don't change assigned // numbers of any item, and don't reuse removed slots.
The CQ bit was unchecked by commit-bot@chromium.org
The CQ bit was checked by kouhei@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/684783003/80001
Message was sent while issue was closed.
Committed patchset #5 (id:80001) as 184534
Message was sent while issue was closed.
leviw@chromium.org changed reviewers: + sigbjornf@opera.com
Message was sent while issue was closed.
D'oh! Thanks for fixing this. |