Bug 65555 – Chromium: Update forked ScrollbarThemeChromiumMac.mm

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Sailesh Agrawal]

Chromium: Update forked ScrollbarThemeChromiumMac.mm

[Sailesh Agrawal]

Created attachment 102671 [details]
Patch

[James Robinson]

Comment on attachment 102671 [details]
Patch

OK.  What's the plan for unforking?

[Sailesh Agrawal]

(In reply to comment #2)
> (From update of attachment 102671 [details])
> OK.  What's the plan for unforking?

It looks like people has started working on adding smooth scrolling to Chromium Mac. Once that lands I'll delete the forked files and start using the original versions.

[WebKit Review Bot]

Comment on attachment 102671 [details]
Patch

Clearing flags on attachment: 102671

Committed r92238: <http://trac.webkit.org/changeset/92238>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.

[Zhenyao Mo]

Your patch is rolled out in r92248 due to fast/events/scrollbar-double-click.html failing on Mac.

Reopen this bug.

Below is the test result diff from our Mac bots:

--- /b/build/slave/Webkit_Mac10_5/build/layout-test-results/fast/events/scrollbar-double-click-expected.txt 
+++ /b/build/slave/Webkit_Mac10_5/build/layout-test-results/fast/events/scrollbar-double-click-actual.txt 
@@ -1,1 +1,1 @@
-Scroll offset is 700
+Scroll offset is 720

[Sailesh Agrawal]

Sorry about that Zhenyao.

This is probably due to the addition of maxOverlapBetweenPages().

Looking into it.

[Nico Weber]

Might be the test just needs to be rebased. What does the webkit/mac expectations file say? Does it still match ours?

[Sailesh Agrawal]

Created attachment 102795 [details]
Patch

[Sailesh Agrawal]

Updated the expectation file to match the one in platform/mac
Please take another look.
Thanks

[James Robinson]

Comment on attachment 102795 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=102795&action=review

> LayoutTests/platform/chromium-mac/fast/events/scrollbar-double-click-expected.txt:1
> +Scroll offset is 720

this matches LayoutTests/platform/mac/fast/events/scrollbar-double-click-expected.txt, so you can just delete this file completely instead of making it match.

[Sailesh Agrawal]

change looks on on try bots:
- http://build.chromium.org/p/tryserver.chromium/builders/mac_layout_rel/builds/274
- http://build.chromium.org/p/tryserver.chromium/builders/win_layout_rel/builds/437
- http://build.chromium.org/p/tryserver.chromium/builders/linux_layout/builds/1150

[Nico Weber]

sail: Update the patch locally to delete the expectations file like jamesr recommends, then upload it with "webkit-patch land-safely". I will set cq+, you don't need another r+ in that case.

[Sailesh Agrawal]

Created attachment 104151 [details]
Patch for landing

[WebKit Review Bot]

Comment on attachment 104151 [details]
Patch for landing

Rejecting attachment 104151 [details] from commit-queue.

[e-mail] does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py.

- If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags.

- If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed).  The commit-queue restarts itself every 2 hours.  After restart the commit-queue will correctly respect your committer rights.

[WebKit Review Bot]

Comment on attachment 104151 [details]
Patch for landing

Rejecting attachment 104151 [details] from commit-queue.

Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=ec2-cq-02', '--port..." exit_code: 2

Last 500 characters of output:
form/chromium/ScrollbarThemeChromiumMac.mm
Hunk #1 succeeded at 172 (offset 9 lines).
Hunk #2 succeeded at 184 (offset 9 lines).
Hunk #3 succeeded at 248 (offset 24 lines).
Hunk #4 FAILED at 447.
Hunk #5 succeeded at 495 (offset 25 lines).
Hunk #6 succeeded at 532 (offset 25 lines).
1 out of 6 hunks FAILED -- saving rejects to file Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm.rej

Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force']" exit_code: 1

Full output: http://queues.webkit.org/results/9403854

[Sailesh Agrawal]

Created attachment 104391 [details]
Patch for landing

[WebKit Review Bot]

Comment on attachment 104391 [details]
Patch for landing

Rejecting attachment 104391 [details] from commit-queue.

[e-mail] does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py.

- If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags.

- If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed).  The commit-queue restarts itself every 2 hours.  After restart the commit-queue will correctly respect your committer rights.

[Sailesh Agrawal]

Created attachment 104392 [details]
Patch for landing

[WebKit Review Bot]

Comment on attachment 104392 [details]
Patch for landing

Rejecting attachment 104392 [details] from commit-queue.

[e-mail] does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py.

- If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags.

- If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed).  The commit-queue restarts itself every 2 hours.  After restart the commit-queue will correctly respect your committer rights.

[WebKit Review Bot]

Comment on attachment 104392 [details]
Patch for landing

Rejecting attachment 104392 [details] from commit-queue.

Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=ec2-cq-02', '--port..." exit_code: 2

Last 500 characters of output:
g file Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.h
patching file Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm
Hunk #1 succeeded at 173 (offset 1 line).
Hunk #2 succeeded at 185 (offset 1 line).
Hunk #3 succeeded at 254 (offset 6 lines).
Hunk #4 succeeded at 477 (offset 6 lines).
Hunk #5 succeeded at 489 (offset 6 lines).
Hunk #6 succeeded at 526 (offset 6 lines).

Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force']" exit_code: 1

Full output: http://queues.webkit.org/results/9419886

[Sailesh Agrawal]

Created attachment 104398 [details]
Patch for landing

[WebKit Review Bot]

Comment on attachment 104398 [details]
Patch for landing

Rejecting attachment 104398 [details] from commit-queue.

[e-mail] does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py.

- If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags.

- If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed).  The commit-queue restarts itself every 2 hours.  After restart the commit-queue will correctly respect your committer rights.

[James Robinson]

Sail, you aren't a WebKit committer so you can't mark patches commit-queue+.  Mark it commit-queue? and any committer (like Nico) can set it to commit-queue+.

[Nico Weber]

Comment on attachment 104398 [details]
Patch for landing

(my bad, i told him to use land-safely 'cause i thought that fills in the reviewer. but upload --reviewer should do that, too)

[Sailesh Agrawal]

(In reply to comment #25)
> (From update of attachment 104398 [details])
> (my bad, i told him to use land-safely 'cause i thought that fills in the reviewer. but upload --reviewer should do that, too)

Ahh, will try that next time.

[WebKit Review Bot]

Comment on attachment 104398 [details]
Patch for landing

Clearing flags on attachment: 104398

Committed r93356: <http://trac.webkit.org/changeset/93356>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.