75035 2011-12-21 14:22:39 -0800 Always reposition the scrollbar layers when the frame view size changes 2011-12-21 14:47:05 -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 525576 0 andersca 2011-12-21 14:22:39 -0800 Always reposition the scrollbar layers when the frame view size changes 525583 1 120218 andersca 2011-12-21 14:26:54 -0800 Created attachment 120218 Patch 525585 2 webkit.review.bot 2011-12-21 14:28:44 -0800 Attachment 120218 did not pass style-queue: Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9 Updating OpenSource 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 Source/WebCore/ChangeLog CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog Auto-merging Source/WebKit2/ChangeLog CONFLICT (content): Merge conflict in Source/WebKit2/ChangeLog 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. 525639 3 andersca 2011-12-21 14:47:05 -0800 Committed r103457: <http://trac.webkit.org/changeset/103457> 120218 2011-12-21 14:26:54 -0800 2011-12-21 14:39:16 -0800 Patch bug-75035-20111221142706.patch text/plain 4500 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzNDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDIzNTY5ZTViNGQ2N2Nj Mjc1MmY5ZjliZDNjNjBlNDU4MjYwZjhiMy4uOTdkYmVkZTQ0MmYyNzJjYTRhZDU4OThlYmE4MmNh MDkwNGE4Mzg3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDExLTEyLTIxICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQWx3YXlzIHJlcG9z aXRpb24gdGhlIHNjcm9sbGJhciBsYXllcnMgd2hlbiB0aGUgZnJhbWUgdmlldyBzaXplIGNoYW5n ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1MDM1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlT3ZlcmZsb3dDb250cm9sc0xheWVycyk6CisgICAgICAg IFJlbW92ZSB0aGUgbGF5ZXJzQ2hhbmdlZCBjaGVjayBhbmQgdW5jb25kaXRpb25hbGx5IGNhbGwg cG9zaXRpb25TY3JvbGxiYXJMYXllcnMoKS4gVGhpcyBvbmx5CisgICAgICAgIHdvcmtlZCBieSBh Y2NpZGVudCBiZWZvcmUgYmVjYXVzZSB3ZSB3ZXJlIHJlY3JlYXRpbmcgaG9yaXpvbnRhbCBhbmQg dmVydGljYWwgc2Nyb2xsYmFycyBvbiBldmVyeSBjYWxsLgorCisyMDExLTEyLTIxICBBbmRlcnMg Q2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgSW5mb3JtIHRoZSBzY3Jv bGxpbmcgY29vcmRpbmF0b3Igd2hlbiBzY3JvbGxiYXIgbGF5ZXJzIGNvbWUgYW5kIGdvCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NTAyOAogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCmlu ZGV4IGE2NWJkNTZiNDU1NGFlYjdhNGUzM2Y0Y2NmZGVkMzYwOGVjNmI5Y2MuLmFjNDQ2NDEzMmVh MGQ2MmE1ODcyZTI4YWE0NTFkMmIxNjNkZDZhYWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC0xNjgwLDggKzE2ODAsNiBA QCBib29sIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6cmVxdWlyZXNPdmVyaGFuZ0FyZWFzTGF5ZXIo KSBjb25zdAogCiB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlT3ZlcmZsb3dDb250 cm9sc0xheWVycygpCiB7Ci0gICAgYm9vbCBsYXllcnNDaGFuZ2VkID0gZmFsc2U7Ci0gIAogI2lm IFBMQVRGT1JNKENIUk9NSVVNKSAmJiBFTkFCTEUoUlVCQkVSX0JBTkRJTkcpCiAgICAgaWYgKHJl cXVpcmVzT3ZlcmhhbmdBcmVhc0xheWVyKCkpIHsKICAgICAgICAgaWYgKCFtX2xheWVyRm9yT3Zl cmhhbmdBcmVhcykgewpAQCAtMTY5MiwxMiArMTY5MCwxMCBAQCB2b2lkIFJlbmRlckxheWVyQ29t cG9zaXRvcjo6dXBkYXRlT3ZlcmZsb3dDb250cm9sc0xheWVycygpCiAgICAgICAgICAgICBtX2xh eWVyRm9yT3ZlcmhhbmdBcmVhcy0+c2V0RHJhd3NDb250ZW50KGZhbHNlKTsKICAgICAgICAgICAg IG1fbGF5ZXJGb3JPdmVyaGFuZ0FyZWFzLT5zZXRTaXplKG1fcmVuZGVyVmlldy0+ZnJhbWVWaWV3 KCktPmZyYW1lUmVjdCgpLnNpemUoKSk7CiAgICAgICAgICAgICBtX292ZXJmbG93Q29udHJvbHNI b3N0TGF5ZXItPmFkZENoaWxkKG1fbGF5ZXJGb3JPdmVyaGFuZ0FyZWFzLmdldCgpKTsKLSAgICAg ICAgICAgIGxheWVyc0NoYW5nZWQgPSB0cnVlOwogICAgICAgICB9CiAgICAgfSBlbHNlIGlmICht X2xheWVyRm9yT3ZlcmhhbmdBcmVhcykgewogICAgICAgICBtX2xheWVyRm9yT3ZlcmhhbmdBcmVh cy0+cmVtb3ZlRnJvbVBhcmVudCgpOwogICAgICAgICBtX2xheWVyRm9yT3ZlcmhhbmdBcmVhcyA9 IG51bGxwdHI7Ci0gICAgICAgIGxheWVyc0NoYW5nZWQgPSB0cnVlOwogICAgIH0KICNlbmRpZgog CkBAIC0xNzA4LDcgKzE3MDQsNiBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRl T3ZlcmZsb3dDb250cm9sc0xheWVycygpCiAgICAgICAgICAgICBtX2xheWVyRm9ySG9yaXpvbnRh bFNjcm9sbGJhci0+c2V0TmFtZSgiaG9yaXpvbnRhbCBzY3JvbGxiYXIiKTsKICAgICAjZW5kaWYK ICAgICAgICAgICAgIG1fb3ZlcmZsb3dDb250cm9sc0hvc3RMYXllci0+YWRkQ2hpbGQobV9sYXll ckZvckhvcml6b250YWxTY3JvbGxiYXIuZ2V0KCkpOwotICAgICAgICAgICAgbGF5ZXJzQ2hhbmdl ZCA9IHRydWU7CiAKICNpZiBFTkFCTEUoVEhSRUFERURfU0NST0xMSU5HKQogICAgICAgICAgICAg aWYgKFNjcm9sbGluZ0Nvb3JkaW5hdG9yKiBzY3JvbGxpbmdDb29yZGluYXRvciA9IHRoaXMtPnNj cm9sbGluZ0Nvb3JkaW5hdG9yKCkpCkBAIC0xNzE4LDcgKzE3MTMsNiBAQCB2b2lkIFJlbmRlckxh eWVyQ29tcG9zaXRvcjo6dXBkYXRlT3ZlcmZsb3dDb250cm9sc0xheWVycygpCiAgICAgfSBlbHNl IGlmIChtX2xheWVyRm9ySG9yaXpvbnRhbFNjcm9sbGJhcikgewogICAgICAgICBtX2xheWVyRm9y SG9yaXpvbnRhbFNjcm9sbGJhci0+cmVtb3ZlRnJvbVBhcmVudCgpOwogICAgICAgICBtX2xheWVy Rm9ySG9yaXpvbnRhbFNjcm9sbGJhciA9IG51bGxwdHI7Ci0gICAgICAgIGxheWVyc0NoYW5nZWQg PSB0cnVlOwogCiAjaWYgRU5BQkxFKFRIUkVBREVEX1NDUk9MTElORykKICAgICAgICAgaWYgKFNj cm9sbGluZ0Nvb3JkaW5hdG9yKiBzY3JvbGxpbmdDb29yZGluYXRvciA9IHRoaXMtPnNjcm9sbGlu Z0Nvb3JkaW5hdG9yKCkpCkBAIC0xNzMzLDcgKzE3MjcsNiBAQCB2b2lkIFJlbmRlckxheWVyQ29t cG9zaXRvcjo6dXBkYXRlT3ZlcmZsb3dDb250cm9sc0xheWVycygpCiAgICAgICAgICAgICBtX2xh eWVyRm9yVmVydGljYWxTY3JvbGxiYXItPnNldE5hbWUoInZlcnRpY2FsIHNjcm9sbGJhciIpOwog ICAgICNlbmRpZgogICAgICAgICAgICAgbV9vdmVyZmxvd0NvbnRyb2xzSG9zdExheWVyLT5hZGRD aGlsZChtX2xheWVyRm9yVmVydGljYWxTY3JvbGxiYXIuZ2V0KCkpOwotICAgICAgICAgICAgbGF5 ZXJzQ2hhbmdlZCA9IHRydWU7CiAKICNpZiBFTkFCTEUoVEhSRUFERURfU0NST0xMSU5HKQogICAg ICAgICAgICAgaWYgKFNjcm9sbGluZ0Nvb3JkaW5hdG9yKiBzY3JvbGxpbmdDb29yZGluYXRvciA9 IHRoaXMtPnNjcm9sbGluZ0Nvb3JkaW5hdG9yKCkpCkBAIC0xNzQzLDcgKzE3MzYsNiBAQCB2b2lk IFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlT3ZlcmZsb3dDb250cm9sc0xheWVycygpCiAg ICAgfSBlbHNlIGlmIChtX2xheWVyRm9yVmVydGljYWxTY3JvbGxiYXIpIHsKICAgICAgICAgbV9s YXllckZvclZlcnRpY2FsU2Nyb2xsYmFyLT5yZW1vdmVGcm9tUGFyZW50KCk7CiAgICAgICAgIG1f bGF5ZXJGb3JWZXJ0aWNhbFNjcm9sbGJhciA9IG51bGxwdHI7Ci0gICAgICAgIGxheWVyc0NoYW5n ZWQgPSB0cnVlOwogCiAjaWYgRU5BQkxFKFRIUkVBREVEX1NDUk9MTElORykKICAgICAgICAgaWYg KFNjcm9sbGluZ0Nvb3JkaW5hdG9yKiBzY3JvbGxpbmdDb29yZGluYXRvciA9IHRoaXMtPnNjcm9s bGluZ0Nvb3JkaW5hdG9yKCkpCkBAIC0xNzU4LDE2ICsxNzUwLDEzIEBAIHZvaWQgUmVuZGVyTGF5 ZXJDb21wb3NpdG9yOjp1cGRhdGVPdmVyZmxvd0NvbnRyb2xzTGF5ZXJzKCkKICAgICAgICAgICAg IG1fbGF5ZXJGb3JTY3JvbGxDb3JuZXItPnNldE5hbWUoInNjcm9sbCBjb3JuZXIiKTsKICAgICAj ZW5kaWYKICAgICAgICAgICAgIG1fb3ZlcmZsb3dDb250cm9sc0hvc3RMYXllci0+YWRkQ2hpbGQo bV9sYXllckZvclNjcm9sbENvcm5lci5nZXQoKSk7Ci0gICAgICAgICAgICBsYXllcnNDaGFuZ2Vk ID0gdHJ1ZTsKICAgICAgICAgfQogICAgIH0gZWxzZSBpZiAobV9sYXllckZvclNjcm9sbENvcm5l cikgewogICAgICAgICBtX2xheWVyRm9yU2Nyb2xsQ29ybmVyLT5yZW1vdmVGcm9tUGFyZW50KCk7 CiAgICAgICAgIG1fbGF5ZXJGb3JTY3JvbGxDb3JuZXIgPSBudWxscHRyOwotICAgICAgICBsYXll cnNDaGFuZ2VkID0gdHJ1ZTsKICAgICB9CiAKLSAgICBpZiAobGF5ZXJzQ2hhbmdlZCkKLSAgICAg ICAgbV9yZW5kZXJWaWV3LT5mcmFtZVZpZXcoKS0+cG9zaXRpb25TY3JvbGxiYXJMYXllcnMoKTsK KyAgICBtX3JlbmRlclZpZXctPmZyYW1lVmlldygpLT5wb3NpdGlvblNjcm9sbGJhckxheWVycygp OwogfQogCiB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZW5zdXJlUm9vdExheWVyKCkK