104294 2012-12-06 13:45:40 -0800 Incorrect position of layers for fixed position elements when page is scaled smaller than viewport 2012-12-14 15:11:02 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 102543 104303 1 wangxianzhu wangxianzhu andersca bdakin dglazkov jamesr kenneth klobag simon.fraser skyostil tonikitoo webkit.review.bot oldest_to_newest 785216 0 178072 wangxianzhu 2012-12-06 13:45:40 -0800 Created attachment 178072 test case This might be for Chromium only. Not tested on other platforms. scrollOffsetForFixedPosition() calculates incorrect position for fixed elements when the content (originally larger than viewport) is scaled to smaller than the viewport, causing the graphics layers of fixed position elements be placed at wrong positions. To reproduce, run the attached test case on chromium-linux. The position of the layer for the fixed element is (218, 230). Should be (10, 10). 785253 1 178080 wangxianzhu 2012-12-06 14:11:28 -0800 Created attachment 178080 Patch 785299 2 178080 webkit.review.bot 2012-12-06 14:46:52 -0800 Comment on attachment 178080 Patch Attachment 178080 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/15170670 785312 3 178087 wangxianzhu 2012-12-06 14:55:34 -0800 Created attachment 178087 Add missing expected file 786230 4 178087 wangxianzhu 2012-12-07 15:30:59 -0800 Comment on attachment 178087 Add missing expected file View in context: https://bugs.webkit.org/attachment.cgi?id=178087&action=review Added some explanations for reviewers. > Source/WebCore/page/scrolling/ScrollingCoordinator.cpp:71 > + if (maxValue <= 0) If contentsSize < visibleContentSize, return 0 directly. All other changed code should be equivalent with the original code. > Source/WebCore/page/scrolling/ScrollingCoordinator.cpp:-94 > - (contentsSize.height() - visibleContentRect.height() * frameScaleFactor) / maxOffset.height()); The above code is moved into fixedPositionScrollOffset(). Here maxOffset might be 0, and there were unnecessary floating point operations on infinity values. 787695 5 wangxianzhu 2012-12-10 13:49:29 -0800 @bdakin, could you please review this change? Thanks! 788833 6 178087 jamesr 2012-12-11 15:00:58 -0800 Comment on attachment 178087 Add missing expected file R=me 788854 7 178087 webkit.review.bot 2012-12-11 15:23:23 -0800 Comment on attachment 178087 Add missing expected file Clearing flags on attachment: 178087 Committed r137368: <http://trac.webkit.org/changeset/137368> 788856 8 webkit.review.bot 2012-12-11 15:23:30 -0800 All reviewed patches have been landed. Closing bug. 791888 9 bdakin 2012-12-14 15:07:16 -0800 compositing/geometry/fixed-position-composited-page-scale-smaller-than-viewport.html is failing on the WK2 bots. 791891 10 bdakin 2012-12-14 15:11:02 -0800 (In reply to comment #9) > compositing/geometry/fixed-position-composited-page-scale-smaller-than-viewport.html is failing on the WK2 bots. Though it seems fine on my computer. Ugh. 178072 2012-12-06 13:45:40 -0800 2012-12-06 13:45:40 -0800 test case fixed-position-scaled-smaller-than-viewport.html text/html 757 wangxianzhu PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KPHN0eWxlPgogIGJvZHkgewogICAgd2lkdGg6 IDEwMDBweDsKICAgIGhlaWdodDogODAwcHg7CiAgfQogIC5maXhlZCB7CiAgICBwb3NpdGlvbjog Zml4ZWQ7CiAgICBsZWZ0OiAxMHB4OwogICAgdG9wOiAxMHB4OwogICAgd2lkdGg6IDEwMHB4Owog ICAgaGVpZ2h0OiAxMDBweDsKICB9Cjwvc3R5bGU+CjxzY3JpcHQ+CiAgaWYgKHdpbmRvdy5pbnRl cm5hbHMpIHsKICAgIHdpbmRvdy5pbnRlcm5hbHMuc2V0dGluZ3Muc2V0RW5hYmxlQ29tcG9zaXRp bmdGb3JGaXhlZFBvc2l0aW9uKHRydWUpOwogICAgd2luZG93LmludGVybmFscy5zZXR0aW5ncy5z ZXRGaXhlZFBvc2l0aW9uQ3JlYXRlc1N0YWNraW5nQ29udGV4dCh0cnVlKTsKICAgIGludGVybmFs cy5zZXRQYWdlU2NhbGVGYWN0b3IoMC41LCAwLCAwKTsKICB9CiAgZnVuY3Rpb24gdGVzdCgpIHsK ICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKICAgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7 CiAgICBpZiAod2luZG93LmludGVybmFscykKICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo ImxheWVyVHJlZSIpLmlubmVyVGV4dCA9IHdpbmRvdy5pbnRlcm5hbHMubGF5ZXJUcmVlQXNUZXh0 KGRvY3VtZW50KTsKICB9Cjwvc2NyaXB0Pgo8L2hlYWQ+Cjxib2R5IG9ubG9hZD0idGVzdCgpIj4K ICA8ZGl2IGNsYXNzPSJmaXhlZCI+PC9kaXY+CiAgPHByZSBpZD0ibGF5ZXJUcmVlIj48L3ByZT4K PC9ib2R5Pgo8L2h0bWw+Cg== 178080 2012-12-06 14:11:28 -0800 2012-12-06 14:55:24 -0800 Patch bug-104294-20121206220852.patch text/plain 6488 wangxianzhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2ODU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWI1ZjA3YTVlYmJmNDli OGQ4M2U1MmFkY2IzYTI3ZThjYTA5NTNmMy4uMmZiYTJmNDIyMjJjOWU4M2IxN2VkYmFjNWViYjFj ZDE4YTY3OTcyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTEyLTA2ICBYaWFu emh1IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5jb3JyZWN0 IHBvc2l0aW9uIG9mIGxheWVycyBmb3IgZml4ZWQgcG9zaXRpb24gZWxlbWVudHMgd2hlbiBwYWdl IGlzIHNjYWxlZCBzbWFsbGVyIHRoYW4gdmlld3BvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNDI5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeGVkIGlzc3VlIGluIHNjcm9sbE9mZnNldEZvckZp eGVkUG9zaXRpb24gd2hlbiBjb250ZW50UmVjdCBpcyBzbWFsbGVyIHRoYW4gdmlzaWJsZUNvbnRl bnRSZWN0LgorICAgICAgICBUaGlzIGhhcHBlbnMgd2hlbiBhIHBhZ2Ugb3JpZ2luYWxseSBiaWdn ZXIgdGhhbiB2aWV3cG9ydCBpcyBzY2FsZWQgZG93biB0byBzbWFsbGVyIHRoYW4gdGhlIHZpZXdw b3J0LgorCisgICAgICAgIFRlc3Q6IGNvbXBvc2l0aW5nL2dlb21ldHJ5L2ZpeGVkLXBvc2l0aW9u LWNvbXBvc2l0ZWQtcGFnZS1zY2FsZS1zbWFsbGVyLXRoYW4tdmlld3BvcnQuaHRtbAorCisgICAg ICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwOgorICAgICAgICAo V2ViQ29yZTo6Zml4ZWRQb3NpdGlvblNjcm9sbE9mZnNldCk6IE1vdmVkIGNvbW1vbiBjb2RlIGlu IHNjcm9sbE9mZnNldEZvckZpeGVkUG9zaXRpb24gaGVyZS4gRml4ZWQgaXNzdWUgd2hlbiBjb250 ZW50c1NpemUgPCB2aXNpYmxlQ29udGVudFNpemUuCisgICAgICAgIChXZWJDb3JlOjpzY3JvbGxP ZmZzZXRGb3JGaXhlZFBvc2l0aW9uKToKKwogMjAxMi0xMi0wNiAgSGFucyBNdWxsZXIgIDxobXVs bGVyQGFkb2JlLmNvbT4KIAogICAgICAgICBbQ1NTIEV4Y2x1c2lvbnNdIEFkZCBzdXBwb3J0IGZv ciBjb21wdXRpbmcgdGhlIGZpcnN0IGluY2x1ZGVkIGludGVydmFsIHBvc2l0aW9uLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3Iu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3Iu Y3BwCmluZGV4IGNkOTQzMmMyYTgyZDhlMDE4MDA3NDdjNGIyZmQwODc0ZTA5ZWIyNjIuLjY1NmY4 N2UzNDlmOWQwZjE3MTc4NmY5MGU4ZjZhYTZlYzA4ODkyNmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5jcHAKQEAgLTY1 LDM3ICs2NSwzMiBAQCBQYXNzUmVmUHRyPFNjcm9sbGluZ0Nvb3JkaW5hdG9yPiBTY3JvbGxpbmdD b29yZGluYXRvcjo6Y3JlYXRlKFBhZ2UqIHBhZ2UpCiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBT Y3JvbGxpbmdDb29yZGluYXRvcihwYWdlKSk7CiB9CiAKLXN0YXRpYyBpbnQgZml4ZWRQb3NpdGlv blNjcm9sbE9mZnNldChpbnQgc2Nyb2xsUG9zaXRpb24sIGludCBtYXhWYWx1ZSwgaW50IHNjcm9s bE9yaWdpbiwgZmxvYXQgZHJhZ0ZhY3RvcikKK3N0YXRpYyBpbnQgZml4ZWRQb3NpdGlvblNjcm9s bE9mZnNldChpbnQgdmlzaWJsZUNvbnRlbnRTaXplLCBpbnQgY29udGVudHNTaXplLCBpbnQgc2Ny b2xsUG9zaXRpb24sIGludCBzY3JvbGxPcmlnaW4sIGZsb2F0IGZyYW1lU2NhbGVGYWN0b3IsIGJv b2wgZml4ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSkKIHsKLSAgICBpZiAoIW1heFZh bHVlKQorICAgIGludCBtYXhWYWx1ZSA9IGNvbnRlbnRzU2l6ZSAtIHZpc2libGVDb250ZW50U2l6 ZTsKKyAgICBpZiAobWF4VmFsdWUgPD0gMCkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBpZiAo IXNjcm9sbE9yaWdpbikgewotICAgICAgICBpZiAoc2Nyb2xsUG9zaXRpb24gPCAwKQotICAgICAg ICAgICAgc2Nyb2xsUG9zaXRpb24gPSAwOwotICAgICAgICBlbHNlIGlmIChzY3JvbGxQb3NpdGlv biA+IG1heFZhbHVlKQorICAgICAgICBpZiAoc2Nyb2xsUG9zaXRpb24gPD0gMCkKKyAgICAgICAg ICAgIHJldHVybiAwOworICAgICAgICBpZiAoc2Nyb2xsUG9zaXRpb24gPiBtYXhWYWx1ZSkKICAg ICAgICAgICAgIHNjcm9sbFBvc2l0aW9uID0gbWF4VmFsdWU7CiAgICAgfSBlbHNlIHsKLSAgICAg ICAgaWYgKHNjcm9sbFBvc2l0aW9uID4gMCkKLSAgICAgICAgICAgIHNjcm9sbFBvc2l0aW9uID0g MDsKLSAgICAgICAgZWxzZSBpZiAoc2Nyb2xsUG9zaXRpb24gPCAtbWF4VmFsdWUpCisgICAgICAg IGlmIChzY3JvbGxQb3NpdGlvbiA+PSAwKQorICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAg IGlmIChzY3JvbGxQb3NpdGlvbiA8IC1tYXhWYWx1ZSkKICAgICAgICAgICAgIHNjcm9sbFBvc2l0 aW9uID0gLW1heFZhbHVlOwogICAgIH0KLSAgICAKLSAgICByZXR1cm4gc2Nyb2xsUG9zaXRpb24g KiBkcmFnRmFjdG9yOworCisgICAgZmxvYXQgZHJhZ0ZhY3RvciA9IGZpeGVkRWxlbWVudHNMYXlv dXRSZWxhdGl2ZVRvRnJhbWUgPyAxIDogKGNvbnRlbnRzU2l6ZSAtIHZpc2libGVDb250ZW50U2l6 ZSAqIGZyYW1lU2NhbGVGYWN0b3IpIC8gbWF4VmFsdWU7CisgICAgcmV0dXJuIHNjcm9sbFBvc2l0 aW9uICogZHJhZ0ZhY3RvciAvIGZyYW1lU2NhbGVGYWN0b3I7CiB9CiAKIEludFNpemUgc2Nyb2xs T2Zmc2V0Rm9yRml4ZWRQb3NpdGlvbihjb25zdCBJbnRSZWN0JiB2aXNpYmxlQ29udGVudFJlY3Qs IGNvbnN0IEludFNpemUmIGNvbnRlbnRzU2l6ZSwgY29uc3QgSW50UG9pbnQmIHNjcm9sbFBvc2l0 aW9uLCBjb25zdCBJbnRQb2ludCYgc2Nyb2xsT3JpZ2luLCBmbG9hdCBmcmFtZVNjYWxlRmFjdG9y LCBib29sIGZpeGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUpCiB7Ci0gICAgSW50U2l6 ZSBtYXhPZmZzZXQoY29udGVudHNTaXplLndpZHRoKCkgLSB2aXNpYmxlQ29udGVudFJlY3Qud2lk dGgoKSwgY29udGVudHNTaXplLmhlaWdodCgpIC0gdmlzaWJsZUNvbnRlbnRSZWN0LmhlaWdodCgp KTsKLSAgICAKLSAgICBGbG9hdFNpemUgZHJhZ0ZhY3RvciA9IGZpeGVkRWxlbWVudHNMYXlvdXRS ZWxhdGl2ZVRvRnJhbWUgPyBGbG9hdFNpemUoMSwgMSkgOiBGbG9hdFNpemUoCi0gICAgICAgIChj b250ZW50c1NpemUud2lkdGgoKSAtIHZpc2libGVDb250ZW50UmVjdC53aWR0aCgpICogZnJhbWVT Y2FsZUZhY3RvcikgLyBtYXhPZmZzZXQud2lkdGgoKSwKLSAgICAgICAgKGNvbnRlbnRzU2l6ZS5o ZWlnaHQoKSAtIHZpc2libGVDb250ZW50UmVjdC5oZWlnaHQoKSAqIGZyYW1lU2NhbGVGYWN0b3Ip IC8gbWF4T2Zmc2V0LmhlaWdodCgpKTsKLQotICAgIGludCB4ID0gZml4ZWRQb3NpdGlvblNjcm9s bE9mZnNldChzY3JvbGxQb3NpdGlvbi54KCksIG1heE9mZnNldC53aWR0aCgpLCBzY3JvbGxPcmln aW4ueCgpLCBkcmFnRmFjdG9yLndpZHRoKCkgLyBmcmFtZVNjYWxlRmFjdG9yKTsKLSAgICBpbnQg eSA9IGZpeGVkUG9zaXRpb25TY3JvbGxPZmZzZXQoc2Nyb2xsUG9zaXRpb24ueSgpLCBtYXhPZmZz ZXQuaGVpZ2h0KCksIHNjcm9sbE9yaWdpbi55KCksIGRyYWdGYWN0b3IuaGVpZ2h0KCkgLyBmcmFt ZVNjYWxlRmFjdG9yKTsKLQorICAgIGludCB4ID0gZml4ZWRQb3NpdGlvblNjcm9sbE9mZnNldCh2 aXNpYmxlQ29udGVudFJlY3Qud2lkdGgoKSwgY29udGVudHNTaXplLndpZHRoKCksIHNjcm9sbFBv c2l0aW9uLngoKSwgc2Nyb2xsT3JpZ2luLngoKSwgZnJhbWVTY2FsZUZhY3RvciwgZml4ZWRFbGVt ZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSk7CisgICAgaW50IHkgPSBmaXhlZFBvc2l0aW9uU2Ny b2xsT2Zmc2V0KHZpc2libGVDb250ZW50UmVjdC5oZWlnaHQoKSwgY29udGVudHNTaXplLmhlaWdo dCgpLCBzY3JvbGxQb3NpdGlvbi55KCksIHNjcm9sbE9yaWdpbi55KCksIGZyYW1lU2NhbGVGYWN0 b3IsIGZpeGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUpOwogICAgIHJldHVybiBJbnRT aXplKHgsIHkpOwogfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggODUzZmY4NDk2YWNjMmFmMGM4MzVmOGUzMTRmM2Q2ZmFm Y2Y5ODVlZi4uOGQ5MDdkN2Q5OTg3NWU1M2ZlNTFjYjQwZWU1ZWFiMGQwODMzYjQyNyAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE1IEBACisyMDEyLTEyLTA2ICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpodUBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5jb3JyZWN0IHBvc2l0aW9uIG9mIGxheWVycyBmb3Ig Zml4ZWQgcG9zaXRpb24gZWxlbWVudHMgd2hlbiBwYWdlIGlzIHNjYWxlZCBzbWFsbGVyIHRoYW4g dmlld3BvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEwNDI5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRlc3QgdGhlIGNhc2UgdGhhdCBhIHBhZ2UgY29udGFpbmluZyBhIGNvbXBvc2l0ZWQgZml4ZWQg cG9zaXRpb24gZWxlbWVudCBvcmlnaW5hbGx5IGJpZ2dlciB0aGFuIHRoZSB2aWV3cG9ydAorICAg ICAgICBpcyBzY2FsZWQgZG93biB0byBiZSBzbWFsbGVyIHRoYW4gdGhlIHZpZXdwb3J0LgorCisg ICAgICAgICogY29tcG9zaXRpbmcvZ2VvbWV0cnkvZml4ZWQtcG9zaXRpb24tY29tcG9zaXRlZC1w YWdlLXNjYWxlLXNtYWxsZXItdGhhbi12aWV3cG9ydC5odG1sOiBBZGRlZC4KKwogMjAxMi0xMi0w NiAgSGFucyBNdWxsZXIgIDxobXVsbGVyQGFkb2JlLmNvbT4KIAogICAgICAgICBbQ1NTIEV4Y2x1 c2lvbnNdIEFkZCBzdXBwb3J0IGZvciBjb21wdXRpbmcgdGhlIGZpcnN0IGluY2x1ZGVkIGludGVy dmFsIHBvc2l0aW9uLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvZ2VvbWV0 cnkvZml4ZWQtcG9zaXRpb24tY29tcG9zaXRlZC1wYWdlLXNjYWxlLXNtYWxsZXItdGhhbi12aWV3 cG9ydC5odG1sIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvZ2VvbWV0cnkvZml4ZWQtcG9zaXRp b24tY29tcG9zaXRlZC1wYWdlLXNjYWxlLXNtYWxsZXItdGhhbi12aWV3cG9ydC5odG1sCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAuLjE0ZmU5YWE2OTYyM2ExMmU0NThhMGNjM2RlMWZjNjM5MWEwYWQxN2IKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9nZW9tZXRyeS9maXhlZC1wb3NpdGlv bi1jb21wb3NpdGVkLXBhZ2Utc2NhbGUtc21hbGxlci10aGFuLXZpZXdwb3J0Lmh0bWwKQEAgLTAs MCArMSwzOSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHN0eWxlPgorICBi b2R5IHsKKyAgICB3aWR0aDogMTAwMHB4OworICAgIGhlaWdodDogODAwcHg7CisgIH0KKyAgLnJl ZmVyZW5jZSB7CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIGxlZnQ6IDUxcHg7CisgICAg dG9wOiA1MXB4OworICAgIHdpZHRoOiA5OHB4OworICAgIGhlaWdodDogOThweDsKKyAgICBiYWNr Z3JvdW5kLWNvbG9yOiBibHVlOworICB9CisgIC5maXhlZCB7CisgICAgcG9zaXRpb246IGZpeGVk OworICAgIGxlZnQ6IDUwcHg7CisgICAgdG9wOiA1MHB4OworICAgIHdpZHRoOiAxMDBweDsKKyAg ICBoZWlnaHQ6IDEwMHB4OworICAgIGJhY2tncm91bmQtY29sb3I6IHdoaXRlOworICB9Cis8L3N0 eWxlPgorPHNjcmlwdD4KKyAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpIHsKKyAgICB3aW5kb3cuaW50 ZXJuYWxzLnNldHRpbmdzLnNldEVuYWJsZUNvbXBvc2l0aW5nRm9yRml4ZWRQb3NpdGlvbih0cnVl KTsKKyAgICB3aW5kb3cuaW50ZXJuYWxzLnNldHRpbmdzLnNldEZpeGVkUG9zaXRpb25DcmVhdGVz U3RhY2tpbmdDb250ZXh0KHRydWUpOworICAgIHdpbmRvdy5pbnRlcm5hbHMuc2V0UGFnZVNjYWxl RmFjdG9yKDAuNSwgMCwgMCk7CisgIH0KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+CisgIE9u IHN1Y2Nlc3MsIHRoZSBibHVlIHJlZmVyZW5jZSBib3ggc2hvdWxkIGJlIGludmlzaWJsZSAoY292 ZXJlZCBieSB0aGUgZml4ZWQgYm94KS4KKyAgPGRpdiBjbGFzcz0icmVmZXJlbmNlIj48L2Rpdj4K KyAgPGRpdiBjbGFzcz0iZml4ZWQiPjwvZGl2PgorPC9ib2R5PgorPC9odG1sPgo= 178087 2012-12-06 14:55:34 -0800 2012-12-11 15:23:23 -0800 Add missing expected file bug-104294-20121206225258.patch text/plain 7408 wangxianzhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2ODU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWI1ZjA3YTVlYmJmNDli OGQ4M2U1MmFkY2IzYTI3ZThjYTA5NTNmMy4uMmZiYTJmNDIyMjJjOWU4M2IxN2VkYmFjNWViYjFj ZDE4YTY3OTcyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTEyLTA2ICBYaWFu emh1IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5jb3JyZWN0 IHBvc2l0aW9uIG9mIGxheWVycyBmb3IgZml4ZWQgcG9zaXRpb24gZWxlbWVudHMgd2hlbiBwYWdl IGlzIHNjYWxlZCBzbWFsbGVyIHRoYW4gdmlld3BvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNDI5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeGVkIGlzc3VlIGluIHNjcm9sbE9mZnNldEZvckZp eGVkUG9zaXRpb24gd2hlbiBjb250ZW50UmVjdCBpcyBzbWFsbGVyIHRoYW4gdmlzaWJsZUNvbnRl bnRSZWN0LgorICAgICAgICBUaGlzIGhhcHBlbnMgd2hlbiBhIHBhZ2Ugb3JpZ2luYWxseSBiaWdn ZXIgdGhhbiB2aWV3cG9ydCBpcyBzY2FsZWQgZG93biB0byBzbWFsbGVyIHRoYW4gdGhlIHZpZXdw b3J0LgorCisgICAgICAgIFRlc3Q6IGNvbXBvc2l0aW5nL2dlb21ldHJ5L2ZpeGVkLXBvc2l0aW9u LWNvbXBvc2l0ZWQtcGFnZS1zY2FsZS1zbWFsbGVyLXRoYW4tdmlld3BvcnQuaHRtbAorCisgICAg ICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwOgorICAgICAgICAo V2ViQ29yZTo6Zml4ZWRQb3NpdGlvblNjcm9sbE9mZnNldCk6IE1vdmVkIGNvbW1vbiBjb2RlIGlu IHNjcm9sbE9mZnNldEZvckZpeGVkUG9zaXRpb24gaGVyZS4gRml4ZWQgaXNzdWUgd2hlbiBjb250 ZW50c1NpemUgPCB2aXNpYmxlQ29udGVudFNpemUuCisgICAgICAgIChXZWJDb3JlOjpzY3JvbGxP ZmZzZXRGb3JGaXhlZFBvc2l0aW9uKToKKwogMjAxMi0xMi0wNiAgSGFucyBNdWxsZXIgIDxobXVs bGVyQGFkb2JlLmNvbT4KIAogICAgICAgICBbQ1NTIEV4Y2x1c2lvbnNdIEFkZCBzdXBwb3J0IGZv ciBjb21wdXRpbmcgdGhlIGZpcnN0IGluY2x1ZGVkIGludGVydmFsIHBvc2l0aW9uLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3Iu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3Iu Y3BwCmluZGV4IGNkOTQzMmMyYTgyZDhlMDE4MDA3NDdjNGIyZmQwODc0ZTA5ZWIyNjIuLjY1NmY4 N2UzNDlmOWQwZjE3MTc4NmY5MGU4ZjZhYTZlYzA4ODkyNmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5jcHAKQEAgLTY1 LDM3ICs2NSwzMiBAQCBQYXNzUmVmUHRyPFNjcm9sbGluZ0Nvb3JkaW5hdG9yPiBTY3JvbGxpbmdD b29yZGluYXRvcjo6Y3JlYXRlKFBhZ2UqIHBhZ2UpCiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBT Y3JvbGxpbmdDb29yZGluYXRvcihwYWdlKSk7CiB9CiAKLXN0YXRpYyBpbnQgZml4ZWRQb3NpdGlv blNjcm9sbE9mZnNldChpbnQgc2Nyb2xsUG9zaXRpb24sIGludCBtYXhWYWx1ZSwgaW50IHNjcm9s bE9yaWdpbiwgZmxvYXQgZHJhZ0ZhY3RvcikKK3N0YXRpYyBpbnQgZml4ZWRQb3NpdGlvblNjcm9s bE9mZnNldChpbnQgdmlzaWJsZUNvbnRlbnRTaXplLCBpbnQgY29udGVudHNTaXplLCBpbnQgc2Ny b2xsUG9zaXRpb24sIGludCBzY3JvbGxPcmlnaW4sIGZsb2F0IGZyYW1lU2NhbGVGYWN0b3IsIGJv b2wgZml4ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSkKIHsKLSAgICBpZiAoIW1heFZh bHVlKQorICAgIGludCBtYXhWYWx1ZSA9IGNvbnRlbnRzU2l6ZSAtIHZpc2libGVDb250ZW50U2l6 ZTsKKyAgICBpZiAobWF4VmFsdWUgPD0gMCkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBpZiAo IXNjcm9sbE9yaWdpbikgewotICAgICAgICBpZiAoc2Nyb2xsUG9zaXRpb24gPCAwKQotICAgICAg ICAgICAgc2Nyb2xsUG9zaXRpb24gPSAwOwotICAgICAgICBlbHNlIGlmIChzY3JvbGxQb3NpdGlv biA+IG1heFZhbHVlKQorICAgICAgICBpZiAoc2Nyb2xsUG9zaXRpb24gPD0gMCkKKyAgICAgICAg ICAgIHJldHVybiAwOworICAgICAgICBpZiAoc2Nyb2xsUG9zaXRpb24gPiBtYXhWYWx1ZSkKICAg ICAgICAgICAgIHNjcm9sbFBvc2l0aW9uID0gbWF4VmFsdWU7CiAgICAgfSBlbHNlIHsKLSAgICAg ICAgaWYgKHNjcm9sbFBvc2l0aW9uID4gMCkKLSAgICAgICAgICAgIHNjcm9sbFBvc2l0aW9uID0g MDsKLSAgICAgICAgZWxzZSBpZiAoc2Nyb2xsUG9zaXRpb24gPCAtbWF4VmFsdWUpCisgICAgICAg IGlmIChzY3JvbGxQb3NpdGlvbiA+PSAwKQorICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAg IGlmIChzY3JvbGxQb3NpdGlvbiA8IC1tYXhWYWx1ZSkKICAgICAgICAgICAgIHNjcm9sbFBvc2l0 aW9uID0gLW1heFZhbHVlOwogICAgIH0KLSAgICAKLSAgICByZXR1cm4gc2Nyb2xsUG9zaXRpb24g KiBkcmFnRmFjdG9yOworCisgICAgZmxvYXQgZHJhZ0ZhY3RvciA9IGZpeGVkRWxlbWVudHNMYXlv dXRSZWxhdGl2ZVRvRnJhbWUgPyAxIDogKGNvbnRlbnRzU2l6ZSAtIHZpc2libGVDb250ZW50U2l6 ZSAqIGZyYW1lU2NhbGVGYWN0b3IpIC8gbWF4VmFsdWU7CisgICAgcmV0dXJuIHNjcm9sbFBvc2l0 aW9uICogZHJhZ0ZhY3RvciAvIGZyYW1lU2NhbGVGYWN0b3I7CiB9CiAKIEludFNpemUgc2Nyb2xs T2Zmc2V0Rm9yRml4ZWRQb3NpdGlvbihjb25zdCBJbnRSZWN0JiB2aXNpYmxlQ29udGVudFJlY3Qs IGNvbnN0IEludFNpemUmIGNvbnRlbnRzU2l6ZSwgY29uc3QgSW50UG9pbnQmIHNjcm9sbFBvc2l0 aW9uLCBjb25zdCBJbnRQb2ludCYgc2Nyb2xsT3JpZ2luLCBmbG9hdCBmcmFtZVNjYWxlRmFjdG9y LCBib29sIGZpeGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUpCiB7Ci0gICAgSW50U2l6 ZSBtYXhPZmZzZXQoY29udGVudHNTaXplLndpZHRoKCkgLSB2aXNpYmxlQ29udGVudFJlY3Qud2lk dGgoKSwgY29udGVudHNTaXplLmhlaWdodCgpIC0gdmlzaWJsZUNvbnRlbnRSZWN0LmhlaWdodCgp KTsKLSAgICAKLSAgICBGbG9hdFNpemUgZHJhZ0ZhY3RvciA9IGZpeGVkRWxlbWVudHNMYXlvdXRS ZWxhdGl2ZVRvRnJhbWUgPyBGbG9hdFNpemUoMSwgMSkgOiBGbG9hdFNpemUoCi0gICAgICAgIChj b250ZW50c1NpemUud2lkdGgoKSAtIHZpc2libGVDb250ZW50UmVjdC53aWR0aCgpICogZnJhbWVT Y2FsZUZhY3RvcikgLyBtYXhPZmZzZXQud2lkdGgoKSwKLSAgICAgICAgKGNvbnRlbnRzU2l6ZS5o ZWlnaHQoKSAtIHZpc2libGVDb250ZW50UmVjdC5oZWlnaHQoKSAqIGZyYW1lU2NhbGVGYWN0b3Ip IC8gbWF4T2Zmc2V0LmhlaWdodCgpKTsKLQotICAgIGludCB4ID0gZml4ZWRQb3NpdGlvblNjcm9s bE9mZnNldChzY3JvbGxQb3NpdGlvbi54KCksIG1heE9mZnNldC53aWR0aCgpLCBzY3JvbGxPcmln aW4ueCgpLCBkcmFnRmFjdG9yLndpZHRoKCkgLyBmcmFtZVNjYWxlRmFjdG9yKTsKLSAgICBpbnQg eSA9IGZpeGVkUG9zaXRpb25TY3JvbGxPZmZzZXQoc2Nyb2xsUG9zaXRpb24ueSgpLCBtYXhPZmZz ZXQuaGVpZ2h0KCksIHNjcm9sbE9yaWdpbi55KCksIGRyYWdGYWN0b3IuaGVpZ2h0KCkgLyBmcmFt ZVNjYWxlRmFjdG9yKTsKLQorICAgIGludCB4ID0gZml4ZWRQb3NpdGlvblNjcm9sbE9mZnNldCh2 aXNpYmxlQ29udGVudFJlY3Qud2lkdGgoKSwgY29udGVudHNTaXplLndpZHRoKCksIHNjcm9sbFBv c2l0aW9uLngoKSwgc2Nyb2xsT3JpZ2luLngoKSwgZnJhbWVTY2FsZUZhY3RvciwgZml4ZWRFbGVt ZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSk7CisgICAgaW50IHkgPSBmaXhlZFBvc2l0aW9uU2Ny b2xsT2Zmc2V0KHZpc2libGVDb250ZW50UmVjdC5oZWlnaHQoKSwgY29udGVudHNTaXplLmhlaWdo dCgpLCBzY3JvbGxQb3NpdGlvbi55KCksIHNjcm9sbE9yaWdpbi55KCksIGZyYW1lU2NhbGVGYWN0 b3IsIGZpeGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUpOwogICAgIHJldHVybiBJbnRT aXplKHgsIHkpOwogfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggODUzZmY4NDk2YWNjMmFmMGM4MzVmOGUzMTRmM2Q2ZmFm Y2Y5ODVlZi4uODRmMzZlOTE2YjUwNjEzNzVkYmVmNmMwMzFhMTZmZmEyMTY4MTJhNSAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE2IEBACisyMDEyLTEyLTA2ICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpodUBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5jb3JyZWN0IHBvc2l0aW9uIG9mIGxheWVycyBmb3Ig Zml4ZWQgcG9zaXRpb24gZWxlbWVudHMgd2hlbiBwYWdlIGlzIHNjYWxlZCBzbWFsbGVyIHRoYW4g dmlld3BvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEwNDI5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRlc3QgdGhlIGNhc2UgdGhhdCBhIHBhZ2UgY29udGFpbmluZyBhIGNvbXBvc2l0ZWQgZml4ZWQg cG9zaXRpb24gZWxlbWVudCBvcmlnaW5hbGx5IGJpZ2dlciB0aGFuIHRoZSB2aWV3cG9ydAorICAg ICAgICBpcyBzY2FsZWQgZG93biB0byBiZSBzbWFsbGVyIHRoYW4gdGhlIHZpZXdwb3J0LgorCisg ICAgICAgICogY29tcG9zaXRpbmcvZ2VvbWV0cnkvZml4ZWQtcG9zaXRpb24tY29tcG9zaXRlZC1w YWdlLXNjYWxlLXNtYWxsZXItdGhhbi12aWV3cG9ydC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBj b21wb3NpdGluZy9nZW9tZXRyeS9maXhlZC1wb3NpdGlvbi1jb21wb3NpdGVkLXBhZ2Utc2NhbGUt c21hbGxlci10aGFuLXZpZXdwb3J0LWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorCiAyMDEyLTEyLTA2 ICBIYW5zIE11bGxlciAgPGhtdWxsZXJAYWRvYmUuY29tPgogCiAgICAgICAgIFtDU1MgRXhjbHVz aW9uc10gQWRkIHN1cHBvcnQgZm9yIGNvbXB1dGluZyB0aGUgZmlyc3QgaW5jbHVkZWQgaW50ZXJ2 YWwgcG9zaXRpb24uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9nZW9tZXRy eS9maXhlZC1wb3NpdGlvbi1jb21wb3NpdGVkLXBhZ2Utc2NhbGUtc21hbGxlci10aGFuLXZpZXdw b3J0LWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9nZW9tZXRyeS9maXhl ZC1wb3NpdGlvbi1jb21wb3NpdGVkLXBhZ2Utc2NhbGUtc21hbGxlci10aGFuLXZpZXdwb3J0LWV4 cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNTg3ODRiNTExNWUyOWVjMjFhMmFhMjk5N2FmYTRjZTli YzYzZWMyZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2dlb21l dHJ5L2ZpeGVkLXBvc2l0aW9uLWNvbXBvc2l0ZWQtcGFnZS1zY2FsZS1zbWFsbGVyLXRoYW4tdmll d3BvcnQtZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDE4IEBACis8IURPQ1RZUEUgaHRtbD4KKzxo dG1sPgorPGhlYWQ+Cis8c3R5bGU+CisgIGJvZHkgeworICAgIHdpZHRoOiAxMDAwcHg7CisgICAg aGVpZ2h0OiA4MDBweDsKKyAgfQorPC9zdHlsZT4KKzxzY3JpcHQ+CisgIGlmICh3aW5kb3cuaW50 ZXJuYWxzKQorICAgIHdpbmRvdy5pbnRlcm5hbHMuc2V0UGFnZVNjYWxlRmFjdG9yKDAuNSwgMCwg MCk7Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorICBPbiBzdWNjZXNzLCB0aGUgYmx1ZSBy ZWZlcmVuY2UgYm94IHNob3VsZCBiZSBpbnZpc2libGUgKGNvdmVyZWQgYnkgdGhlIGZpeGVkIGJv eCkuCis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGlu Zy9nZW9tZXRyeS9maXhlZC1wb3NpdGlvbi1jb21wb3NpdGVkLXBhZ2Utc2NhbGUtc21hbGxlci10 aGFuLXZpZXdwb3J0Lmh0bWwgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9nZW9tZXRyeS9maXhl ZC1wb3NpdGlvbi1jb21wb3NpdGVkLXBhZ2Utc2NhbGUtc21hbGxlci10aGFuLXZpZXdwb3J0Lmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uMTRmZTlhYTY5NjIzYTEyZTQ1OGEwY2MzZGUxZmM2MzkxYTBhZDE3Ygot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2dlb21ldHJ5L2ZpeGVk LXBvc2l0aW9uLWNvbXBvc2l0ZWQtcGFnZS1zY2FsZS1zbWFsbGVyLXRoYW4tdmlld3BvcnQuaHRt bApAQCAtMCwwICsxLDM5IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8c3R5 bGU+CisgIGJvZHkgeworICAgIHdpZHRoOiAxMDAwcHg7CisgICAgaGVpZ2h0OiA4MDBweDsKKyAg fQorICAucmVmZXJlbmNlIHsKKyAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgbGVmdDogNTFw eDsKKyAgICB0b3A6IDUxcHg7CisgICAgd2lkdGg6IDk4cHg7CisgICAgaGVpZ2h0OiA5OHB4Owor ICAgIGJhY2tncm91bmQtY29sb3I6IGJsdWU7CisgIH0KKyAgLmZpeGVkIHsKKyAgICBwb3NpdGlv bjogZml4ZWQ7CisgICAgbGVmdDogNTBweDsKKyAgICB0b3A6IDUwcHg7CisgICAgd2lkdGg6IDEw MHB4OworICAgIGhlaWdodDogMTAwcHg7CisgICAgYmFja2dyb3VuZC1jb2xvcjogd2hpdGU7Cisg IH0KKzwvc3R5bGU+Cis8c2NyaXB0PgorICBpZiAod2luZG93LmludGVybmFscykgeworICAgIHdp bmRvdy5pbnRlcm5hbHMuc2V0dGluZ3Muc2V0RW5hYmxlQ29tcG9zaXRpbmdGb3JGaXhlZFBvc2l0 aW9uKHRydWUpOworICAgIHdpbmRvdy5pbnRlcm5hbHMuc2V0dGluZ3Muc2V0Rml4ZWRQb3NpdGlv bkNyZWF0ZXNTdGFja2luZ0NvbnRleHQodHJ1ZSk7CisgICAgd2luZG93LmludGVybmFscy5zZXRQ YWdlU2NhbGVGYWN0b3IoMC41LCAwLCAwKTsKKyAgfQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9k eT4KKyAgT24gc3VjY2VzcywgdGhlIGJsdWUgcmVmZXJlbmNlIGJveCBzaG91bGQgYmUgaW52aXNp YmxlIChjb3ZlcmVkIGJ5IHRoZSBmaXhlZCBib3gpLgorICA8ZGl2IGNsYXNzPSJyZWZlcmVuY2Ui PjwvZGl2PgorICA8ZGl2IGNsYXNzPSJmaXhlZCI+PC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+Cg==