75044 2011-12-21 14:50:17 -0800 Make it possible to use contents layers in scrollbars 2011-12-21 15:02:53 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 525643 0 andersca 2011-12-21 14:50:17 -0800 Make it possible to use contents layers in scrollbars 525651 1 120224 andersca 2011-12-21 14:54:31 -0800 Created attachment 120224 Patch 525657 2 120224 simon.fraser 2011-12-21 14:56:52 -0800 Comment on attachment 120224 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=120224&action=review > Source/WebCore/page/ScrollingCoordinator.h:63 > + void frameViewHorizontalScrollbarLayerDidChange(FrameView*, GraphicsLayer*); Could be nice to denote which GraphicsLayer is getting passed in here. Is it the scrollbar's? 525659 3 webkit.review.bot 2011-12-21 14:57:19 -0800 Attachment 120224 did not pass style-queue: Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9 Updating OpenSource From git://git.webkit.org/WebKit 578c1d3..eac27da master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 103460 = 578c1d3f4da422dcdedb98687c619ba79bfeb36f r103461 = eac27daf25de1abb134b31a11fba2a7be9e63e0c 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... Applying: Inform the scrolling coordinator when scrollbar layers come and go Using index info to reconstruct a base tree... <stdin>:474806: trailing whitespace. [Chromium] DatabaseTrackerChromium: iterating DatabaseSet races with Database disposal on worker thread <stdin>:474827: trailing whitespace. Nothing to test, just removing redundant code. Correct behavior tested by <stdin>:475346: trailing whitespace. warning: 3 lines add whitespace errors. Falling back to patching base and 3-way merge... warning: too many files (created: 167249 deleted: 3), skipping inexact rename detection Auto-merging LayoutTests/ChangeLog CONFLICT (content): Merge conflict in LayoutTests/ChangeLog Auto-merging LayoutTests/platform/chromium/test_expectations.txt Auto-merging Source/WebCore/ChangeLog CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog Auto-merging Source/WebCore/rendering/RenderLayerCompositor.cpp CONFLICT (content): Merge conflict in Source/WebCore/rendering/RenderLayerCompositor.cpp Auto-merging Source/WebKit2/ChangeLog CONFLICT (content): Merge conflict in Source/WebKit2/ChangeLog Auto-merging Tools/ChangeLog CONFLICT (content): Merge conflict in Tools/ChangeLog Auto-merging Tools/Scripts/build-webkit Auto-merging Tools/Scripts/webkitdirs.pm CONFLICT (content): Merge conflict in Tools/Scripts/webkitdirs.pm Failed to merge in the changes. Patch failed at 0001 Inform the scrolling coordinator when scrollbar layers come and go 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 158. If any of these errors are false positives, please file a bug against check-webkit-style. 525674 4 andersca 2011-12-21 15:02:53 -0800 Committed r103462: <http://trac.webkit.org/changeset/103462> 120224 2011-12-21 14:54:31 -0800 2011-12-21 14:56:52 -0800 Patch bug-75044-20111221145443.patch text/plain 4617 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzNDU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmQ0OTM0YjU4YmJjYzQ1 NmQzN2IzNjExNGMzZDJhZDY4M2YyYzc4My4uZDU5MTVhZjA0ZDg3OGU5NjFiMDcwNDg3NjczYWJm OTcwZmZhYmEyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDExLTEyLTIxICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgTWFrZSBpdCBwb3Nz aWJsZSB0byB1c2UgY29udGVudHMgbGF5ZXJzIGluIHNjcm9sbGJhcnMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1MDQ0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYWdlL1Njcm9sbGluZ0Nvb3JkaW5h dG9yLmg6CisgICAgICAgICogcGFnZS9tYWMvU2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWMubW06Cisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdDb29yZGluYXRvcjo6ZnJhbWVWaWV3SG9yaXpvbnRh bFNjcm9sbGJhckxheWVyRGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ0Nv b3JkaW5hdG9yOjpmcmFtZVZpZXdWZXJ0aWNhbFNjcm9sbGJhckxheWVyRGlkQ2hhbmdlKToKKyAg ICAgICAgRG9uJ3QgcGFzcyBjb25zdCBHcmFwaGljc0xheWVycyB0byB0aGVzZSBtZW1iZXIgZnVu Y3Rpb25zOyB3ZSBuZWVkIHRvIGJlIGFibGUgdG8gbXV0YXRlIHRoZW0uCisKKyAgICAgICAgKiBw bGF0Zm9ybS9TY3JvbGxWaWV3LmNwcDoKKyAgICAgICAgKHBvc2l0aW9uU2Nyb2xsYmFyTGF5ZXIp OgorICAgICAgICBJZiB0aGUgc2Nyb2xsYmFyIGxheWVyIGhhcyBhIGNvbnRlbnRzIGxheWVyLCBq dXN0IHVwZGF0ZSBpdHMgY29udGVudHMgcmVjdC4gT3RoZXJ3aXNlLAorICAgICAgICBpbnZhbGlk YXRlIHRoZSBzY3JvbGxiYXIgbGF5ZXIuCisKKzIwMTEtMTItMjEgIEFuZGVycyBDYXJsc3NvbiAg PGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBBbHdheXMgcmVwb3NpdGlvbiB0aGUgc2Ny b2xsYmFyIGxheWVycyB3aGVuIHRoZSBmcmFtZSB2aWV3IHNpemUgY2hhbmdlcwogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzUwMzUKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TY3JvbGxpbmdDb29yZGluYXRvci5oIGIvU291cmNlL1dl YkNvcmUvcGFnZS9TY3JvbGxpbmdDb29yZGluYXRvci5oCmluZGV4IDkzZDAwMDc4NDI4ODcyOTgz OWNmYTllOWVmYzcwZGM1NThmZTg3MWUuLjI5NzZhMGE0YjFiMmMyZGQwNjU1YjhhZjM2OGRhYmM3 NGJjYTFmMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2Nyb2xsaW5nQ29vcmRp bmF0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgK QEAgLTYwLDEwICs2MCwxMCBAQCBwdWJsaWM6CiAgICAgdm9pZCBmcmFtZVZpZXdTY3JvbGxMYXll ckRpZENoYW5nZShGcmFtZVZpZXcqLCBjb25zdCBHcmFwaGljc0xheWVyKik7CiAKICAgICAvLyBT aG91bGQgYmUgY2FsbGVkIHdoZW5ldmVyIHRoZSBob3Jpem9udGFsIHNjcm9sbGJhciBsYXllciBm b3IgdGhlIGdpdmVuIGZyYW1lIHZpZXcgY2hhbmdlcy4KLSAgICB2b2lkIGZyYW1lVmlld0hvcml6 b250YWxTY3JvbGxiYXJMYXllckRpZENoYW5nZShGcmFtZVZpZXcqLCBjb25zdCBHcmFwaGljc0xh eWVyKik7CisgICAgdm9pZCBmcmFtZVZpZXdIb3Jpem9udGFsU2Nyb2xsYmFyTGF5ZXJEaWRDaGFu Z2UoRnJhbWVWaWV3KiwgR3JhcGhpY3NMYXllciopOwogCiAgICAgLy8gU2hvdWxkIGJlIGNhbGxl ZCB3aGVuZXZlciB0aGUgaG9yaXpvbnRhbCBzY3JvbGxiYXIgbGF5ZXIgZm9yIHRoZSBnaXZlbiBm cmFtZSB2aWV3IGNoYW5nZXMuCi0gICAgdm9pZCBmcmFtZVZpZXdWZXJ0aWNhbFNjcm9sbGJhckxh eWVyRGlkQ2hhbmdlKEZyYW1lVmlldyosIGNvbnN0IEdyYXBoaWNzTGF5ZXIqKTsKKyAgICB2b2lk IGZyYW1lVmlld1ZlcnRpY2FsU2Nyb2xsYmFyTGF5ZXJEaWRDaGFuZ2UoRnJhbWVWaWV3KiwgR3Jh cGhpY3NMYXllciopOwogCiAgICAgLy8gU2hvdWxkIGJlIGNhbGxlZCB3aGVuZXZlciB0aGUgZ2Vv bWV0cnkgb2YgdGhlIGdpdmVuIGZyYW1lIHZpZXcgY2hhbmdlcywKICAgICAvLyBpbmNsdWRpbmcg dGhlIHZpc2libGUgY29udGVudCByZWN0IGFuZCB0aGUgY29udGVudCBzaXplLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9tYWMvU2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWMubW0gYi9T b3VyY2UvV2ViQ29yZS9wYWdlL21hYy9TY3JvbGxpbmdDb29yZGluYXRvck1hYy5tbQppbmRleCA3 YmRkMmExODFhMTI1MDY1YzI4MDY2ZmMxN2FmY2MzNTI1NTExYjU3Li4wMDUzNWQyYjk4NTg1MDFi ZjQxOGZiYzI0MDEyMmRlMjE1ZDJjY2JmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L21hYy9TY3JvbGxpbmdDb29yZGluYXRvck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L21hYy9TY3JvbGxpbmdDb29yZGluYXRvck1hYy5tbQpAQCAtMTYxLDcgKzE2MSw3IEBAIHN0YXRp YyBTY3JvbGxpbmdUaHJlYWQmIHNjcm9sbGluZ1RocmVhZCgpCiAgICAgcmV0dXJuIHNjcm9sbGlu Z1RocmVhZDsKIH0KIAotdm9pZCBTY3JvbGxpbmdDb29yZGluYXRvcjo6ZnJhbWVWaWV3SG9yaXpv bnRhbFNjcm9sbGJhckxheWVyRGlkQ2hhbmdlKEZyYW1lVmlldyogZnJhbWVWaWV3LCBjb25zdCBH cmFwaGljc0xheWVyKikKK3ZvaWQgU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OmZyYW1lVmlld0hvcml6 b250YWxTY3JvbGxiYXJMYXllckRpZENoYW5nZShGcmFtZVZpZXcqIGZyYW1lVmlldywgR3JhcGhp Y3NMYXllciopCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICBBU1NFUlQobV9w YWdlKTsKQEAgLTE3Miw3ICsxNzIsNyBAQCB2b2lkIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpmcmFt ZVZpZXdIb3Jpem9udGFsU2Nyb2xsYmFyTGF5ZXJEaWRDaGFuZ2UoRnJhbWVWaWV3KgogICAgIC8v IEZJWE1FOiBJbXBsZW1lbnQuCiB9CiAKLXZvaWQgU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OmZyYW1l Vmlld1ZlcnRpY2FsU2Nyb2xsYmFyTGF5ZXJEaWRDaGFuZ2UoRnJhbWVWaWV3KiBmcmFtZVZpZXcs IGNvbnN0IEdyYXBoaWNzTGF5ZXIqKQordm9pZCBTY3JvbGxpbmdDb29yZGluYXRvcjo6ZnJhbWVW aWV3VmVydGljYWxTY3JvbGxiYXJMYXllckRpZENoYW5nZShGcmFtZVZpZXcqIGZyYW1lVmlldywg R3JhcGhpY3NMYXllciopCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICBBU1NF UlQobV9wYWdlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZp ZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKaW5kZXggYWRm Mjk1NmIwZmZkMGRmMWE2Y2Y0ZWFkZDdjMDE2NDIxM2M1YmEwMS4uNjM5OTVjMWMzYmVmOTdkOTYw ODdjMWQ0ZjZiMDY0ZDNjNDEwMDhlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vU2Nyb2xsVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmll dy5jcHAKQEAgLTkwMSwxMiArOTAxLDIyIEBAIHN0YXRpYyB2b2lkIHBvc2l0aW9uU2Nyb2xsYmFy TGF5ZXIoR3JhcGhpY3NMYXllciogZ3JhcGhpY3NMYXllciwgU2Nyb2xsYmFyKiBzY3JvCiB7CiAg ICAgaWYgKCFncmFwaGljc0xheWVyIHx8ICFzY3JvbGxiYXIpCiAgICAgICAgIHJldHVybjsKLSAg ICBncmFwaGljc0xheWVyLT5zZXREcmF3c0NvbnRlbnQodHJ1ZSk7CisKICAgICBJbnRSZWN0IHNj cm9sbGJhclJlY3QgPSBzY3JvbGxiYXItPmZyYW1lUmVjdCgpOwogICAgIGdyYXBoaWNzTGF5ZXIt PnNldFBvc2l0aW9uKHNjcm9sbGJhclJlY3QubG9jYXRpb24oKSk7Ci0gICAgaWYgKHNjcm9sbGJh clJlY3Quc2l6ZSgpICE9IGdyYXBoaWNzTGF5ZXItPnNpemUoKSkKLSAgICAgICAgZ3JhcGhpY3NM YXllci0+c2V0TmVlZHNEaXNwbGF5KCk7CisKKyAgICBpZiAoc2Nyb2xsYmFyUmVjdC5zaXplKCkg PT0gZ3JhcGhpY3NMYXllci0+c2l6ZSgpKQorICAgICAgICByZXR1cm47CisKICAgICBncmFwaGlj c0xheWVyLT5zZXRTaXplKHNjcm9sbGJhclJlY3Quc2l6ZSgpKTsKKworICAgIGlmIChncmFwaGlj c0xheWVyLT5oYXNDb250ZW50c0xheWVyKCkpIHsKKyAgICAgICAgZ3JhcGhpY3NMYXllci0+c2V0 Q29udGVudHNSZWN0KEludFJlY3QoMCwgMCwgc2Nyb2xsYmFyUmVjdC53aWR0aCgpLCBzY3JvbGxi YXJSZWN0LmhlaWdodCgpKSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBncmFwaGlj c0xheWVyLT5zZXREcmF3c0NvbnRlbnQodHJ1ZSk7CisgICAgZ3JhcGhpY3NMYXllci0+c2V0TmVl ZHNEaXNwbGF5KCk7CiB9CiAKIHN0YXRpYyB2b2lkIHBvc2l0aW9uU2Nyb2xsQ29ybmVyTGF5ZXIo R3JhcGhpY3NMYXllciogZ3JhcGhpY3NMYXllciwgY29uc3QgSW50UmVjdCYgY29ybmVyUmVjdCkK