91124 2012-07-12 11:22:45 -0700 [chromium] The root layer should not try create a second RenderSurface for itself 2012-07-12 14:42:48 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 91023 1 danakj danakj cc-bugs enne jamesr piman shawnsingh webkit.review.bot wjmaclean zlieber oldest_to_newest 668017 0 danakj 2012-07-12 11:22:45 -0700 [chromium] The root layer should not try create a second RenderSurface for itself 668019 1 152009 danakj 2012-07-12 11:23:52 -0700 Created attachment 152009 Patch 668043 2 152009 enne 2012-07-12 11:48:10 -0700 Comment on attachment 152009 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=152009&action=review R=me. > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp:264 > + // The root layer always has a surface already. It's not that it has a surface already, it's that its surface is special (has a pre-set size, doesn't get a texture, is already in the surface list) so it doesn't go down the "separate surface" path. 668049 3 danakj 2012-07-12 11:51:43 -0700 (In reply to comment #2) > (From update of attachment 152009 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=152009&action=review > > R=me. > > > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp:264 > > + // The root layer always has a surface already. > > It's not that it has a surface already, it's that its surface is special (has a pre-set size, doesn't get a texture, is already in the surface list) so it doesn't go down the "separate surface" path. Hm, kinda disagree. It has a RenderSurface object on it already, but agree I can word this better. 668056 4 152016 danakj 2012-07-12 11:57:12 -0700 Created attachment 152016 Patch for landing 668071 5 shawnsingh 2012-07-12 12:21:54 -0700 I agree more with Enne's original wording... to me, that wording pointed out the idiosyncrasies in the current code that motivate putting this if-statement here. It might be true that the renderSurface existed already, but that's something we can (and may want to) change down the road. Actually on the latest patch for landing, I like the comment wording even less. It seems a bit misleading in my opinion. I personally think the right thing to say here is to explicitly acknowledge that its a deviation from the intended clean concept. something like: "even though technically the root layer's subtree does render to a separate surface, we want to force the root layer to go down the non-surface code path because it shares more common code with that case since the root surface is already expected to be initialized by outside code. This kink could eventually be fixed by reducing the special-ness of the root layer and its surface." I know its wordy... but that's the spirit of the comment I think is appropriate =) 668126 6 danakj 2012-07-12 13:05:18 -0700 This is why we shouldn't have comments :P 668241 7 152067 danakj 2012-07-12 14:40:33 -0700 Created attachment 152067 Patch 668246 8 danakj 2012-07-12 14:42:48 -0700 Committed r122511: <http://trac.webkit.org/changeset/122511> 152009 2012-07-12 11:23:52 -0700 2012-07-12 11:57:07 -0700 Patch bug-91124-20120712142351.patch text/plain 3767 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyMzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTg3MjE1N2FlMmNiMTI2 MGVjMDNmNGVmYzE2MTkxYzk0ZjM4YzRlYy4uOWRhNzQwMDIwMzhjMzM0MmZiMzZhYjU3YWNhMTlm OWJjNDQ3ZmNkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA3LTEyICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gVGhl IHJvb3QgbGF5ZXIgc2hvdWxkIG5vdCB0cnkgY3JlYXRlIGEgc2Vjb25kIFJlbmRlclN1cmZhY2Ug Zm9yIGl0c2VsZgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTExMjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUZXN0czogQ0NMYXllclRyZWVIb3N0SW1wbFRlc3Qucm9vdExheWVyRG9lc250Q3JlYXRlRXh0 cmFTdXJmYWNlCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xh eWVyVHJlZUhvc3RDb21tb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6c3VidHJlZVNob3VsZFJl bmRlclRvU2VwYXJhdGVTdXJmYWNlKToKKwogMjAxMi0wNy0xMSAgRGFuYSBKYW5zZW5zICA8ZGFu YWtqQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIFJlbmFtZSBsYXllclJlY3Qg dG8gY29udGVudFJlY3QgZm9yIHJlY3RzIHRoYXQgbGl2ZSBpbiBjb250ZW50IHNwYWNlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IGQ0NzcyZWRkYmQyM2RhNWRmNDA3ZTBjYTg4YWZmYTA1 NjczZDY1OWQuLmMwZWIzYmUyMTVlMjE0ZGY2NTY1N2RmMTUwOTY5OTBmODRhODJiYmIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTItMDctMTIgIERhbmEg SmFuc2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBUaGUg cm9vdCBsYXllciBzaG91bGQgbm90IHRyeSBjcmVhdGUgYSBzZWNvbmQgUmVuZGVyU3VyZmFjZSBm b3IgaXRzZWxmCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD05MTEyNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3BwOgorCiAyMDEyLTA3LTExICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gUmVu YW1lIGxheWVyUmVjdCB0byBjb250ZW50UmVjdCBmb3IgcmVjdHMgdGhhdCBsaXZlIGluIGNvbnRl bnQgc3BhY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RDb21tb24uY3BwCmluZGV4 IDI5Y2E0ZTc3NWZhNWI3OGNhZjA4MTEwMzcwZjJiODAzMDkyZTllOWMuLjA4MWRmMDI3NDU4OTA0 YTAzYzg4YWMyODc0MmJiYWZhOTQyYmYyMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRy ZWVIb3N0Q29tbW9uLmNwcApAQCAtMjYxLDYgKzI2MSwxMCBAQCBzdGF0aWMgaW5saW5lIGJvb2wg c3VidHJlZVNob3VsZEJlU2tpcHBlZChMYXllckNocm9taXVtKiBsYXllcikKIHRlbXBsYXRlPHR5 cGVuYW1lIExheWVyVHlwZT4KIHN0YXRpYyBib29sIHN1YnRyZWVTaG91bGRSZW5kZXJUb1NlcGFy YXRlU3VyZmFjZShMYXllclR5cGUqIGxheWVyLCBib29sIGF4aXNBbGlnbmVkV2l0aFJlc3BlY3RU b1BhcmVudCkKIHsKKyAgICAvLyBUaGUgcm9vdCBsYXllciBhbHdheXMgaGFzIGEgc3VyZmFjZSBh bHJlYWR5LgorICAgIGlmICghbGF5ZXItPnBhcmVudCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7 CisKICAgICAvLyBDYWNoZSB0aGlzIHZhbHVlLCBiZWNhdXNlIG90aGVyd2lzZSBpdCB3YWxrcyB0 aGUgZW50aXJlIHN1YnRyZWUgc2V2ZXJhbCB0aW1lcy4KICAgICBib29sIGRlc2NlbmRhbnREcmF3 c0NvbnRlbnQgPSBsYXllci0+ZGVzY2VuZGFudERyYXdzQ29udGVudCgpOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LmNw cCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3Qu Y3BwCmluZGV4IGFiZjFlZmY4ZTExMTM0YTAzMjcyZDY1ZjU5MDcyMDcwZDQ0NWQwOTguLjAzYzdi ZDk2OWEyNjNlY2EwMzFjMzk2NGMxMjBiM2Q5ODEyYzQ1MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3BwCkBA IC0xNjI5LDYgKzE2MjksMjggQEAgVEVTVF9GKENDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LCBwYXJ0 aWFsU3dhcFJlY2VpdmVzRGFtYWdlUmVjdCkKICAgICBFWFBFQ1RfRVEoZXhwZWN0ZWRTd2FwUmVj dC5oZWlnaHQoKSwgYWN0dWFsU3dhcFJlY3QuaGVpZ2h0KCkpOwogfQogCitURVNUX0YoQ0NMYXll clRyZWVIb3N0SW1wbFRlc3QsIHJvb3RMYXllckRvZXNudENyZWF0ZUV4dHJhU3VyZmFjZSkKK3sK KyAgICBDQ0xheWVySW1wbCogcm9vdCA9IG5ldyBGYWtlRHJhd2FibGVDQ0xheWVySW1wbCgxKTsK KyAgICBDQ0xheWVySW1wbCogY2hpbGQgPSBuZXcgRmFrZURyYXdhYmxlQ0NMYXllckltcGwoMik7 CisgICAgY2hpbGQtPnNldEFuY2hvclBvaW50KEZsb2F0UG9pbnQoMCwgMCkpOworICAgIGNoaWxk LT5zZXRCb3VuZHMoSW50U2l6ZSgxMCwgMTApKTsKKyAgICBjaGlsZC0+c2V0RHJhd3NDb250ZW50 KHRydWUpOworICAgIHJvb3QtPnNldEFuY2hvclBvaW50KEZsb2F0UG9pbnQoMCwgMCkpOworICAg IHJvb3QtPnNldEJvdW5kcyhJbnRTaXplKDEwLCAxMCkpOworICAgIHJvb3QtPnNldERyYXdzQ29u dGVudCh0cnVlKTsKKyAgICByb290LT5zZXRPcGFjaXR5KDAuN2YpOworICAgIHJvb3QtPmFkZENo aWxkKGFkb3B0UHRyKGNoaWxkKSk7CisKKyAgICBtX2hvc3RJbXBsLT5zZXRSb290TGF5ZXIoYWRv cHRQdHIocm9vdCkpOworCisgICAgQ0NMYXllclRyZWVIb3N0SW1wbDo6RnJhbWVEYXRhIGZyYW1l OworCisgICAgRVhQRUNUX1RSVUUobV9ob3N0SW1wbC0+cHJlcGFyZVRvRHJhdyhmcmFtZSkpOwor ICAgIEVYUEVDVF9FUSgxdSwgZnJhbWUucmVuZGVyU3VyZmFjZUxheWVyTGlzdC0+c2l6ZSgpKTsK KyAgICBFWFBFQ1RfRVEoMXUsIGZyYW1lLnJlbmRlclBhc3Nlcy5zaXplKCkpOworfQorCiB9IC8v IG5hbWVzcGFjZQogCiBjbGFzcyBGYWtlTGF5ZXJXaXRoUXVhZHMgOiBwdWJsaWMgQ0NMYXllcklt cGwgewo= 152016 2012-07-12 11:57:12 -0700 2012-07-12 14:40:29 -0700 Patch for landing bug-91124-20120712145711.patch text/plain 3827 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyMzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTg3MjE1N2FlMmNiMTI2 MGVjMDNmNGVmYzE2MTkxYzk0ZjM4YzRlYy4uYWVhY2EzNTJkNGE3ZTNkYjljN2Q2MTlhYTYzYjMy M2FiOTFlOTYxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA3LTEyICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gVGhl IHJvb3QgbGF5ZXIgc2hvdWxkIG5vdCB0cnkgY3JlYXRlIGEgc2Vjb25kIFJlbmRlclN1cmZhY2Ug Zm9yIGl0c2VsZgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTExMjQKKworICAgICAgICBSZXZpZXdlZCBieSBBZHJpZW5uZSBXYWxrZXIuCisKKyAgICAg ICAgVGVzdHM6IENDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LnJvb3RMYXllckRvZXNudENyZWF0ZUV4 dHJhU3VyZmFjZQorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NM YXllclRyZWVIb3N0Q29tbW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnN1YnRyZWVTaG91bGRS ZW5kZXJUb1NlcGFyYXRlU3VyZmFjZSk6CisKIDIwMTItMDctMTEgIERhbmEgSmFuc2VucyAgPGRh bmFrakBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBSZW5hbWUgbGF5ZXJSZWN0 IHRvIGNvbnRlbnRSZWN0IGZvciByZWN0cyB0aGF0IGxpdmUgaW4gY29udGVudCBzcGFjZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCBkNDc3MmVkZGJkMjNkYTVkZjQwN2UwY2E4OGFmZmEw NTY3M2Q2NTlkLi41NWU5ZGQ0ZDE3OGNjYjU4Mzk5YzM5NjkyYjFiOTE1NjhkMDRjODdiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDEyLTA3LTEyICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gVGhl IHJvb3QgbGF5ZXIgc2hvdWxkIG5vdCB0cnkgY3JlYXRlIGEgc2Vjb25kIFJlbmRlclN1cmZhY2Ug Zm9yIGl0c2VsZgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTExMjQKKworICAgICAgICBSZXZpZXdlZCBieSBBZHJpZW5uZSBXYWxrZXIuCisKKyAgICAg ICAgKiB0ZXN0cy9DQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5jcHA6CisKIDIwMTItMDctMTEgIERh bmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBS ZW5hbWUgbGF5ZXJSZWN0IHRvIGNvbnRlbnRSZWN0IGZvciByZWN0cyB0aGF0IGxpdmUgaW4gY29u dGVudCBzcGFjZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0Q29tbW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHAKaW5k ZXggMjljYTRlNzc1ZmE1Yjc4Y2FmMDgxMTAzNzBmMmI4MDMwOTJlOWU5Yy4uNmI1MWQ2NDdkOGZh MjFmZmEzNDE1M2FlYjNiZDhkODdiZWZmMTVkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0Q29tbW9uLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVy VHJlZUhvc3RDb21tb24uY3BwCkBAIC0yNjEsNiArMjYxLDExIEBAIHN0YXRpYyBpbmxpbmUgYm9v bCBzdWJ0cmVlU2hvdWxkQmVTa2lwcGVkKExheWVyQ2hyb21pdW0qIGxheWVyKQogdGVtcGxhdGU8 dHlwZW5hbWUgTGF5ZXJUeXBlPgogc3RhdGljIGJvb2wgc3VidHJlZVNob3VsZFJlbmRlclRvU2Vw YXJhdGVTdXJmYWNlKExheWVyVHlwZSogbGF5ZXIsIGJvb2wgYXhpc0FsaWduZWRXaXRoUmVzcGVj dFRvUGFyZW50KQogeworICAgIC8vIFRoZSByb290IGxheWVyIHdpbGwgbm90IGhhdmUgYSB0ZXh0 dXJlLCBhbmQgc2hvdWxkIGJlIHRyZWF0ZWQgYXMgaWYgaXQKKyAgICAvLyBkb2VzIG5vdCBvd24g YSBzdXJmYWNlLgorICAgIGlmICghbGF5ZXItPnBhcmVudCgpKQorICAgICAgICByZXR1cm4gZmFs c2U7CisKICAgICAvLyBDYWNoZSB0aGlzIHZhbHVlLCBiZWNhdXNlIG90aGVyd2lzZSBpdCB3YWxr cyB0aGUgZW50aXJlIHN1YnRyZWUgc2V2ZXJhbCB0aW1lcy4KICAgICBib29sIGRlc2NlbmRhbnRE cmF3c0NvbnRlbnQgPSBsYXllci0+ZGVzY2VuZGFudERyYXdzQ29udGVudCgpOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdEltcGxUZXN0 LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRl c3QuY3BwCmluZGV4IGFiZjFlZmY4ZTExMTM0YTAzMjcyZDY1ZjU5MDcyMDcwZDQ0NWQwOTguLjAz YzdiZDk2OWEyNjNlY2EwMzFjMzk2NGMxMjBiM2Q5ODEyYzQ1MmMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3Bw CkBAIC0xNjI5LDYgKzE2MjksMjggQEAgVEVTVF9GKENDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LCBw YXJ0aWFsU3dhcFJlY2VpdmVzRGFtYWdlUmVjdCkKICAgICBFWFBFQ1RfRVEoZXhwZWN0ZWRTd2Fw UmVjdC5oZWlnaHQoKSwgYWN0dWFsU3dhcFJlY3QuaGVpZ2h0KCkpOwogfQogCitURVNUX0YoQ0NM YXllclRyZWVIb3N0SW1wbFRlc3QsIHJvb3RMYXllckRvZXNudENyZWF0ZUV4dHJhU3VyZmFjZSkK K3sKKyAgICBDQ0xheWVySW1wbCogcm9vdCA9IG5ldyBGYWtlRHJhd2FibGVDQ0xheWVySW1wbCgx KTsKKyAgICBDQ0xheWVySW1wbCogY2hpbGQgPSBuZXcgRmFrZURyYXdhYmxlQ0NMYXllckltcGwo Mik7CisgICAgY2hpbGQtPnNldEFuY2hvclBvaW50KEZsb2F0UG9pbnQoMCwgMCkpOworICAgIGNo aWxkLT5zZXRCb3VuZHMoSW50U2l6ZSgxMCwgMTApKTsKKyAgICBjaGlsZC0+c2V0RHJhd3NDb250 ZW50KHRydWUpOworICAgIHJvb3QtPnNldEFuY2hvclBvaW50KEZsb2F0UG9pbnQoMCwgMCkpOwor ICAgIHJvb3QtPnNldEJvdW5kcyhJbnRTaXplKDEwLCAxMCkpOworICAgIHJvb3QtPnNldERyYXdz Q29udGVudCh0cnVlKTsKKyAgICByb290LT5zZXRPcGFjaXR5KDAuN2YpOworICAgIHJvb3QtPmFk ZENoaWxkKGFkb3B0UHRyKGNoaWxkKSk7CisKKyAgICBtX2hvc3RJbXBsLT5zZXRSb290TGF5ZXIo YWRvcHRQdHIocm9vdCkpOworCisgICAgQ0NMYXllclRyZWVIb3N0SW1wbDo6RnJhbWVEYXRhIGZy YW1lOworCisgICAgRVhQRUNUX1RSVUUobV9ob3N0SW1wbC0+cHJlcGFyZVRvRHJhdyhmcmFtZSkp OworICAgIEVYUEVDVF9FUSgxdSwgZnJhbWUucmVuZGVyU3VyZmFjZUxheWVyTGlzdC0+c2l6ZSgp KTsKKyAgICBFWFBFQ1RfRVEoMXUsIGZyYW1lLnJlbmRlclBhc3Nlcy5zaXplKCkpOworfQorCiB9 IC8vIG5hbWVzcGFjZQogCiBjbGFzcyBGYWtlTGF5ZXJXaXRoUXVhZHMgOiBwdWJsaWMgQ0NMYXll ckltcGwgewo= 152067 2012-07-12 14:40:33 -0700 2012-07-12 14:40:33 -0700 Patch bug-91124-20120712174032.patch text/plain 3857 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyMzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTg3MjE1N2FlMmNiMTI2 MGVjMDNmNGVmYzE2MTkxYzk0ZjM4YzRlYy4uYWVhY2EzNTJkNGE3ZTNkYjljN2Q2MTlhYTYzYjMy M2FiOTFlOTYxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA3LTEyICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gVGhl IHJvb3QgbGF5ZXIgc2hvdWxkIG5vdCB0cnkgY3JlYXRlIGEgc2Vjb25kIFJlbmRlclN1cmZhY2Ug Zm9yIGl0c2VsZgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTExMjQKKworICAgICAgICBSZXZpZXdlZCBieSBBZHJpZW5uZSBXYWxrZXIuCisKKyAgICAg ICAgVGVzdHM6IENDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LnJvb3RMYXllckRvZXNudENyZWF0ZUV4 dHJhU3VyZmFjZQorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NM YXllclRyZWVIb3N0Q29tbW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnN1YnRyZWVTaG91bGRS ZW5kZXJUb1NlcGFyYXRlU3VyZmFjZSk6CisKIDIwMTItMDctMTEgIERhbmEgSmFuc2VucyAgPGRh bmFrakBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBSZW5hbWUgbGF5ZXJSZWN0 IHRvIGNvbnRlbnRSZWN0IGZvciByZWN0cyB0aGF0IGxpdmUgaW4gY29udGVudCBzcGFjZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCBkNDc3MmVkZGJkMjNkYTVkZjQwN2UwY2E4OGFmZmEw NTY3M2Q2NTlkLi41NWU5ZGQ0ZDE3OGNjYjU4Mzk5YzM5NjkyYjFiOTE1NjhkMDRjODdiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDEyLTA3LTEyICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gVGhl IHJvb3QgbGF5ZXIgc2hvdWxkIG5vdCB0cnkgY3JlYXRlIGEgc2Vjb25kIFJlbmRlclN1cmZhY2Ug Zm9yIGl0c2VsZgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTExMjQKKworICAgICAgICBSZXZpZXdlZCBieSBBZHJpZW5uZSBXYWxrZXIuCisKKyAgICAg ICAgKiB0ZXN0cy9DQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5jcHA6CisKIDIwMTItMDctMTEgIERh bmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBS ZW5hbWUgbGF5ZXJSZWN0IHRvIGNvbnRlbnRSZWN0IGZvciByZWN0cyB0aGF0IGxpdmUgaW4gY29u dGVudCBzcGFjZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0Q29tbW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHAKaW5k ZXggMjljYTRlNzc1ZmE1Yjc4Y2FmMDgxMTAzNzBmMmI4MDMwOTJlOWU5Yy4uMWM2Nzc1NTVhNzky NTI1ZGNkMWFjMzEzYTM1NzFjYzc1YTdlNmNjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0Q29tbW9uLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVy VHJlZUhvc3RDb21tb24uY3BwCkBAIC0yNjEsNiArMjYxLDExIEBAIHN0YXRpYyBpbmxpbmUgYm9v bCBzdWJ0cmVlU2hvdWxkQmVTa2lwcGVkKExheWVyQ2hyb21pdW0qIGxheWVyKQogdGVtcGxhdGU8 dHlwZW5hbWUgTGF5ZXJUeXBlPgogc3RhdGljIGJvb2wgc3VidHJlZVNob3VsZFJlbmRlclRvU2Vw YXJhdGVTdXJmYWNlKExheWVyVHlwZSogbGF5ZXIsIGJvb2wgYXhpc0FsaWduZWRXaXRoUmVzcGVj dFRvUGFyZW50KQogeworICAgIC8vIFRoZSByb290IGxheWVyIGhhcyBhIHNwZWNpYWwgcmVuZGVy IHN1cmZhY2UgdGhhdCBpcyBzZXQgdXAgZXh0ZXJuYWxseSwgc28KKyAgICAvLyBpdCBzaG91bGRu J3QgYmUgdHJlYXRlZCBhcyBhIHN1cmZhY2UgaW4gdGhpcyBjb2RlLgorICAgIGlmICghbGF5ZXIt PnBhcmVudCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICAvLyBDYWNoZSB0aGlzIHZh bHVlLCBiZWNhdXNlIG90aGVyd2lzZSBpdCB3YWxrcyB0aGUgZW50aXJlIHN1YnRyZWUgc2V2ZXJh bCB0aW1lcy4KICAgICBib29sIGRlc2NlbmRhbnREcmF3c0NvbnRlbnQgPSBsYXllci0+ZGVzY2Vu ZGFudERyYXdzQ29udGVudCgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3BwCmluZGV4IGFiZjFlZmY4ZTExMTM0 YTAzMjcyZDY1ZjU5MDcyMDcwZDQ0NWQwOTguLjAzYzdiZDk2OWEyNjNlY2EwMzFjMzk2NGMxMjBi M2Q5ODEyYzQ1MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NM YXllclRyZWVIb3N0SW1wbFRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVz dHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3BwCkBAIC0xNjI5LDYgKzE2MjksMjggQEAgVEVT VF9GKENDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LCBwYXJ0aWFsU3dhcFJlY2VpdmVzRGFtYWdlUmVj dCkKICAgICBFWFBFQ1RfRVEoZXhwZWN0ZWRTd2FwUmVjdC5oZWlnaHQoKSwgYWN0dWFsU3dhcFJl Y3QuaGVpZ2h0KCkpOwogfQogCitURVNUX0YoQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QsIHJvb3RM YXllckRvZXNudENyZWF0ZUV4dHJhU3VyZmFjZSkKK3sKKyAgICBDQ0xheWVySW1wbCogcm9vdCA9 IG5ldyBGYWtlRHJhd2FibGVDQ0xheWVySW1wbCgxKTsKKyAgICBDQ0xheWVySW1wbCogY2hpbGQg PSBuZXcgRmFrZURyYXdhYmxlQ0NMYXllckltcGwoMik7CisgICAgY2hpbGQtPnNldEFuY2hvclBv aW50KEZsb2F0UG9pbnQoMCwgMCkpOworICAgIGNoaWxkLT5zZXRCb3VuZHMoSW50U2l6ZSgxMCwg MTApKTsKKyAgICBjaGlsZC0+c2V0RHJhd3NDb250ZW50KHRydWUpOworICAgIHJvb3QtPnNldEFu Y2hvclBvaW50KEZsb2F0UG9pbnQoMCwgMCkpOworICAgIHJvb3QtPnNldEJvdW5kcyhJbnRTaXpl KDEwLCAxMCkpOworICAgIHJvb3QtPnNldERyYXdzQ29udGVudCh0cnVlKTsKKyAgICByb290LT5z ZXRPcGFjaXR5KDAuN2YpOworICAgIHJvb3QtPmFkZENoaWxkKGFkb3B0UHRyKGNoaWxkKSk7CisK KyAgICBtX2hvc3RJbXBsLT5zZXRSb290TGF5ZXIoYWRvcHRQdHIocm9vdCkpOworCisgICAgQ0NM YXllclRyZWVIb3N0SW1wbDo6RnJhbWVEYXRhIGZyYW1lOworCisgICAgRVhQRUNUX1RSVUUobV9o b3N0SW1wbC0+cHJlcGFyZVRvRHJhdyhmcmFtZSkpOworICAgIEVYUEVDVF9FUSgxdSwgZnJhbWUu cmVuZGVyU3VyZmFjZUxheWVyTGlzdC0+c2l6ZSgpKTsKKyAgICBFWFBFQ1RfRVEoMXUsIGZyYW1l LnJlbmRlclBhc3Nlcy5zaXplKCkpOworfQorCiB9IC8vIG5hbWVzcGFjZQogCiBjbGFzcyBGYWtl TGF5ZXJXaXRoUXVhZHMgOiBwdWJsaWMgQ0NMYXllckltcGwgewo=