94366 2012-08-17 11:09:44 -0700 Move transformFriendlyBoundingBox out of Range 2012-08-20 14:41:09 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 leandrogracia leandrogracia abarth eric rniwa simon.fraser webkit.review.bot oldest_to_newest 698499 0 leandrogracia 2012-08-17 11:09:44 -0700 Bug 93111 introduced a new method in Range called transformFriendlyBoundingBox. However, these methods should be moved out of Range in order to attach as much as possible to the DOM specification. This patch moves this functionality to a static method in RenderView. It also updates the code making using of such method. 698529 1 159169 leandrogracia 2012-08-17 11:39:07 -0700 Created attachment 159169 Patch 698532 2 159169 leandrogracia 2012-08-17 11:41:08 -0700 Comment on attachment 159169 Patch I suggest using RenderObject instead of RenderView as it implements a very similar method called absoluteBoundingBoxRect. 698792 3 rniwa 2012-08-17 16:52:31 -0700 I'd like to hear smfr's opinion here. 699713 4 159169 simon.fraser 2012-08-20 11:18:50 -0700 Comment on attachment 159169 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=159169&action=review Looks good. > Source/WebCore/rendering/RenderObject.h:714 > + static FloatRect absoluteBoundingBoxRectForRange(Range*); Can that be a const Range*? 699959 5 159519 leandrogracia 2012-08-20 14:21:41 -0700 Created attachment 159519 Patch 699961 6 159169 leandrogracia 2012-08-20 14:22:02 -0700 Comment on attachment 159169 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=159169&action=review >> Source/WebCore/rendering/RenderObject.h:714 >> + static FloatRect absoluteBoundingBoxRectForRange(Range*); > > Can that be a const Range*? Fixed. 699988 7 159519 rniwa 2012-08-20 14:36:39 -0700 Comment on attachment 159519 Patch I'll land this manually. 699994 8 rniwa 2012-08-20 14:41:09 -0700 Committed r126074: <http://trac.webkit.org/changeset/126074> 159169 2012-08-17 11:39:07 -0700 2012-08-20 14:22:02 -0700 Patch bug-94366-20120817193831.patch text/plain 7219 leandrogracia U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1OTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDBjNmE1ZmE3NzBhZWU3 MWY1MGNiODEzYTY5MWJjZTY1YjYxOGFhNy4uMmE0NWM2NTAxYWE2NGMzODU5NTA3YTVkYjA1ODhh NjM1NjUwYTg2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA4LTE3ICBMZWFu ZHJvIEdyYWNpYSBHaWwgIDxsZWFuZHJvZ3JhY2lhQGNocm9taXVtLm9yZz4KKworICAgICAgICBN b3ZlIHRyYW5zZm9ybUZyaWVuZGx5Qm91bmRpbmdCb3ggb3V0IG9mIFJhbmdlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDM2NgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyA5MzExMSBpbnRyb2R1Y2Vk IGEgbmV3IG1ldGhvZCBpbiBSYW5nZSBjYWxsZWQgdHJhbnNmb3JtRnJpZW5kbHlCb3VuZGluZ0Jv eC4KKyAgICAgICAgSG93ZXZlciwgdGhpcyBtZXRob2Qgc2hvdWxkIG5vdCBoYXZlIGJlZW4gYWRk ZWQgdGhlcmUgaW4gb3JkZXIgdG8gcmVkdWNlIHRoZQorICAgICAgICBkZXBlbmRlbmNpZXMgYmV0 d2VlbiBSYW5nZSBhbmQgdGhlIHJlbmRlcmluZyBjb2RlLiBUaGlzIHBhdGNoIG1vdmVzIGl0IHRv IGEKKyAgICAgICAgc3RhdGljIG1ldGhvZCBpbiBSZW5kZXJPYmplY3QuCisKKyAgICAgICAgVGVz dHM6IGV4aXN0aW5nIHRlc3RzLCBubyBuZXcgZmVhdHVyZSBhZGRlZCBieSB0aGlzIHBhdGNoLgor CisgICAgICAgICogZG9tL1JhbmdlLmNwcDoKKyAgICAgICAgKiBkb20vUmFuZ2UuaDoKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ck9iamVjdDo6YWJzb2x1dGVCb3VuZGluZ0JveFJlY3RGb3JSYW5nZSk6CisgICAgICAgIChXZWJD b3JlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0Lmg6CisgICAgICAgIChSZW5k ZXJPYmplY3QpOgorCiAyMDEyLTA4LTE3ICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5q ZW5zZW5Abm9raWEuY29tPgogCiAgICAgICAgIFRvdWNoIGFkanVzdG1lbnQgZm9yIGNvbnRleHQg bWVudSBnZXN0dXJlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA3ODFjZDBjMWQwMzBk NmViMDNkYThkNmYxMTE4NWFmODI0MTM2YjQ0Li45YjlhOTNhMWYwZTNiYzk2YWY3YzVmZjczZGVm YzllZjM4M2M5ZmUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBA CisyMDEyLTA4LTE3ICBMZWFuZHJvIEdyYWNpYSBHaWwgIDxsZWFuZHJvZ3JhY2lhQGNocm9taXVt Lm9yZz4KKworICAgICAgICBNb3ZlIHRyYW5zZm9ybUZyaWVuZGx5Qm91bmRpbmdCb3ggb3V0IG9m IFJhbmdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 NDM2NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVw ZGF0ZSB0aGUgV2ViS2l0IGNvZGUgdGhhdCBtYWtlcyB1c2Ugb2YgdHJhbnNmb3JtRnJpZW5kbHlC b3VuZGluZ0JveC4KKworICAgICAgICAqIHNyYy9GaW5kSW5QYWdlQ29vcmRpbmF0ZXMuY3BwOgor ICAgICAgICAoV2ViS2l0OjpmaW5kSW5QYWdlUmVjdEZyb21SYW5nZSk6CisgICAgICAgICogc3Jj L1dlYkZyYW1lSW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lSW1wbDo6ZmluZCk6 CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lSW1wbDo6c2VsZWN0RmluZE1hdGNoKToKKwogMjAx Mi0wOC0xNyAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBXZWIgSW5zcGVjdG9yOiBsb2FkIHBhbmVscyBjb2RlIG9uIGRlbWFuZApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5j cHAKaW5kZXggYzZjMmQyMjhmMmVkMWIwYmU0ZGJiNDliOTE5N2I0MzUyZTgxZjQ0ZS4uYzRlNDM1 YTZmNzEzMDYwYjcwOWE0MTU3MWEzNDhlNTFmODUyYzVmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZG9tL1JhbmdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuY3BwCkBA IC0xOTYxLDIzICsxOTYxLDYgQEAgRmxvYXRSZWN0IFJhbmdlOjpib3VuZGluZ1JlY3QoKSBjb25z dAogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKLUZsb2F0UmVjdCBSYW5nZTo6dHJhbnNmb3JtRnJp ZW5kbHlCb3VuZGluZ0JveCgpIGNvbnN0Ci17Ci0gICAgaWYgKCFtX3N0YXJ0LmNvbnRhaW5lcigp KQotICAgICAgICByZXR1cm4gRmxvYXRSZWN0KCk7Ci0KLSAgICBtX293bmVyRG9jdW1lbnQtPnVw ZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOwotCi0gICAgVmVjdG9yPEZsb2F0 UXVhZD4gcXVhZHM7Ci0gICAgdGV4dFF1YWRzKHF1YWRzKTsKLQotICAgIEZsb2F0UmVjdCByZXN1 bHQ7Ci0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBxdWFkcy5zaXplKCk7ICsraSkKLSAgICAg ICAgcmVzdWx0LnVuaXRlKHF1YWRzW2ldLmJvdW5kaW5nQm94KCkpOwotCi0gICAgcmV0dXJuIHJl c3VsdDsKLX0KLQogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjaWZuZGVmIE5ERUJVRwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20v UmFuZ2UuaAppbmRleCAzMzAxZDNkN2JlMTQxODlmM2U1ZDE3MTRkYTQ3YmRjN2Y0ZDE1MWM5Li5k ZmZhZWZjNjdmZGQxNmM0YTdlOWQ1NmYxNTNiMmI0NzEyMzc1YWQ0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vUmFuZ2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuaApA QCAtMTE3LDcgKzExNyw3IEBAIHB1YmxpYzoKICAgICAgICAgUGFydGlhbGx5Rml4ZWRQb3NpdGlv biwKICAgICAgICAgRW50aXJlbHlGaXhlZFBvc2l0aW9uCiAgICAgfTsKLSAgICAKKwogICAgIC8v IE5vdCB0cmFuc2Zvcm0tZnJpZW5kbHkKICAgICB2b2lkIHRleHRSZWN0cyhWZWN0b3I8SW50UmVj dD4mLCBib29sIHVzZVNlbGVjdGlvbkhlaWdodCA9IGZhbHNlLCBSYW5nZUluRml4ZWRQb3NpdGlv biogPSAwKSBjb25zdDsKICAgICBJbnRSZWN0IGJvdW5kaW5nQm94KCkgY29uc3Q7CkBAIC0xMjYs NyArMTI2LDYgQEAgcHVibGljOgogICAgIHZvaWQgdGV4dFF1YWRzKFZlY3RvcjxGbG9hdFF1YWQ+ JiwgYm9vbCB1c2VTZWxlY3Rpb25IZWlnaHQgPSBmYWxzZSwgUmFuZ2VJbkZpeGVkUG9zaXRpb24q ID0gMCkgY29uc3Q7CiAgICAgdm9pZCBnZXRCb3JkZXJBbmRUZXh0UXVhZHMoVmVjdG9yPEZsb2F0 UXVhZD4mKSBjb25zdDsKICAgICBGbG9hdFJlY3QgYm91bmRpbmdSZWN0KCkgY29uc3Q7Ci0gICAg RmxvYXRSZWN0IHRyYW5zZm9ybUZyaWVuZGx5Qm91bmRpbmdCb3goKSBjb25zdDsKIAogICAgIHZv aWQgbm9kZUNoaWxkcmVuQ2hhbmdlZChDb250YWluZXJOb2RlKik7CiAgICAgdm9pZCBub2RlQ2hp bGRyZW5XaWxsQmVSZW1vdmVkKENvbnRhaW5lck5vZGUqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlck9iamVjdC5jcHAKaW5kZXggODVjN2VhYjk1MmI5NzE3NTYyYmMwODdlNjE5MDdi NzkxZTVjNDFjYi4uZTZiODBjZGRkNTA4ZTRjOGRjYThjMDQzZmQ2NTJlNzA5OWE4MTNlNiAxMDA3 NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKQEAgLTEyMDQsNiArMTIw NCwyNCBAQCB2b2lkIFJlbmRlck9iamVjdDo6YWJzb2x1dGVGb2N1c1JpbmdRdWFkcyhWZWN0b3I8 RmxvYXRRdWFkPiYgcXVhZHMpCiAgICAgfQogfQogCitGbG9hdFJlY3QgUmVuZGVyT2JqZWN0Ojph YnNvbHV0ZUJvdW5kaW5nQm94UmVjdEZvclJhbmdlKFJhbmdlKiByYW5nZSkKK3sKKyAgICBpZiAo IXJhbmdlIHx8ICFyYW5nZS0+c3RhcnRDb250YWluZXIoKSkKKyAgICAgICAgcmV0dXJuIEZsb2F0 UmVjdCgpOworCisgICAgaWYgKHJhbmdlLT5vd25lckRvY3VtZW50KCkpCisgICAgICAgIHJhbmdl LT5vd25lckRvY3VtZW50KCktPnVwZGF0ZUxheW91dCgpOworCisgICAgVmVjdG9yPEZsb2F0UXVh ZD4gcXVhZHM7CisgICAgcmFuZ2UtPnRleHRRdWFkcyhxdWFkcyk7CisKKyAgICBGbG9hdFJlY3Qg cmVzdWx0OworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgcXVhZHMuc2l6ZSgpOyArK2kpCisg ICAgICAgIHJlc3VsdC51bml0ZShxdWFkc1tpXS5ib3VuZGluZ0JveCgpKTsKKworICAgIHJldHVy biByZXN1bHQ7Cit9CisKIHZvaWQgUmVuZGVyT2JqZWN0OjphZGRBYnNvbHV0ZVJlY3RGb3JMYXll cihMYXlvdXRSZWN0JiByZXN1bHQpCiB7CiAgICAgaWYgKGhhc0xheWVyKCkpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKaW5kZXggMTllY2NlYzVlYTMzNDJhMmNiOWQ2NzYz ODlkNjYxNTE3MGJiZTY2MC4uNjY5YmFhMTk2NzdkYmMyYmZiNDZlMWFlNWM1ZGY4MTgzMGUyODY1 YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaApAQCAtNzExLDYgKzcx MSw4IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgYWJzb2x1dGVGb2N1c1JpbmdRdWFkcyhWZWN0b3I8 RmxvYXRRdWFkPiYpOwogCisgICAgc3RhdGljIEZsb2F0UmVjdCBhYnNvbHV0ZUJvdW5kaW5nQm94 UmVjdEZvclJhbmdlKFJhbmdlKik7CisKICAgICAvLyB0aGUgcmVjdCB0aGF0IHdpbGwgYmUgcGFp bnRlZCBpZiB0aGlzIG9iamVjdCBpcyBwYXNzZWQgYXMgdGhlIHBhaW50aW5nUm9vdAogICAgIExh eW91dFJlY3QgcGFpbnRpbmdSb290UmVjdChMYXlvdXRSZWN0JiB0b3BMZXZlbFJlY3QpOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9GaW5kSW5QYWdlQ29vcmRpbmF0 ZXMuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRmluZEluUGFnZUNvb3JkaW5hdGVz LmNwcAppbmRleCBmOWZmMTljMmEwZGU1YmNmODg1M2QwYTZjYzE4NzFjNjEzNGJjMTM5Li5iMDBh MzBjMjMwMGY0Nzg4NjFjZTk1ZTdkOTM1YWQyN2Y0NDBjNzBmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9GaW5kSW5QYWdlQ29vcmRpbmF0ZXMuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL0ZpbmRJblBhZ2VDb29yZGluYXRlcy5jcHAKQEAgLTEzNiw3 ICsxMzYsNyBAQCBGbG9hdFJlY3QgZmluZEluUGFnZVJlY3RGcm9tUmFuZ2UoUmFuZ2UqIHJhbmdl KQogICAgIGlmICghcmFuZ2UgfHwgIXJhbmdlLT5maXJzdE5vZGUoKSkKICAgICAgICAgcmV0dXJu IEZsb2F0UmVjdCgpOwogCi0gICAgcmV0dXJuIGZpbmRJblBhZ2VSZWN0RnJvbUFic29sdXRlUmVj dChyYW5nZS0+dHJhbnNmb3JtRnJpZW5kbHlCb3VuZGluZ0JveCgpLCByYW5nZS0+Zmlyc3ROb2Rl KCktPnJlbmRlcmVyKCkpOworICAgIHJldHVybiBmaW5kSW5QYWdlUmVjdEZyb21BYnNvbHV0ZVJl Y3QoUmVuZGVyT2JqZWN0OjphYnNvbHV0ZUJvdW5kaW5nQm94UmVjdEZvclJhbmdlKHJhbmdlKSwg cmFuZ2UtPmZpcnN0Tm9kZSgpLT5yZW5kZXJlcigpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2Vi S2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwu Y3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAppbmRleCBh OThhMzMzYzEzN2ZjYjVlZWYzYWNkNGQ4NmU3OWVkNmYyMjRiN2E3Li5jNmMyODExMGFkMjdkZjZh Yjg4Yzg0NTUwMTQwZDQ4YWU5OWIxZDE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYkZyYW1lSW1wbC5jcHAKQEAgLTE2NzEsNyArMTY3MSw3IEBAIGJvb2wgV2ViRnJhbWVJbXBs OjpmaW5kKGludCBpZGVudGlmaWVyLAogICAgIH0KIAogI2lmIE9TKEFORFJPSUQpCi0gICAgdmll d0ltcGwoKS0+em9vbVRvRmluZEluUGFnZVJlY3QoZnJhbWVWaWV3KCktPmNvbnRlbnRzVG9XaW5k b3coZW5jbG9zaW5nSW50UmVjdChtX2FjdGl2ZU1hdGNoLT50cmFuc2Zvcm1GcmllbmRseUJvdW5k aW5nQm94KCkpKSk7CisgICAgdmlld0ltcGwoKS0+em9vbVRvRmluZEluUGFnZVJlY3QoZnJhbWVW aWV3KCktPmNvbnRlbnRzVG9XaW5kb3coZW5jbG9zaW5nSW50UmVjdChSZW5kZXJPYmplY3Q6OmFi c29sdXRlQm91bmRpbmdCb3hSZWN0Rm9yUmFuZ2UobV9hY3RpdmVNYXRjaC5nZXQoKSkpKSk7CiAj ZW5kaWYKIAogICAgIHNldE1hcmtlckFjdGl2ZShtX2FjdGl2ZU1hdGNoLmdldCgpLCB0cnVlKTsK QEAgLTIxNDksNyArMjE0OSw3IEBAIGludCBXZWJGcmFtZUltcGw6OnNlbGVjdEZpbmRNYXRjaCh1 bnNpZ25lZCBpbmRleCwgV2ViUmVjdCogc2VsZWN0aW9uUmVjdCkKICAgICB9CiAKICAgICBJbnRS ZWN0IGFjdGl2ZU1hdGNoUmVjdDsKLSAgICBJbnRSZWN0IGFjdGl2ZU1hdGNoQm91bmRpbmdCb3gg PSBlbmNsb3NpbmdJbnRSZWN0KG1fYWN0aXZlTWF0Y2gtPnRyYW5zZm9ybUZyaWVuZGx5Qm91bmRp bmdCb3goKSk7CisgICAgSW50UmVjdCBhY3RpdmVNYXRjaEJvdW5kaW5nQm94ID0gZW5jbG9zaW5n SW50UmVjdChSZW5kZXJPYmplY3Q6OmFic29sdXRlQm91bmRpbmdCb3hSZWN0Rm9yUmFuZ2UobV9h Y3RpdmVNYXRjaC5nZXQoKSkpOwogCiAgICAgaWYgKCFhY3RpdmVNYXRjaEJvdW5kaW5nQm94Lmlz RW1wdHkoKSkgewogICAgICAgICBpZiAobV9hY3RpdmVNYXRjaC0+Zmlyc3ROb2RlKCkgJiYgbV9h Y3RpdmVNYXRjaC0+Zmlyc3ROb2RlKCktPnJlbmRlcmVyKCkpCg== 159519 2012-08-20 14:21:41 -0700 2012-08-20 14:36:38 -0700 Patch bug-94366-20120820222101.patch text/plain 7330 leandrogracia U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2MDY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGQyN2Y4OTJjNTZkMmUz ODlhMmQ4NjNhYzg4MzY4YmRkM2E3OWRjNS4uM2NhNjIzOGRmOTcwYmY5NDYwY2IxM2RjMzQwYjVm ZjI3OTU3MzdiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA4LTIwICBMZWFu ZHJvIEdyYWNpYSBHaWwgIDxsZWFuZHJvZ3JhY2lhQGNocm9taXVtLm9yZz4KKworICAgICAgICBN b3ZlIHRyYW5zZm9ybUZyaWVuZGx5Qm91bmRpbmdCb3ggb3V0IG9mIFJhbmdlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDM2NgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyA5MzExMSBpbnRyb2R1Y2Vk IGEgbmV3IG1ldGhvZCBpbiBSYW5nZSBjYWxsZWQgdHJhbnNmb3JtRnJpZW5kbHlCb3VuZGluZ0Jv eC4KKyAgICAgICAgSG93ZXZlciwgdGhpcyBtZXRob2Qgc2hvdWxkIG5vdCBoYXZlIGJlZW4gYWRk ZWQgdGhlcmUgaW4gb3JkZXIgdG8gcmVkdWNlIHRoZQorICAgICAgICBkZXBlbmRlbmNpZXMgYmV0 d2VlbiBSYW5nZSBhbmQgdGhlIHJlbmRlcmluZyBjb2RlLiBUaGlzIHBhdGNoIG1vdmVzIGl0IHRv IGEKKyAgICAgICAgc3RhdGljIG1ldGhvZCBpbiBSZW5kZXJPYmplY3QuCisKKyAgICAgICAgVGVz dHM6IGV4aXN0aW5nIHRlc3RzLCBubyBuZXcgZmVhdHVyZSBhZGRlZCBieSB0aGlzIHBhdGNoLgor CisgICAgICAgICogZG9tL1JhbmdlLmNwcDoKKyAgICAgICAgKiBkb20vUmFuZ2UuaDoKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ck9iamVjdDo6YWJzb2x1dGVCb3VuZGluZ0JveFJlY3RGb3JSYW5nZSk6CisgICAgICAgIChXZWJD b3JlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0Lmg6CisgICAgICAgIChSZW5k ZXJPYmplY3QpOgorCiAyMDEyLTA4LTIwICBDaHJpcyBSb2dlcnMgIDxjcm9nZXJzQGdvb2dsZS5j b20+CiAKICAgICAgICAgUmVtb3ZlIGltcHJvcGVyIEFTU0VSVCBpbiBBdWRpb1BhcmFtVGltZWxp bmU6OnZhbHVlc0ZvclRpbWVSYW5nZUltcGwoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRl eCAxNGZjZTNjY2Q4MzNhNGUxMTFlN2FkNDM0OTZmNmFjZjZiNWRmNWRmLi42ZDI5YWQxZjg0NWUz NjZhZjU0MzJmMWM2NWYxNWMwODljYzM1NzdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSw1ICsxLDIwIEBACiAyMDEyLTA4LTIwICBMZWFuZHJvIEdyYWNpYSBHaWwgIDxsZWFuZHJv Z3JhY2lhQGNocm9taXVtLm9yZz4KIAorICAgICAgICBNb3ZlIHRyYW5zZm9ybUZyaWVuZGx5Qm91 bmRpbmdCb3ggb3V0IG9mIFJhbmdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05NDM2NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFVwZGF0ZSB0aGUgV2ViS2l0IGNvZGUgdGhhdCBtYWtlcyB1c2Ugb2YgdHJh bnNmb3JtRnJpZW5kbHlCb3VuZGluZ0JveC4KKworICAgICAgICAqIHNyYy9GaW5kSW5QYWdlQ29v cmRpbmF0ZXMuY3BwOgorICAgICAgICAoV2ViS2l0OjpmaW5kSW5QYWdlUmVjdEZyb21SYW5nZSk6 CisgICAgICAgICogc3JjL1dlYkZyYW1lSW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZy YW1lSW1wbDo6ZmluZCk6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lSW1wbDo6c2VsZWN0Rmlu ZE1hdGNoKToKKworMjAxMi0wOC0yMCAgTGVhbmRybyBHcmFjaWEgR2lsICA8bGVhbmRyb2dyYWNp YUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgW0Nocm9taXVtXSBkZXRlY3RDb250ZW50SW50ZW50 QXJvdW5kIGhhcyBhIG1pc2xlYWRpbmcgbmFtZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQzNDkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv ZG9tL1JhbmdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5jcHAKaW5kZXggYzZjMmQy MjhmMmVkMWIwYmU0ZGJiNDliOTE5N2I0MzUyZTgxZjQ0ZS4uYzRlNDM1YTZmNzEzMDYwYjcwOWE0 MTU3MWEzNDhlNTFmODUyYzVmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1Jhbmdl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuY3BwCkBAIC0xOTYxLDIzICsxOTYx LDYgQEAgRmxvYXRSZWN0IFJhbmdlOjpib3VuZGluZ1JlY3QoKSBjb25zdAogICAgIHJldHVybiBy ZXN1bHQ7CiB9CiAKLUZsb2F0UmVjdCBSYW5nZTo6dHJhbnNmb3JtRnJpZW5kbHlCb3VuZGluZ0Jv eCgpIGNvbnN0Ci17Ci0gICAgaWYgKCFtX3N0YXJ0LmNvbnRhaW5lcigpKQotICAgICAgICByZXR1 cm4gRmxvYXRSZWN0KCk7Ci0KLSAgICBtX293bmVyRG9jdW1lbnQtPnVwZGF0ZUxheW91dElnbm9y ZVBlbmRpbmdTdHlsZXNoZWV0cygpOwotCi0gICAgVmVjdG9yPEZsb2F0UXVhZD4gcXVhZHM7Ci0g ICAgdGV4dFF1YWRzKHF1YWRzKTsKLQotICAgIEZsb2F0UmVjdCByZXN1bHQ7Ci0gICAgZm9yIChz aXplX3QgaSA9IDA7IGkgPCBxdWFkcy5zaXplKCk7ICsraSkKLSAgICAgICAgcmVzdWx0LnVuaXRl KHF1YWRzW2ldLmJvdW5kaW5nQm94KCkpOwotCi0gICAgcmV0dXJuIHJlc3VsdDsKLX0KLQogfSAv LyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjaWZuZGVmIE5ERUJVRwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvZG9tL1JhbmdlLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuaAppbmRleCAz MzAxZDNkN2JlMTQxODlmM2U1ZDE3MTRkYTQ3YmRjN2Y0ZDE1MWM5Li5kZmZhZWZjNjdmZGQxNmM0 YTdlOWQ1NmYxNTNiMmI0NzEyMzc1YWQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20v UmFuZ2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuaApAQCAtMTE3LDcgKzExNyw3 IEBAIHB1YmxpYzoKICAgICAgICAgUGFydGlhbGx5Rml4ZWRQb3NpdGlvbiwKICAgICAgICAgRW50 aXJlbHlGaXhlZFBvc2l0aW9uCiAgICAgfTsKLSAgICAKKwogICAgIC8vIE5vdCB0cmFuc2Zvcm0t ZnJpZW5kbHkKICAgICB2b2lkIHRleHRSZWN0cyhWZWN0b3I8SW50UmVjdD4mLCBib29sIHVzZVNl bGVjdGlvbkhlaWdodCA9IGZhbHNlLCBSYW5nZUluRml4ZWRQb3NpdGlvbiogPSAwKSBjb25zdDsK ICAgICBJbnRSZWN0IGJvdW5kaW5nQm94KCkgY29uc3Q7CkBAIC0xMjYsNyArMTI2LDYgQEAgcHVi bGljOgogICAgIHZvaWQgdGV4dFF1YWRzKFZlY3RvcjxGbG9hdFF1YWQ+JiwgYm9vbCB1c2VTZWxl Y3Rpb25IZWlnaHQgPSBmYWxzZSwgUmFuZ2VJbkZpeGVkUG9zaXRpb24qID0gMCkgY29uc3Q7CiAg ICAgdm9pZCBnZXRCb3JkZXJBbmRUZXh0UXVhZHMoVmVjdG9yPEZsb2F0UXVhZD4mKSBjb25zdDsK ICAgICBGbG9hdFJlY3QgYm91bmRpbmdSZWN0KCkgY29uc3Q7Ci0gICAgRmxvYXRSZWN0IHRyYW5z Zm9ybUZyaWVuZGx5Qm91bmRpbmdCb3goKSBjb25zdDsKIAogICAgIHZvaWQgbm9kZUNoaWxkcmVu Q2hhbmdlZChDb250YWluZXJOb2RlKik7CiAgICAgdm9pZCBub2RlQ2hpbGRyZW5XaWxsQmVSZW1v dmVkKENvbnRhaW5lck5vZGUqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVj dC5jcHAKaW5kZXggOTFiNmRjMDI0ZjJlMDFlN2MyYTQ5MjBkMGZkNjA5N2RjODI4ZjU4ZC4uMjNk NmNiOGFjNmVjNDMzMGJkY2I0NzliNWJmM2MzZGE1MDBiNTNhNiAxMDA3NTUKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKQEAgLTEyMDQsNiArMTIwNCwyNCBAQCB2b2lkIFJl bmRlck9iamVjdDo6YWJzb2x1dGVGb2N1c1JpbmdRdWFkcyhWZWN0b3I8RmxvYXRRdWFkPiYgcXVh ZHMpCiAgICAgfQogfQogCitGbG9hdFJlY3QgUmVuZGVyT2JqZWN0OjphYnNvbHV0ZUJvdW5kaW5n Qm94UmVjdEZvclJhbmdlKGNvbnN0IFJhbmdlKiByYW5nZSkKK3sKKyAgICBpZiAoIXJhbmdlIHx8 ICFyYW5nZS0+c3RhcnRDb250YWluZXIoKSkKKyAgICAgICAgcmV0dXJuIEZsb2F0UmVjdCgpOwor CisgICAgaWYgKHJhbmdlLT5vd25lckRvY3VtZW50KCkpCisgICAgICAgIHJhbmdlLT5vd25lckRv Y3VtZW50KCktPnVwZGF0ZUxheW91dCgpOworCisgICAgVmVjdG9yPEZsb2F0UXVhZD4gcXVhZHM7 CisgICAgcmFuZ2UtPnRleHRRdWFkcyhxdWFkcyk7CisKKyAgICBGbG9hdFJlY3QgcmVzdWx0Owor ICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgcXVhZHMuc2l6ZSgpOyArK2kpCisgICAgICAgIHJl c3VsdC51bml0ZShxdWFkc1tpXS5ib3VuZGluZ0JveCgpKTsKKworICAgIHJldHVybiByZXN1bHQ7 Cit9CisKIHZvaWQgUmVuZGVyT2JqZWN0OjphZGRBYnNvbHV0ZVJlY3RGb3JMYXllcihMYXlvdXRS ZWN0JiByZXN1bHQpCiB7CiAgICAgaWYgKGhhc0xheWVyKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyT2JqZWN0LmgKaW5kZXggNzhmOGY1NTQ0ZDZlYWE3YjkzNjkzNTgwYmFiNDM2M2Uw YTA4ZDVkOC4uMjY2YzgzODkxNWI2ODdkNDZiOWRjYTI1ODNiN2I3ZTVhZWY2MGM3OCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaApAQCAtNzExLDYgKzcxMSw4IEBAIHB1 YmxpYzoKIAogICAgIHZvaWQgYWJzb2x1dGVGb2N1c1JpbmdRdWFkcyhWZWN0b3I8RmxvYXRRdWFk PiYpOwogCisgICAgc3RhdGljIEZsb2F0UmVjdCBhYnNvbHV0ZUJvdW5kaW5nQm94UmVjdEZvclJh bmdlKGNvbnN0IFJhbmdlKik7CisKICAgICAvLyB0aGUgcmVjdCB0aGF0IHdpbGwgYmUgcGFpbnRl ZCBpZiB0aGlzIG9iamVjdCBpcyBwYXNzZWQgYXMgdGhlIHBhaW50aW5nUm9vdAogICAgIExheW91 dFJlY3QgcGFpbnRpbmdSb290UmVjdChMYXlvdXRSZWN0JiB0b3BMZXZlbFJlY3QpOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9GaW5kSW5QYWdlQ29vcmRpbmF0ZXMu Y3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRmluZEluUGFnZUNvb3JkaW5hdGVzLmNw cAppbmRleCBmOWZmMTljMmEwZGU1YmNmODg1M2QwYTZjYzE4NzFjNjEzNGJjMTM5Li5iMDBhMzBj MjMwMGY0Nzg4NjFjZTk1ZTdkOTM1YWQyN2Y0NDBjNzBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9GaW5kSW5QYWdlQ29vcmRpbmF0ZXMuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL0ZpbmRJblBhZ2VDb29yZGluYXRlcy5jcHAKQEAgLTEzNiw3ICsx MzYsNyBAQCBGbG9hdFJlY3QgZmluZEluUGFnZVJlY3RGcm9tUmFuZ2UoUmFuZ2UqIHJhbmdlKQog ICAgIGlmICghcmFuZ2UgfHwgIXJhbmdlLT5maXJzdE5vZGUoKSkKICAgICAgICAgcmV0dXJuIEZs b2F0UmVjdCgpOwogCi0gICAgcmV0dXJuIGZpbmRJblBhZ2VSZWN0RnJvbUFic29sdXRlUmVjdChy YW5nZS0+dHJhbnNmb3JtRnJpZW5kbHlCb3VuZGluZ0JveCgpLCByYW5nZS0+Zmlyc3ROb2RlKCkt PnJlbmRlcmVyKCkpOworICAgIHJldHVybiBmaW5kSW5QYWdlUmVjdEZyb21BYnNvbHV0ZVJlY3Qo UmVuZGVyT2JqZWN0OjphYnNvbHV0ZUJvdW5kaW5nQm94UmVjdEZvclJhbmdlKHJhbmdlKSwgcmFu Z2UtPmZpcnN0Tm9kZSgpLT5yZW5kZXJlcigpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3Bw IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAppbmRleCBhOThh MzMzYzEzN2ZjYjVlZWYzYWNkNGQ4NmU3OWVkNmYyMjRiN2E3Li5jNmMyODExMGFkMjdkZjZhYjg4 Yzg0NTUwMTQwZDQ4YWU5OWIxZDE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJGcmFtZUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YkZyYW1lSW1wbC5jcHAKQEAgLTE2NzEsNyArMTY3MSw3IEBAIGJvb2wgV2ViRnJhbWVJbXBsOjpm aW5kKGludCBpZGVudGlmaWVyLAogICAgIH0KIAogI2lmIE9TKEFORFJPSUQpCi0gICAgdmlld0lt cGwoKS0+em9vbVRvRmluZEluUGFnZVJlY3QoZnJhbWVWaWV3KCktPmNvbnRlbnRzVG9XaW5kb3co ZW5jbG9zaW5nSW50UmVjdChtX2FjdGl2ZU1hdGNoLT50cmFuc2Zvcm1GcmllbmRseUJvdW5kaW5n Qm94KCkpKSk7CisgICAgdmlld0ltcGwoKS0+em9vbVRvRmluZEluUGFnZVJlY3QoZnJhbWVWaWV3 KCktPmNvbnRlbnRzVG9XaW5kb3coZW5jbG9zaW5nSW50UmVjdChSZW5kZXJPYmplY3Q6OmFic29s dXRlQm91bmRpbmdCb3hSZWN0Rm9yUmFuZ2UobV9hY3RpdmVNYXRjaC5nZXQoKSkpKSk7CiAjZW5k aWYKIAogICAgIHNldE1hcmtlckFjdGl2ZShtX2FjdGl2ZU1hdGNoLmdldCgpLCB0cnVlKTsKQEAg LTIxNDksNyArMjE0OSw3IEBAIGludCBXZWJGcmFtZUltcGw6OnNlbGVjdEZpbmRNYXRjaCh1bnNp Z25lZCBpbmRleCwgV2ViUmVjdCogc2VsZWN0aW9uUmVjdCkKICAgICB9CiAKICAgICBJbnRSZWN0 IGFjdGl2ZU1hdGNoUmVjdDsKLSAgICBJbnRSZWN0IGFjdGl2ZU1hdGNoQm91bmRpbmdCb3ggPSBl bmNsb3NpbmdJbnRSZWN0KG1fYWN0aXZlTWF0Y2gtPnRyYW5zZm9ybUZyaWVuZGx5Qm91bmRpbmdC b3goKSk7CisgICAgSW50UmVjdCBhY3RpdmVNYXRjaEJvdW5kaW5nQm94ID0gZW5jbG9zaW5nSW50 UmVjdChSZW5kZXJPYmplY3Q6OmFic29sdXRlQm91bmRpbmdCb3hSZWN0Rm9yUmFuZ2UobV9hY3Rp dmVNYXRjaC5nZXQoKSkpOwogCiAgICAgaWYgKCFhY3RpdmVNYXRjaEJvdW5kaW5nQm94LmlzRW1w dHkoKSkgewogICAgICAgICBpZiAobV9hY3RpdmVNYXRjaC0+Zmlyc3ROb2RlKCkgJiYgbV9hY3Rp dmVNYXRjaC0+Zmlyc3ROb2RlKCktPnJlbmRlcmVyKCkpCg==