82501 2012-03-28 12:08:59 -0700 [chromium] Add tracing events around CCLayerTreeHostImpl visibility. 2012-03-28 14:18:41 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmocny mmocny cc-bugs jamesr nduca webkit.review.bot oldest_to_newest 590236 0 mmocny 2012-03-28 12:08:59 -0700 [chromium] Add tracing events around CCLayerTreeHostImpl visibility. 590237 1 134363 mmocny 2012-03-28 12:09:16 -0700 Created attachment 134363 Patch 590243 2 134363 mmocny 2012-03-28 12:12:46 -0700 Comment on attachment 134363 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134363&action=review > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:109 > + TRACE_EVENT_START1("webkit", "CCLayerTreeHostImpl visible", this, "CCLayerTreeHostImpl", this); This is a repeated line -- perhaps the two TRACE events should be moved into an anonymous namespace helper function that gets called instead. > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:479 > + if (m_visible) { The braces here are against style, but are NOT optional given how the following macro is written. Gives compile errors without them. > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:480 > + TRACE_EVENT_START1("webkit", "CCLayerTreeHostImpl visible", this, "CCLayerTreeHostImpl", this); I added an argument to identify the tree by address. This is because of the way tracing information is laid out, it is hard to tell when which tree is visible. 590245 3 webkit.review.bot 2012-03-28 12:12:54 -0700 Attachment 134363 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:481: One line control clauses should not use braces. [whitespace/braces] [4] Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:483: One line control clauses should not use braces. [whitespace/braces] [4] Total errors found: 2 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 590256 4 134365 mmocny 2012-03-28 12:19:05 -0700 Created attachment 134365 Patch 590258 5 134365 mmocny 2012-03-28 12:19:57 -0700 Comment on attachment 134365 Patch Using helper functions solves both the code reuse issue and style violation. 590264 6 nduca 2012-03-28 12:23:23 -0700 View in context: https://bugs.webkit.org/attachment.cgi?id=134363&action=review >> Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:109 >> + TRACE_EVENT_START1("webkit", "CCLayerTreeHostImpl visible", this, "CCLayerTreeHostImpl", this); > > This is a repeated line -- perhaps the two TRACE events should be moved into an anonymous namespace helper function that gets called instead. Yeah, no clean way to do this... >> Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:479 >> + if (m_visible) { > > The braces here are against style, but are NOT optional given how the following macro is written. Gives compile errors without them. I just pinged jbates, /me hopes he can fix this. Lets workaround this by making a didVisibilityChange helper function for now... >> Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:480 >> + TRACE_EVENT_START1("webkit", "CCLayerTreeHostImpl visible", this, "CCLayerTreeHostImpl", this); > > I added an argument to identify the tree by address. This is because of the way tracing information is laid out, it is hard to tell when which tree is visible. Thats fine. Lets also say "CCLayerTreeHostImpl::Visible" 590275 7 134365 mmocny 2012-03-28 12:30:30 -0700 Comment on attachment 134365 Patch minor patch incoming. 590281 8 134371 mmocny 2012-03-28 12:32:48 -0700 Created attachment 134371 Patch 590304 9 134375 mmocny 2012-03-28 12:50:45 -0700 Created attachment 134375 Patch 590305 10 134375 mmocny 2012-03-28 12:51:41 -0700 Comment on attachment 134375 Patch Changed didVisibilityChange function to meet webkit style of replacing if {} else {} with if { ... return; } ... 590423 11 134375 webkit.review.bot 2012-03-28 14:18:37 -0700 Comment on attachment 134375 Patch Clearing flags on attachment: 134375 Committed r112439: <http://trac.webkit.org/changeset/112439> 590424 12 webkit.review.bot 2012-03-28 14:18:41 -0700 All reviewed patches have been landed. Closing bug. 134363 2012-03-28 12:09:16 -0700 2012-03-28 12:19:01 -0700 Patch bug-82501-20120328150915.patch text/plain 2059 mmocny U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyMzkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDVjNjU0ZDgxYTlmNmVj ZTgyNDk0ODExOTkyOWYzZDk2YzU3M2JlMy4uNDI2YjkzMGZlMTVhMWZlNmZhMDEyMjNkOGY1ZWEx NmNlM2U0ZGM1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTAzLTI4ICBNaWNo YWwgTW9jbnkgIDxtbW9jbnlAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hyb21pdW1dIEFkZCB0 cmFjaW5nIGV2ZW50cyBhcm91bmQgQ0NMYXllclRyZWVIb3N0SW1wbCB2aXNpYmlsaXR5LgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI1MDEKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdEltcGwuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Q0NMYXllclRyZWVIb3N0SW1wbDo6Q0NMYXllclRyZWVIb3N0SW1wbCk6CisgICAgICAg IChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3RJbXBsOjpzZXRWaXNpYmxlKToKKwogMjAxMi0wMy0y NyAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnppbW1lcm1hbm5AcmltLmNvbT4KIAogICAgICAgICBF bmFibGUgYW5pbVZhbCBzdXBwb3J0IGZvciBTVkdBbmltYXRlZFByZXNlcnZlQXNwZWN0UmF0aW8K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2Nj L0NDTGF5ZXJUcmVlSG9zdEltcGwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHAKaW5kZXggNmM1MDIyNTYzYWVl YjJkMjc5YTU3MTk4ZDhiOTYxNjAwYjM1Y2QzNS4uNGRkMmM2NjUxNjc5OGE4OTA5M2NlODNmZjFl NThmYjEyNTAzNjI3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHAK QEAgLTEwNiw2ICsxMDYsNyBAQCBDQ0xheWVyVHJlZUhvc3RJbXBsOjpDQ0xheWVyVHJlZUhvc3RJ bXBsKGNvbnN0IENDU2V0dGluZ3MmIHNldHRpbmdzLCBDQ0xheWVyVHJlZQogICAgICwgbV90aW1l U291cmNlQ2xpZW50QWRhcHRlcihDQ0xheWVyVHJlZUhvc3RJbXBsVGltZVNvdXJjZUFkYXB0ZXI6 OmNyZWF0ZSh0aGlzLCBDQ0RlbGF5QmFzZWRUaW1lU291cmNlOjpjcmVhdGUobG93RnJlcXVlbmN5 QW5pbWF0aW9uSW50ZXJ2YWwgKiAxMDAwLjAsIENDUHJveHk6OmN1cnJlbnRUaHJlYWQoKSkpKQog ewogICAgIEFTU0VSVChDQ1Byb3h5Ojppc0ltcGxUaHJlYWQoKSk7CisgICAgVFJBQ0VfRVZFTlRf U1RBUlQxKCJ3ZWJraXQiLCAiQ0NMYXllclRyZWVIb3N0SW1wbCB2aXNpYmxlIiwgdGhpcywgIkND TGF5ZXJUcmVlSG9zdEltcGwiLCB0aGlzKTsKIH0KIAogQ0NMYXllclRyZWVIb3N0SW1wbDo6fkND TGF5ZXJUcmVlSG9zdEltcGwoKQpAQCAtNDc1LDYgKzQ3NiwxMiBAQCB2b2lkIENDTGF5ZXJUcmVl SG9zdEltcGw6OnNldFZpc2libGUoYm9vbCB2aXNpYmxlKQogICAgICAgICByZXR1cm47CiAgICAg bV92aXNpYmxlID0gdmlzaWJsZTsKIAorICAgIGlmIChtX3Zpc2libGUpIHsKKyAgICAgIFRSQUNF X0VWRU5UX1NUQVJUMSgid2Via2l0IiwgIkNDTGF5ZXJUcmVlSG9zdEltcGwgdmlzaWJsZSIsIHRo aXMsICJDQ0xheWVyVHJlZUhvc3RJbXBsIiwgdGhpcyk7CisgICAgfSBlbHNlIHsKKyAgICAgIFRS QUNFX0VWRU5UX0ZJTklTSDAoIndlYmtpdCIsICJDQ0xheWVyVHJlZUhvc3RJbXBsIHZpc2libGUi LCB0aGlzKTsKKyAgICB9CisKICAgICBpZiAoIW1fbGF5ZXJSZW5kZXJlcikKICAgICAgICAgcmV0 dXJuOwogCg== 134365 2012-03-28 12:19:05 -0700 2012-03-28 12:32:43 -0700 Patch bug-82501-20120328151904.patch text/plain 2411 mmocny U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyMzkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDVjNjU0ZDgxYTlmNmVj ZTgyNDk0ODExOTkyOWYzZDk2YzU3M2JlMy4uNDI2YjkzMGZlMTVhMWZlNmZhMDEyMjNkOGY1ZWEx NmNlM2U0ZGM1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTAzLTI4ICBNaWNo YWwgTW9jbnkgIDxtbW9jbnlAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hyb21pdW1dIEFkZCB0 cmFjaW5nIGV2ZW50cyBhcm91bmQgQ0NMYXllclRyZWVIb3N0SW1wbCB2aXNpYmlsaXR5LgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI1MDEKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdEltcGwuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Q0NMYXllclRyZWVIb3N0SW1wbDo6Q0NMYXllclRyZWVIb3N0SW1wbCk6CisgICAgICAg IChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3RJbXBsOjpzZXRWaXNpYmxlKToKKwogMjAxMi0wMy0y NyAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnppbW1lcm1hbm5AcmltLmNvbT4KIAogICAgICAgICBF bmFibGUgYW5pbVZhbCBzdXBwb3J0IGZvciBTVkdBbmltYXRlZFByZXNlcnZlQXNwZWN0UmF0aW8K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2Nj L0NDTGF5ZXJUcmVlSG9zdEltcGwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHAKaW5kZXggNmM1MDIyNTYzYWVl YjJkMjc5YTU3MTk4ZDhiOTYxNjAwYjM1Y2QzNS4uMWIyNjQzY2Y0MmNlNDQzZDIzZTM5OTRmYmUz NWUwZWRkMDRkNWM0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHAK QEAgLTQ0LDYgKzQ0LDE3IEBACiAKIG5hbWVzcGFjZSB7CiBjb25zdCBkb3VibGUgbG93RnJlcXVl bmN5QW5pbWF0aW9uSW50ZXJ2YWwgPSAxOworCit2b2lkIHN0YXJ0VHJhY2luZ0NDTGF5ZXJUcmVl SG9zdEltcGxWaXNpYmlsaXR5KFdlYkNvcmU6OkNDTGF5ZXJUcmVlSG9zdEltcGwqIGlkKQorewor ICAgIFRSQUNFX0VWRU5UX1NUQVJUMSgid2Via2l0IiwgIkNDTGF5ZXJUcmVlSG9zdEltcGwgdmlz aWJsZSIsIGlkLCAiQ0NMYXllclRyZWVIb3N0SW1wbCIsIGlkKTsKK30KKwordm9pZCBmaW5pc2hU cmFjaW5nQ0NMYXllclRyZWVIb3N0SW1wbFZpc2liaWxpdHkoV2ViQ29yZTo6Q0NMYXllclRyZWVI b3N0SW1wbCogaWQpCit7CisgICAgVFJBQ0VfRVZFTlRfRklOSVNIMCgid2Via2l0IiwgIkNDTGF5 ZXJUcmVlSG9zdEltcGwgdmlzaWJsZSIsIGlkKTsKK30KKwogfSAvLyBuYW1lc3BhY2UKIAogbmFt ZXNwYWNlIFdlYkNvcmUgewpAQCAtMTA2LDYgKzExNyw3IEBAIENDTGF5ZXJUcmVlSG9zdEltcGw6 OkNDTGF5ZXJUcmVlSG9zdEltcGwoY29uc3QgQ0NTZXR0aW5ncyYgc2V0dGluZ3MsIENDTGF5ZXJU cmVlCiAgICAgLCBtX3RpbWVTb3VyY2VDbGllbnRBZGFwdGVyKENDTGF5ZXJUcmVlSG9zdEltcGxU aW1lU291cmNlQWRhcHRlcjo6Y3JlYXRlKHRoaXMsIENDRGVsYXlCYXNlZFRpbWVTb3VyY2U6OmNy ZWF0ZShsb3dGcmVxdWVuY3lBbmltYXRpb25JbnRlcnZhbCAqIDEwMDAuMCwgQ0NQcm94eTo6Y3Vy cmVudFRocmVhZCgpKSkpCiB7CiAgICAgQVNTRVJUKENDUHJveHk6OmlzSW1wbFRocmVhZCgpKTsK KyAgICBzdGFydFRyYWNpbmdDQ0xheWVyVHJlZUhvc3RJbXBsVmlzaWJpbGl0eSh0aGlzKTsKIH0K IAogQ0NMYXllclRyZWVIb3N0SW1wbDo6fkNDTGF5ZXJUcmVlSG9zdEltcGwoKQpAQCAtNDc1LDYg KzQ4NywxMSBAQCB2b2lkIENDTGF5ZXJUcmVlSG9zdEltcGw6OnNldFZpc2libGUoYm9vbCB2aXNp YmxlKQogICAgICAgICByZXR1cm47CiAgICAgbV92aXNpYmxlID0gdmlzaWJsZTsKIAorICAgIGlm IChtX3Zpc2libGUpCisgICAgICAgIHN0YXJ0VHJhY2luZ0NDTGF5ZXJUcmVlSG9zdEltcGxWaXNp YmlsaXR5KHRoaXMpOworICAgIGVsc2UKKyAgICAgICAgZmluaXNoVHJhY2luZ0NDTGF5ZXJUcmVl SG9zdEltcGxWaXNpYmlsaXR5KHRoaXMpOworCiAgICAgaWYgKCFtX2xheWVyUmVuZGVyZXIpCiAg ICAgICAgIHJldHVybjsKIAo= 134371 2012-03-28 12:32:48 -0700 2012-03-28 12:50:40 -0700 Patch bug-82501-20120328153246.patch text/plain 2363 mmocny U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyMzkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDVjNjU0ZDgxYTlmNmVj ZTgyNDk0ODExOTkyOWYzZDk2YzU3M2JlMy4uNDI2YjkzMGZlMTVhMWZlNmZhMDEyMjNkOGY1ZWEx NmNlM2U0ZGM1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTAzLTI4ICBNaWNo YWwgTW9jbnkgIDxtbW9jbnlAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hyb21pdW1dIEFkZCB0 cmFjaW5nIGV2ZW50cyBhcm91bmQgQ0NMYXllclRyZWVIb3N0SW1wbCB2aXNpYmlsaXR5LgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI1MDEKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdEltcGwuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Q0NMYXllclRyZWVIb3N0SW1wbDo6Q0NMYXllclRyZWVIb3N0SW1wbCk6CisgICAgICAg IChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3RJbXBsOjpzZXRWaXNpYmxlKToKKwogMjAxMi0wMy0y NyAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnppbW1lcm1hbm5AcmltLmNvbT4KIAogICAgICAgICBF bmFibGUgYW5pbVZhbCBzdXBwb3J0IGZvciBTVkdBbmltYXRlZFByZXNlcnZlQXNwZWN0UmF0aW8K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2Nj L0NDTGF5ZXJUcmVlSG9zdEltcGwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHAKaW5kZXggNmM1MDIyNTYzYWVl YjJkMjc5YTU3MTk4ZDhiOTYxNjAwYjM1Y2QzNS4uYTAxMDViZjBmNjIxMzk4Zjg3MjdiNjg2MzI2 YWU2Y2JmYmIwYmYzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHAK QEAgLTQ0LDYgKzQ0LDE4IEBACiAKIG5hbWVzcGFjZSB7CiBjb25zdCBkb3VibGUgbG93RnJlcXVl bmN5QW5pbWF0aW9uSW50ZXJ2YWwgPSAxOworCit2b2lkIGRpZFZpc2liaWxpdHlDaGFuZ2UoV2Vi Q29yZTo6Q0NMYXllclRyZWVIb3N0SW1wbCogaWQsIGJvb2wgdmlzaWJsZSkKK3sKKyAgICBpZiAo dmlzaWJsZSkgeworICAgICAgICAvLyBTdGFydCBhIHRyYWNlIGZvciB2aXNpYmlsaXR5CisgICAg ICAgIFRSQUNFX0VWRU5UX1NUQVJUMSgid2Via2l0IiwgIkNDTGF5ZXJUcmVlSG9zdEltcGw6OnNl dFZpc2libGUiLCBpZCwgIkNDTGF5ZXJUcmVlSG9zdEltcGwiLCBpZCk7CisgICAgfSBlbHNlIHsK KyAgICAgICAgLy8gRmluaXNoIGEgdHJhY2UgZm9yIHZpc2liaWxpdHkKKyAgICAgICAgVFJBQ0Vf RVZFTlRfRklOSVNIMCgid2Via2l0IiwgIkNDTGF5ZXJUcmVlSG9zdEltcGw6OnNldFZpc2libGUi LCBpZCk7CisgICAgfQorfQorCiB9IC8vIG5hbWVzcGFjZQogCiBuYW1lc3BhY2UgV2ViQ29yZSB7 CkBAIC0xMDYsNiArMTE4LDcgQEAgQ0NMYXllclRyZWVIb3N0SW1wbDo6Q0NMYXllclRyZWVIb3N0 SW1wbChjb25zdCBDQ1NldHRpbmdzJiBzZXR0aW5ncywgQ0NMYXllclRyZWUKICAgICAsIG1fdGlt ZVNvdXJjZUNsaWVudEFkYXB0ZXIoQ0NMYXllclRyZWVIb3N0SW1wbFRpbWVTb3VyY2VBZGFwdGVy OjpjcmVhdGUodGhpcywgQ0NEZWxheUJhc2VkVGltZVNvdXJjZTo6Y3JlYXRlKGxvd0ZyZXF1ZW5j eUFuaW1hdGlvbkludGVydmFsICogMTAwMC4wLCBDQ1Byb3h5OjpjdXJyZW50VGhyZWFkKCkpKSkK IHsKICAgICBBU1NFUlQoQ0NQcm94eTo6aXNJbXBsVGhyZWFkKCkpOworICAgIGRpZFZpc2liaWxp dHlDaGFuZ2UodGhpcywgbV92aXNpYmxlKTsKIH0KIAogQ0NMYXllclRyZWVIb3N0SW1wbDo6fkND TGF5ZXJUcmVlSG9zdEltcGwoKQpAQCAtNDc0LDYgKzQ4Nyw3IEBAIHZvaWQgQ0NMYXllclRyZWVI b3N0SW1wbDo6c2V0VmlzaWJsZShib29sIHZpc2libGUpCiAgICAgaWYgKG1fdmlzaWJsZSA9PSB2 aXNpYmxlKQogICAgICAgICByZXR1cm47CiAgICAgbV92aXNpYmxlID0gdmlzaWJsZTsKKyAgICBk aWRWaXNpYmlsaXR5Q2hhbmdlKHRoaXMsIG1fdmlzaWJsZSk7CiAKICAgICBpZiAoIW1fbGF5ZXJS ZW5kZXJlcikKICAgICAgICAgcmV0dXJuOwo= 134375 2012-03-28 12:50:45 -0700 2012-03-28 14:18:37 -0700 Patch bug-82501-20120328155044.patch text/plain 2281 mmocny U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyMzkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDVjNjU0ZDgxYTlmNmVj ZTgyNDk0ODExOTkyOWYzZDk2YzU3M2JlMy4uNDI2YjkzMGZlMTVhMWZlNmZhMDEyMjNkOGY1ZWEx NmNlM2U0ZGM1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTAzLTI4ICBNaWNo YWwgTW9jbnkgIDxtbW9jbnlAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hyb21pdW1dIEFkZCB0 cmFjaW5nIGV2ZW50cyBhcm91bmQgQ0NMYXllclRyZWVIb3N0SW1wbCB2aXNpYmlsaXR5LgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI1MDEKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdEltcGwuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Q0NMYXllclRyZWVIb3N0SW1wbDo6Q0NMYXllclRyZWVIb3N0SW1wbCk6CisgICAgICAg IChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3RJbXBsOjpzZXRWaXNpYmxlKToKKwogMjAxMi0wMy0y NyAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnppbW1lcm1hbm5AcmltLmNvbT4KIAogICAgICAgICBF bmFibGUgYW5pbVZhbCBzdXBwb3J0IGZvciBTVkdBbmltYXRlZFByZXNlcnZlQXNwZWN0UmF0aW8K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2Nj L0NDTGF5ZXJUcmVlSG9zdEltcGwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHAKaW5kZXggNmM1MDIyNTYzYWVl YjJkMjc5YTU3MTk4ZDhiOTYxNjAwYjM1Y2QzNS4uNGMyNGVlMGZjYTQ3M2EzM2QyODZmZmUxM2Iz YjE3MGQwODQyMDJlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHAK QEAgLTQ0LDYgKzQ0LDE3IEBACiAKIG5hbWVzcGFjZSB7CiBjb25zdCBkb3VibGUgbG93RnJlcXVl bmN5QW5pbWF0aW9uSW50ZXJ2YWwgPSAxOworCit2b2lkIGRpZFZpc2liaWxpdHlDaGFuZ2UoV2Vi Q29yZTo6Q0NMYXllclRyZWVIb3N0SW1wbCogaWQsIGJvb2wgdmlzaWJsZSkKK3sKKyAgICBpZiAo dmlzaWJsZSkgeworICAgICAgICBUUkFDRV9FVkVOVF9TVEFSVDEoIndlYmtpdCIsICJDQ0xheWVy VHJlZUhvc3RJbXBsOjpzZXRWaXNpYmxlIiwgaWQsICJDQ0xheWVyVHJlZUhvc3RJbXBsIiwgaWQp OworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgVFJBQ0VfRVZFTlRfRklOSVNIMCgid2Vi a2l0IiwgIkNDTGF5ZXJUcmVlSG9zdEltcGw6OnNldFZpc2libGUiLCBpZCk7Cit9CisKIH0gLy8g bmFtZXNwYWNlCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTEwNiw2ICsxMTcsNyBAQCBDQ0xh eWVyVHJlZUhvc3RJbXBsOjpDQ0xheWVyVHJlZUhvc3RJbXBsKGNvbnN0IENDU2V0dGluZ3MmIHNl dHRpbmdzLCBDQ0xheWVyVHJlZQogICAgICwgbV90aW1lU291cmNlQ2xpZW50QWRhcHRlcihDQ0xh eWVyVHJlZUhvc3RJbXBsVGltZVNvdXJjZUFkYXB0ZXI6OmNyZWF0ZSh0aGlzLCBDQ0RlbGF5QmFz ZWRUaW1lU291cmNlOjpjcmVhdGUobG93RnJlcXVlbmN5QW5pbWF0aW9uSW50ZXJ2YWwgKiAxMDAw LjAsIENDUHJveHk6OmN1cnJlbnRUaHJlYWQoKSkpKQogewogICAgIEFTU0VSVChDQ1Byb3h5Ojpp c0ltcGxUaHJlYWQoKSk7CisgICAgZGlkVmlzaWJpbGl0eUNoYW5nZSh0aGlzLCBtX3Zpc2libGUp OwogfQogCiBDQ0xheWVyVHJlZUhvc3RJbXBsOjp+Q0NMYXllclRyZWVIb3N0SW1wbCgpCkBAIC00 NzQsNiArNDg2LDcgQEAgdm9pZCBDQ0xheWVyVHJlZUhvc3RJbXBsOjpzZXRWaXNpYmxlKGJvb2wg dmlzaWJsZSkKICAgICBpZiAobV92aXNpYmxlID09IHZpc2libGUpCiAgICAgICAgIHJldHVybjsK ICAgICBtX3Zpc2libGUgPSB2aXNpYmxlOworICAgIGRpZFZpc2liaWxpdHlDaGFuZ2UodGhpcywg bV92aXNpYmxlKTsKIAogICAgIGlmICghbV9sYXllclJlbmRlcmVyKQogICAgICAgICByZXR1cm47 Cg==