54587 2011-02-16 14:13:09 -0800 Tiled backing store area is too big. 2011-02-18 17:12:18 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED Qt P3 Normal --- 53894 1 ostap73 ostap73 commit-queue kenneth kling koivisto oldest_to_newest 352335 0 ostap73 2011-02-16 14:13:09 -0800 Tiled backing store area is too big. It calculated like this: keepRect.inflateX(visibleRect.width() * (m_keepAreaMultiplier.width() - 1.f)); keepRect.inflateY(visibleRect.height() * (m_keepAreaMultiplier.height() - 1.f)); and original intention was to get rect of size keepAreaMultiplier * visibleRect, but inflateX and inflateY methods defined like this: void inflateX(float dx) { m_location.setX(m_location.x() - dx); m_size.setWidth(m_size.width() + dx + dx); } void inflateY(float dy) { m_location.setY(m_location.y() - dy); m_size.setHeight(m_size.height() + dy + dy); } so, they add delta to width/height 2 times, so in real area is calculated like width + width * (ratio - 1) * 2 = width * (2 * ratio - 1) 352346 1 82694 ostap73 2011-02-16 14:20:29 -0800 Created attachment 82694 Divide inflate delta by 2 to fix area calculation. 352355 2 82696 ostap73 2011-02-16 14:27:28 -0800 Created attachment 82696 Fix changelog. 352423 3 kling 2011-02-16 15:56:50 -0800 Dropping [Qt] prefix as this is not a Qt-specific bug. 352424 4 82696 kling 2011-02-16 15:57:22 -0800 Comment on attachment 82696 Fix changelog. The WK2 TiledDrawingAreaProxy has the same logic, should the change not be done there, too? 352465 5 82723 ostap73 2011-02-16 16:59:03 -0800 Created attachment 82723 Fix also webkit2 tile area calculation. 352664 6 82723 kenneth 2011-02-17 01:07:38 -0800 Comment on attachment 82723 Fix also webkit2 tile area calculation. View in context: https://bugs.webkit.org/attachment.cgi?id=82723&action=review > Source/WebCore/ChangeLog:8 > + Tiled backing store area is too big. > + Error in area calculcation causes size of backing store > + up to 6 times bigger than viewport with default multipliers. > + https://bugs.webkit.org/show_bug.cgi?id=54587 Why dont you explain how it is calculating wrong and why it wouldnt be better to change the default multipliers? > Source/WebCore/platform/graphics/TiledBackingStore.cpp:217 > - keepRect.inflateX(visibleRect.width() * (m_keepAreaMultiplier.width() - 1.f)); > - keepRect.inflateY(visibleRect.height() * (m_keepAreaMultiplier.height() - 1.f)); > + keepRect.inflateX(visibleRect.width() * (m_keepAreaMultiplier.width() - 1.f) / 2); > + keepRect.inflateY(visibleRect.height() * (m_keepAreaMultiplier.height() - 1.f) / 2); I dont understand why this is right. It is called a multiplier. So if we have size 10, and a multiplier of two, we would expect a result of 20. ie 10 + 10 * 1 (10.inflate(10 * (2 - 1)) 352835 7 ostap73 2011-02-17 07:05:09 -0800 (In reply to comment #6) > (From update of attachment 82723 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=82723&action=review > > > Source/WebCore/ChangeLog:8 > > + Tiled backing store area is too big. > > + Error in area calculcation causes size of backing store > > + up to 6 times bigger than viewport with default multipliers. > > + https://bugs.webkit.org/show_bug.cgi?id=54587 > > Why dont you explain how it is calculating wrong and why it wouldnt be better to change the default multipliers? > > > Source/WebCore/platform/graphics/TiledBackingStore.cpp:217 > > - keepRect.inflateX(visibleRect.width() * (m_keepAreaMultiplier.width() - 1.f)); > > - keepRect.inflateY(visibleRect.height() * (m_keepAreaMultiplier.height() - 1.f)); > > + keepRect.inflateX(visibleRect.width() * (m_keepAreaMultiplier.width() - 1.f) / 2); > > + keepRect.inflateY(visibleRect.height() * (m_keepAreaMultiplier.height() - 1.f) / 2); > > I dont understand why this is right. It is called a multiplier. So if we have size 10, and a multiplier of two, we would expect a result of 20. ie 10 + 10 * 1 (10.inflate(10 * (2 - 1)) Kenneth, have you looked at Inflate function? I've posted it into explanation. ;) It adds delta 2 times (m_size.width() + dx + dx). So, if you have width 20 and multiplier 2, than you will pass delta to inflate as 10 * (2 - 1) = 10. Inside inflate will do width + dx + dx , so instead of 20 you are getting 30. If you have multiplier 4.5 as in wk2, you will pass delta as 10 * (4.5 - 1) = 35 and after inflate you will get 10 + 35 + 35 = 80 instead of 45. Make it easy - put a breakpoint, calculate what do you expect and check what you get. 352841 8 kenneth 2011-02-17 07:10:22 -0800 (In reply to comment #7) > (In reply to comment #6) > > (From update of attachment 82723 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=82723&action=review > > > > > Source/WebCore/ChangeLog:8 > > > + Tiled backing store area is too big. > > > + Error in area calculcation causes size of backing store > > > + up to 6 times bigger than viewport with default multipliers. > > > + https://bugs.webkit.org/show_bug.cgi?id=54587 > > > > Why dont you explain how it is calculating wrong and why it wouldnt be better to change the default multipliers? > > > > > Source/WebCore/platform/graphics/TiledBackingStore.cpp:217 > > > - keepRect.inflateX(visibleRect.width() * (m_keepAreaMultiplier.width() - 1.f)); > > > - keepRect.inflateY(visibleRect.height() * (m_keepAreaMultiplier.height() - 1.f)); > > > + keepRect.inflateX(visibleRect.width() * (m_keepAreaMultiplier.width() - 1.f) / 2); > > > + keepRect.inflateY(visibleRect.height() * (m_keepAreaMultiplier.height() - 1.f) / 2); > > > > I dont understand why this is right. It is called a multiplier. So if we have size 10, and a multiplier of two, we would expect a result of 20. ie 10 + 10 * 1 (10.inflate(10 * (2 - 1)) > > Kenneth, have you looked at Inflate function? I've posted it into explanation. ;) > It adds delta 2 times (m_size.width() + dx + dx). > So, if you have width 20 and multiplier 2, than you will pass delta to inflate as 10 * (2 - 1) = 10. Inside inflate will do width + dx + dx , so instead of 20 you are getting 30. > If you have multiplier 4.5 as in wk2, you will pass delta as 10 * (4.5 - 1) = 35 and after inflate you will get 10 + 35 + 35 = 80 instead of 45. > Make it easy - put a breakpoint, calculate what do you expect and check what you get. Better not use inflate then :-) and just use setWidth instead! etc 352844 9 ostap73 2011-02-17 07:12:08 -0800 > Better not use inflate then :-) and just use setWidth instead! etc Ok. As you wish! ;) 352854 10 ostap73 2011-02-17 07:20:18 -0800 > Better not use inflate then :-) and just use setWidth instead! etc Oh! No! That's not right. Rect position also needs to be adjusted. IMHO, so far inflate is the cleanest solution. 352856 11 kenneth 2011-02-17 07:21:33 -0800 Ok, then lets add a comment in the code. Apparently it tricked more than one person. 352858 12 82723 kenneth 2011-02-17 07:23:47 -0800 Comment on attachment 82723 Fix also webkit2 tile area calculation. View in context: https://bugs.webkit.org/attachment.cgi?id=82723&action=review r=me with the comment >> Source/WebCore/platform/graphics/TiledBackingStore.cpp:217 >> + keepRect.inflateY(visibleRect.height() * (m_keepAreaMultiplier.height() - 1.f) / 2); > > I dont understand why this is right. It is called a multiplier. So if we have size 10, and a multiplier of two, we would expect a result of 20. ie 10 + 10 * 1 (10.inflate(10 * (2 - 1)) // Inflates to both sides, so divide by 2. 352873 13 82801 ostap73 2011-02-17 07:35:57 -0800 Created attachment 82801 Add comment why delta should be divided by 2 353932 14 82801 commit-queue 2011-02-18 17:12:13 -0800 Comment on attachment 82801 Add comment why delta should be divided by 2 Clearing flags on attachment: 82801 Committed r79054: <http://trac.webkit.org/changeset/79054> 353933 15 commit-queue 2011-02-18 17:12:18 -0800 All reviewed patches have been landed. Closing bug. 82694 2011-02-16 14:20:29 -0800 2011-02-16 14:27:28 -0800 Divide inflate delta by 2 to fix area calculation. tiles_area_multiplier_fix_01.diff text/plain 2141 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3NmViMDRlLi44MTJiOTY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTEtMDItMTYgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPG9zdGFwZW5rby52aWF0Y2hl c2xhdkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW1F0XSBUaWxlZCBiYWNraW5nIHN0b3JlIGFyZWEgaXMgdG9vIGJpZy4KKyAgICAg ICAgRXJyb3IgaW4gYXJlYSBjYWxjdWxjYXRpb24gY2F1c2VzIHNpemUgb2YgYmFja2luZyBzdG9y ZQorICAgICAgICB1cCB0byA2IHRpbWVzIGJpZ2dlciB0aGFuIHZpZXdwb3J0IHdpdGggZGVmYXVs dCBtdWx0aXBsaWVycy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTU0NTg3CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmdTdG9yZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpUaWxlZEJhY2tpbmdTdG9yZTo6Y3JlYXRlVGlsZXMpOgorCiAyMDExLTAyLTE2ICBDYXJv bCBTemFibyAgPGNhcm9sLnN6YWJvQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBE YXZpZCBIeWF0dC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L1RpbGVkQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L1RpbGVkQmFja2luZ1N0b3JlLmNwcAppbmRleCBmNjkyMWVmLi5kN2RkNjVkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmdTdG9yZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVGlsZWRCYWNraW5nU3RvcmUu Y3BwCkBAIC0yMTMsMTUgKzIxMywxNSBAQCB2b2lkIFRpbGVkQmFja2luZ1N0b3JlOjpjcmVhdGVU aWxlcygpCiAgICAgZHJvcE92ZXJoYW5naW5nVGlsZXMoKTsKIAogICAgIEludFJlY3Qga2VlcFJl Y3QgPSB2aXNpYmxlUmVjdDsKLSAgICBrZWVwUmVjdC5pbmZsYXRlWCh2aXNpYmxlUmVjdC53aWR0 aCgpICogKG1fa2VlcEFyZWFNdWx0aXBsaWVyLndpZHRoKCkgLSAxLmYpKTsKLSAgICBrZWVwUmVj dC5pbmZsYXRlWSh2aXNpYmxlUmVjdC5oZWlnaHQoKSAqIChtX2tlZXBBcmVhTXVsdGlwbGllci5o ZWlnaHQoKSAtIDEuZikpOworICAgIGtlZXBSZWN0LmluZmxhdGVYKHZpc2libGVSZWN0LndpZHRo KCkgKiAobV9rZWVwQXJlYU11bHRpcGxpZXIud2lkdGgoKSAtIDEuZikgLyAyKTsKKyAgICBrZWVw UmVjdC5pbmZsYXRlWSh2aXNpYmxlUmVjdC5oZWlnaHQoKSAqIChtX2tlZXBBcmVhTXVsdGlwbGll ci5oZWlnaHQoKSAtIDEuZikgLyAyKTsKICAgICBrZWVwUmVjdC5pbnRlcnNlY3QoY29udGVudHNS ZWN0KCkpOwogICAgIAogICAgIGRyb3BUaWxlc091dHNpZGVSZWN0KGtlZXBSZWN0KTsKICAgICAK ICAgICBJbnRSZWN0IGNvdmVyUmVjdCA9IHZpc2libGVSZWN0OwotICAgIGNvdmVyUmVjdC5pbmZs YXRlWCh2aXNpYmxlUmVjdC53aWR0aCgpICogKG1fY292ZXJBcmVhTXVsdGlwbGllci53aWR0aCgp IC0gMS5mKSk7Ci0gICAgY292ZXJSZWN0LmluZmxhdGVZKHZpc2libGVSZWN0LmhlaWdodCgpICog KG1fY292ZXJBcmVhTXVsdGlwbGllci5oZWlnaHQoKSAtIDEuZikpOworICAgIGNvdmVyUmVjdC5p bmZsYXRlWCh2aXNpYmxlUmVjdC53aWR0aCgpICogKG1fY292ZXJBcmVhTXVsdGlwbGllci53aWR0 aCgpIC0gMS5mKSAvIDIpOworICAgIGNvdmVyUmVjdC5pbmZsYXRlWSh2aXNpYmxlUmVjdC5oZWln aHQoKSAqIChtX2NvdmVyQXJlYU11bHRpcGxpZXIuaGVpZ2h0KCkgLSAxLmYpIC8gMik7CiAgICAg Y292ZXJSZWN0LmludGVyc2VjdChjb250ZW50c1JlY3QoKSk7CiAgICAgCiAgICAgLy8gU2VhcmNo IGZvciB0aGUgdGlsZSBwb3NpdGlvbiBjbG9zZXN0IHRvIHRoZSB2aWV3cG9ydCBjZW50ZXIgdGhh dCBkb2VzIG5vdCB5ZXQgY29udGFpbiBhIHRpbGUuIAo= 82696 2011-02-16 14:27:28 -0800 2011-02-16 16:59:03 -0800 Fix changelog. tiles_area_multiplier_fix_02.diff text/plain 2108 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3NmViMDRlLi41ZmE5NTcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTEtMDItMTYgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPG9zdGFwZW5rby52aWF0Y2hl c2xhdkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW1F0XSBUaWxlZCBiYWNraW5nIHN0b3JlIGFyZWEgaXMgdG9vIGJpZy4KKyAgICAg ICAgRXJyb3IgaW4gYXJlYSBjYWxjdWxjYXRpb24gY2F1c2VzIHNpemUgb2YgYmFja2luZyBzdG9y ZQorICAgICAgICB1cCB0byA2IHRpbWVzIGJpZ2dlciB0aGFuIHZpZXdwb3J0IHdpdGggZGVmYXVs dCBtdWx0aXBsaWVycy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTU0NTg3CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmdT dG9yZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUaWxlZEJhY2tpbmdTdG9yZTo6Y3JlYXRlVGls ZXMpOgorCiAyMDExLTAyLTE2ICBDYXJvbCBTemFibyAgPGNhcm9sLnN6YWJvQG5va2lhLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBIeWF0dC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1RpbGVkQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1RpbGVkQmFja2luZ1N0b3JlLmNwcAppbmRleCBmNjky MWVmLi5kN2RkNjVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9UaWxlZEJhY2tpbmdTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvVGlsZWRCYWNraW5nU3RvcmUuY3BwCkBAIC0yMTMsMTUgKzIxMywxNSBAQCB2b2lkIFRp bGVkQmFja2luZ1N0b3JlOjpjcmVhdGVUaWxlcygpCiAgICAgZHJvcE92ZXJoYW5naW5nVGlsZXMo KTsKIAogICAgIEludFJlY3Qga2VlcFJlY3QgPSB2aXNpYmxlUmVjdDsKLSAgICBrZWVwUmVjdC5p bmZsYXRlWCh2aXNpYmxlUmVjdC53aWR0aCgpICogKG1fa2VlcEFyZWFNdWx0aXBsaWVyLndpZHRo KCkgLSAxLmYpKTsKLSAgICBrZWVwUmVjdC5pbmZsYXRlWSh2aXNpYmxlUmVjdC5oZWlnaHQoKSAq IChtX2tlZXBBcmVhTXVsdGlwbGllci5oZWlnaHQoKSAtIDEuZikpOworICAgIGtlZXBSZWN0Lmlu ZmxhdGVYKHZpc2libGVSZWN0LndpZHRoKCkgKiAobV9rZWVwQXJlYU11bHRpcGxpZXIud2lkdGgo KSAtIDEuZikgLyAyKTsKKyAgICBrZWVwUmVjdC5pbmZsYXRlWSh2aXNpYmxlUmVjdC5oZWlnaHQo KSAqIChtX2tlZXBBcmVhTXVsdGlwbGllci5oZWlnaHQoKSAtIDEuZikgLyAyKTsKICAgICBrZWVw UmVjdC5pbnRlcnNlY3QoY29udGVudHNSZWN0KCkpOwogICAgIAogICAgIGRyb3BUaWxlc091dHNp ZGVSZWN0KGtlZXBSZWN0KTsKICAgICAKICAgICBJbnRSZWN0IGNvdmVyUmVjdCA9IHZpc2libGVS ZWN0OwotICAgIGNvdmVyUmVjdC5pbmZsYXRlWCh2aXNpYmxlUmVjdC53aWR0aCgpICogKG1fY292 ZXJBcmVhTXVsdGlwbGllci53aWR0aCgpIC0gMS5mKSk7Ci0gICAgY292ZXJSZWN0LmluZmxhdGVZ KHZpc2libGVSZWN0LmhlaWdodCgpICogKG1fY292ZXJBcmVhTXVsdGlwbGllci5oZWlnaHQoKSAt IDEuZikpOworICAgIGNvdmVyUmVjdC5pbmZsYXRlWCh2aXNpYmxlUmVjdC53aWR0aCgpICogKG1f Y292ZXJBcmVhTXVsdGlwbGllci53aWR0aCgpIC0gMS5mKSAvIDIpOworICAgIGNvdmVyUmVjdC5p bmZsYXRlWSh2aXNpYmxlUmVjdC5oZWlnaHQoKSAqIChtX2NvdmVyQXJlYU11bHRpcGxpZXIuaGVp Z2h0KCkgLSAxLmYpIC8gMik7CiAgICAgY292ZXJSZWN0LmludGVyc2VjdChjb250ZW50c1JlY3Qo KSk7CiAgICAgCiAgICAgLy8gU2VhcmNoIGZvciB0aGUgdGlsZSBwb3NpdGlvbiBjbG9zZXN0IHRv IHRoZSB2aWV3cG9ydCBjZW50ZXIgdGhhdCBkb2VzIG5vdCB5ZXQgY29udGFpbiBhIHRpbGUuIAo= 82723 2011-02-16 16:59:03 -0800 2011-02-17 07:35:57 -0800 Fix also webkit2 tile area calculation. tiles_area_multiplier_fix_03.diff text/plain 4385 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3NmViMDRlLi4wMjNmMzUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTEtMDItMTYgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPG9zdGFwZW5rby52aWF0Y2hl c2xhdkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGlsZWQgYmFja2luZyBzdG9yZSBhcmVhIGlzIHRvbyBiaWcuCisgICAgICAgIEVy cm9yIGluIGFyZWEgY2FsY3VsY2F0aW9uIGNhdXNlcyBzaXplIG9mIGJhY2tpbmcgc3RvcmUKKyAg ICAgICAgdXAgdG8gNiB0aW1lcyBiaWdnZXIgdGhhbiB2aWV3cG9ydCB3aXRoIGRlZmF1bHQgbXVs dGlwbGllcnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD01NDU4NworCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvVGlsZWRCYWNraW5nU3RvcmUu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6VGlsZWRCYWNraW5nU3RvcmU6OmNyZWF0ZVRpbGVzKToK KwogMjAxMS0wMi0xNiAgQ2Fyb2wgU3phYm8gIDxjYXJvbC5zemFib0Bub2tpYS5jb20+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgSHlhdHQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmdTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmdTdG9yZS5jcHAKaW5kZXggZjY5MjFlZi4u ZDdkZDY1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVGls ZWRCYWNraW5nU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L1RpbGVkQmFja2luZ1N0b3JlLmNwcApAQCAtMjEzLDE1ICsyMTMsMTUgQEAgdm9pZCBUaWxlZEJh Y2tpbmdTdG9yZTo6Y3JlYXRlVGlsZXMoKQogICAgIGRyb3BPdmVyaGFuZ2luZ1RpbGVzKCk7CiAK ICAgICBJbnRSZWN0IGtlZXBSZWN0ID0gdmlzaWJsZVJlY3Q7Ci0gICAga2VlcFJlY3QuaW5mbGF0 ZVgodmlzaWJsZVJlY3Qud2lkdGgoKSAqIChtX2tlZXBBcmVhTXVsdGlwbGllci53aWR0aCgpIC0g MS5mKSk7Ci0gICAga2VlcFJlY3QuaW5mbGF0ZVkodmlzaWJsZVJlY3QuaGVpZ2h0KCkgKiAobV9r ZWVwQXJlYU11bHRpcGxpZXIuaGVpZ2h0KCkgLSAxLmYpKTsKKyAgICBrZWVwUmVjdC5pbmZsYXRl WCh2aXNpYmxlUmVjdC53aWR0aCgpICogKG1fa2VlcEFyZWFNdWx0aXBsaWVyLndpZHRoKCkgLSAx LmYpIC8gMik7CisgICAga2VlcFJlY3QuaW5mbGF0ZVkodmlzaWJsZVJlY3QuaGVpZ2h0KCkgKiAo bV9rZWVwQXJlYU11bHRpcGxpZXIuaGVpZ2h0KCkgLSAxLmYpIC8gMik7CiAgICAga2VlcFJlY3Qu aW50ZXJzZWN0KGNvbnRlbnRzUmVjdCgpKTsKICAgICAKICAgICBkcm9wVGlsZXNPdXRzaWRlUmVj dChrZWVwUmVjdCk7CiAgICAgCiAgICAgSW50UmVjdCBjb3ZlclJlY3QgPSB2aXNpYmxlUmVjdDsK LSAgICBjb3ZlclJlY3QuaW5mbGF0ZVgodmlzaWJsZVJlY3Qud2lkdGgoKSAqIChtX2NvdmVyQXJl YU11bHRpcGxpZXIud2lkdGgoKSAtIDEuZikpOwotICAgIGNvdmVyUmVjdC5pbmZsYXRlWSh2aXNp YmxlUmVjdC5oZWlnaHQoKSAqIChtX2NvdmVyQXJlYU11bHRpcGxpZXIuaGVpZ2h0KCkgLSAxLmYp KTsKKyAgICBjb3ZlclJlY3QuaW5mbGF0ZVgodmlzaWJsZVJlY3Qud2lkdGgoKSAqIChtX2NvdmVy QXJlYU11bHRpcGxpZXIud2lkdGgoKSAtIDEuZikgLyAyKTsKKyAgICBjb3ZlclJlY3QuaW5mbGF0 ZVkodmlzaWJsZVJlY3QuaGVpZ2h0KCkgKiAobV9jb3ZlckFyZWFNdWx0aXBsaWVyLmhlaWdodCgp IC0gMS5mKSAvIDIpOwogICAgIGNvdmVyUmVjdC5pbnRlcnNlY3QoY29udGVudHNSZWN0KCkpOwog ICAgIAogICAgIC8vIFNlYXJjaCBmb3IgdGhlIHRpbGUgcG9zaXRpb24gY2xvc2VzdCB0byB0aGUg dmlld3BvcnQgY2VudGVyIHRoYXQgZG9lcyBub3QgeWV0IGNvbnRhaW4gYSB0aWxlLiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZwppbmRleCA1NmRjMTEwLi41YjIxODQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIw MTEtMDItMTYgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPG9zdGFwZW5rby52aWF0Y2hlc2xhdkBu b2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGlsZWQgYmFja2luZyBzdG9yZSBhcmVhIGlzIHRvbyBiaWcuCisgICAgICAgIEVycm9yIGlu IGFyZWEgY2FsY3VsY2F0aW9uIGNhdXNlcyBzaXplIG9mIGJhY2tpbmcgc3RvcmUKKyAgICAgICAg dXAgdG8gOCB0aW1lcyBiaWdnZXIgdGhhbiB2aWV3cG9ydCB3aXRoIGRlZmF1bHQgbXVsdGlwbGll cnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NDU4 NworCisgICAgICAgICogVUlQcm9jZXNzL1RpbGVkRHJhd2luZ0FyZWFQcm94eS5jcHA6CisgICAg ICAgIChXZWJLaXQ6OlRpbGVkRHJhd2luZ0FyZWFQcm94eTo6Y2FsY3VsYXRlS2VlcFJlY3QpOgor ICAgICAgICAoV2ViS2l0OjpUaWxlZERyYXdpbmdBcmVhUHJveHk6OmNhbGN1bGF0ZUNvdmVyUmVj dCk6CisKIDIwMTEtMDItMTYgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIFJvYmVuLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1RpbGVkRHJhd2luZ0FyZWFQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvVGlsZWREcmF3aW5nQXJlYVByb3h5LmNwcAppbmRleCAzYjMzMzRmLi5iYmZi NGFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvVGlsZWREcmF3aW5nQXJl YVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvVGlsZWREcmF3aW5nQXJl YVByb3h5LmNwcApAQCAtMzk4LDggKzM5OCw4IEBAIGRvdWJsZSBUaWxlZERyYXdpbmdBcmVhUHJv eHk6OnRpbGVEaXN0YW5jZShjb25zdCBJbnRSZWN0JiB2aWV3cG9ydCwgY29uc3QgVGlsZWRECiBJ bnRSZWN0IFRpbGVkRHJhd2luZ0FyZWFQcm94eTo6Y2FsY3VsYXRlS2VlcFJlY3QoY29uc3QgSW50 UmVjdCYgdmlzaWJsZVJlY3QpIGNvbnN0CiB7CiAgICAgSW50UmVjdCByZXN1bHQgPSB2aXNpYmxl UmVjdDsKLSAgICByZXN1bHQuaW5mbGF0ZVgodmlzaWJsZVJlY3Qud2lkdGgoKSAqIChtX2tlZXBB cmVhTXVsdGlwbGllci53aWR0aCgpIC0gMSkpOwotICAgIHJlc3VsdC5pbmZsYXRlWSh2aXNpYmxl UmVjdC5oZWlnaHQoKSAqIChtX2tlZXBBcmVhTXVsdGlwbGllci5oZWlnaHQoKSAtIDEpKTsKKyAg ICByZXN1bHQuaW5mbGF0ZVgodmlzaWJsZVJlY3Qud2lkdGgoKSAqIChtX2tlZXBBcmVhTXVsdGlw bGllci53aWR0aCgpIC0gMSkgLyAyKTsKKyAgICByZXN1bHQuaW5mbGF0ZVkodmlzaWJsZVJlY3Qu aGVpZ2h0KCkgKiAobV9rZWVwQXJlYU11bHRpcGxpZXIuaGVpZ2h0KCkgLSAxKSAvIDIpOwogICAg IHJlc3VsdC5pbnRlcnNlY3QoY29udGVudHNSZWN0KCkpOwogICAgIHJldHVybiByZXN1bHQ7CiB9 CkBAIC00MDcsOCArNDA3LDggQEAgSW50UmVjdCBUaWxlZERyYXdpbmdBcmVhUHJveHk6OmNhbGN1 bGF0ZUtlZXBSZWN0KGNvbnN0IEludFJlY3QmIHZpc2libGVSZWN0KSBjb24KIEludFJlY3QgVGls ZWREcmF3aW5nQXJlYVByb3h5OjpjYWxjdWxhdGVDb3ZlclJlY3QoY29uc3QgSW50UmVjdCYgdmlz aWJsZVJlY3QpIGNvbnN0CiB7CiAgICAgSW50UmVjdCByZXN1bHQgPSB2aXNpYmxlUmVjdDsKLSAg ICByZXN1bHQuaW5mbGF0ZVgodmlzaWJsZVJlY3Qud2lkdGgoKSAqIChtX2NvdmVyQXJlYU11bHRp cGxpZXIud2lkdGgoKSAtIDEpKTsKLSAgICByZXN1bHQuaW5mbGF0ZVkodmlzaWJsZVJlY3QuaGVp Z2h0KCkgKiAobV9jb3ZlckFyZWFNdWx0aXBsaWVyLmhlaWdodCgpIC0gMSkpOworICAgIHJlc3Vs dC5pbmZsYXRlWCh2aXNpYmxlUmVjdC53aWR0aCgpICogKG1fY292ZXJBcmVhTXVsdGlwbGllci53 aWR0aCgpIC0gMSkgLyAyKTsKKyAgICByZXN1bHQuaW5mbGF0ZVkodmlzaWJsZVJlY3QuaGVpZ2h0 KCkgKiAobV9jb3ZlckFyZWFNdWx0aXBsaWVyLmhlaWdodCgpIC0gMSkgLyAyKTsKICAgICByZXN1 bHQuaW50ZXJzZWN0KGNvbnRlbnRzUmVjdCgpKTsKICAgICByZXR1cm4gcmVzdWx0OwogfQo= 82801 2011-02-17 07:35:57 -0800 2011-02-18 17:12:13 -0800 Add comment why delta should be divided by 2 tiles_area_multiplier_fix_04.diff text/plain 4629 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3NmViMDRlLi4wMjNmMzUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTEtMDItMTYgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPG9zdGFwZW5rby52aWF0Y2hl c2xhdkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGlsZWQgYmFja2luZyBzdG9yZSBhcmVhIGlzIHRvbyBiaWcuCisgICAgICAgIEVy cm9yIGluIGFyZWEgY2FsY3VsY2F0aW9uIGNhdXNlcyBzaXplIG9mIGJhY2tpbmcgc3RvcmUKKyAg ICAgICAgdXAgdG8gNiB0aW1lcyBiaWdnZXIgdGhhbiB2aWV3cG9ydCB3aXRoIGRlZmF1bHQgbXVs dGlwbGllcnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD01NDU4NworCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvVGlsZWRCYWNraW5nU3RvcmUu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6VGlsZWRCYWNraW5nU3RvcmU6OmNyZWF0ZVRpbGVzKToK KwogMjAxMS0wMi0xNiAgQ2Fyb2wgU3phYm8gIDxjYXJvbC5zemFib0Bub2tpYS5jb20+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgSHlhdHQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmdTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmdTdG9yZS5jcHAKaW5kZXggZjY5MjFlZi4u NGQ2OTMzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVGls ZWRCYWNraW5nU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L1RpbGVkQmFja2luZ1N0b3JlLmNwcApAQCAtMjEzLDE1ICsyMTMsMTcgQEAgdm9pZCBUaWxlZEJh Y2tpbmdTdG9yZTo6Y3JlYXRlVGlsZXMoKQogICAgIGRyb3BPdmVyaGFuZ2luZ1RpbGVzKCk7CiAK ICAgICBJbnRSZWN0IGtlZXBSZWN0ID0gdmlzaWJsZVJlY3Q7Ci0gICAga2VlcFJlY3QuaW5mbGF0 ZVgodmlzaWJsZVJlY3Qud2lkdGgoKSAqIChtX2tlZXBBcmVhTXVsdGlwbGllci53aWR0aCgpIC0g MS5mKSk7Ci0gICAga2VlcFJlY3QuaW5mbGF0ZVkodmlzaWJsZVJlY3QuaGVpZ2h0KCkgKiAobV9r ZWVwQXJlYU11bHRpcGxpZXIuaGVpZ2h0KCkgLSAxLmYpKTsKKyAgICAvLyBJbmZsYXRlcyB0byBi b3RoIHNpZGVzLCBzbyBkaXZpZGUgaW5mbGF0ZSBkZWx0YSBieSAyCisgICAga2VlcFJlY3QuaW5m bGF0ZVgodmlzaWJsZVJlY3Qud2lkdGgoKSAqIChtX2tlZXBBcmVhTXVsdGlwbGllci53aWR0aCgp IC0gMS5mKSAvIDIpOworICAgIGtlZXBSZWN0LmluZmxhdGVZKHZpc2libGVSZWN0LmhlaWdodCgp ICogKG1fa2VlcEFyZWFNdWx0aXBsaWVyLmhlaWdodCgpIC0gMS5mKSAvIDIpOwogICAgIGtlZXBS ZWN0LmludGVyc2VjdChjb250ZW50c1JlY3QoKSk7CiAgICAgCiAgICAgZHJvcFRpbGVzT3V0c2lk ZVJlY3Qoa2VlcFJlY3QpOwogICAgIAogICAgIEludFJlY3QgY292ZXJSZWN0ID0gdmlzaWJsZVJl Y3Q7Ci0gICAgY292ZXJSZWN0LmluZmxhdGVYKHZpc2libGVSZWN0LndpZHRoKCkgKiAobV9jb3Zl ckFyZWFNdWx0aXBsaWVyLndpZHRoKCkgLSAxLmYpKTsKLSAgICBjb3ZlclJlY3QuaW5mbGF0ZVko dmlzaWJsZVJlY3QuaGVpZ2h0KCkgKiAobV9jb3ZlckFyZWFNdWx0aXBsaWVyLmhlaWdodCgpIC0g MS5mKSk7CisgICAgLy8gSW5mbGF0ZXMgdG8gYm90aCBzaWRlcywgc28gZGl2aWRlIGluZmxhdGUg ZGVsdGEgYnkgMgorICAgIGNvdmVyUmVjdC5pbmZsYXRlWCh2aXNpYmxlUmVjdC53aWR0aCgpICog KG1fY292ZXJBcmVhTXVsdGlwbGllci53aWR0aCgpIC0gMS5mKSAvIDIpOworICAgIGNvdmVyUmVj dC5pbmZsYXRlWSh2aXNpYmxlUmVjdC5oZWlnaHQoKSAqIChtX2NvdmVyQXJlYU11bHRpcGxpZXIu aGVpZ2h0KCkgLSAxLmYpIC8gMik7CiAgICAgY292ZXJSZWN0LmludGVyc2VjdChjb250ZW50c1Jl Y3QoKSk7CiAgICAgCiAgICAgLy8gU2VhcmNoIGZvciB0aGUgdGlsZSBwb3NpdGlvbiBjbG9zZXN0 IHRvIHRoZSB2aWV3cG9ydCBjZW50ZXIgdGhhdCBkb2VzIG5vdCB5ZXQgY29udGFpbiBhIHRpbGUu IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nCmluZGV4IDU2ZGMxMTAuLjViMjE4NDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NiBAQAorMjAxMS0wMi0xNiAgVmlhdGNoZXNsYXYgT3N0YXBlbmtvICA8b3N0YXBlbmtvLnZpYXRj aGVzbGF2QG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaWxlZCBiYWNraW5nIHN0b3JlIGFyZWEgaXMgdG9vIGJpZy4KKyAgICAgICAg RXJyb3IgaW4gYXJlYSBjYWxjdWxjYXRpb24gY2F1c2VzIHNpemUgb2YgYmFja2luZyBzdG9yZQor ICAgICAgICB1cCB0byA4IHRpbWVzIGJpZ2dlciB0aGFuIHZpZXdwb3J0IHdpdGggZGVmYXVsdCBt dWx0aXBsaWVycy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTU0NTg3CisKKyAgICAgICAgKiBVSVByb2Nlc3MvVGlsZWREcmF3aW5nQXJlYVByb3h5LmNw cDoKKyAgICAgICAgKFdlYktpdDo6VGlsZWREcmF3aW5nQXJlYVByb3h5OjpjYWxjdWxhdGVLZWVw UmVjdCk6CisgICAgICAgIChXZWJLaXQ6OlRpbGVkRHJhd2luZ0FyZWFQcm94eTo6Y2FsY3VsYXRl Q292ZXJSZWN0KToKKwogMjAxMS0wMi0xNiAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBw bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4uCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvVGlsZWREcmF3aW5nQXJlYVByb3h5LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJveHkuY3BwCmluZGV4IDNiMzMz NGYuLjM1ODk4NjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9UaWxlZERy YXdpbmdBcmVhUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9UaWxlZERy YXdpbmdBcmVhUHJveHkuY3BwCkBAIC0zOTgsOCArMzk4LDkgQEAgZG91YmxlIFRpbGVkRHJhd2lu Z0FyZWFQcm94eTo6dGlsZURpc3RhbmNlKGNvbnN0IEludFJlY3QmIHZpZXdwb3J0LCBjb25zdCBU aWxlZEQKIEludFJlY3QgVGlsZWREcmF3aW5nQXJlYVByb3h5OjpjYWxjdWxhdGVLZWVwUmVjdChj b25zdCBJbnRSZWN0JiB2aXNpYmxlUmVjdCkgY29uc3QKIHsKICAgICBJbnRSZWN0IHJlc3VsdCA9 IHZpc2libGVSZWN0OwotICAgIHJlc3VsdC5pbmZsYXRlWCh2aXNpYmxlUmVjdC53aWR0aCgpICog KG1fa2VlcEFyZWFNdWx0aXBsaWVyLndpZHRoKCkgLSAxKSk7Ci0gICAgcmVzdWx0LmluZmxhdGVZ KHZpc2libGVSZWN0LmhlaWdodCgpICogKG1fa2VlcEFyZWFNdWx0aXBsaWVyLmhlaWdodCgpIC0g MSkpOworICAgIC8vIEluZmxhdGVzIHRvIGJvdGggc2lkZXMsIHNvIGRpdmlkZSBpbmZsYXRlIGRl bHRhIGJ5IDIKKyAgICByZXN1bHQuaW5mbGF0ZVgodmlzaWJsZVJlY3Qud2lkdGgoKSAqIChtX2tl ZXBBcmVhTXVsdGlwbGllci53aWR0aCgpIC0gMSkgLyAyKTsKKyAgICByZXN1bHQuaW5mbGF0ZVko dmlzaWJsZVJlY3QuaGVpZ2h0KCkgKiAobV9rZWVwQXJlYU11bHRpcGxpZXIuaGVpZ2h0KCkgLSAx KSAvIDIpOwogICAgIHJlc3VsdC5pbnRlcnNlY3QoY29udGVudHNSZWN0KCkpOwogICAgIHJldHVy biByZXN1bHQ7CiB9CkBAIC00MDcsOCArNDA4LDkgQEAgSW50UmVjdCBUaWxlZERyYXdpbmdBcmVh UHJveHk6OmNhbGN1bGF0ZUtlZXBSZWN0KGNvbnN0IEludFJlY3QmIHZpc2libGVSZWN0KSBjb24K IEludFJlY3QgVGlsZWREcmF3aW5nQXJlYVByb3h5OjpjYWxjdWxhdGVDb3ZlclJlY3QoY29uc3Qg SW50UmVjdCYgdmlzaWJsZVJlY3QpIGNvbnN0CiB7CiAgICAgSW50UmVjdCByZXN1bHQgPSB2aXNp YmxlUmVjdDsKLSAgICByZXN1bHQuaW5mbGF0ZVgodmlzaWJsZVJlY3Qud2lkdGgoKSAqIChtX2Nv dmVyQXJlYU11bHRpcGxpZXIud2lkdGgoKSAtIDEpKTsKLSAgICByZXN1bHQuaW5mbGF0ZVkodmlz aWJsZVJlY3QuaGVpZ2h0KCkgKiAobV9jb3ZlckFyZWFNdWx0aXBsaWVyLmhlaWdodCgpIC0gMSkp OworICAgIC8vIEluZmxhdGVzIHRvIGJvdGggc2lkZXMsIHNvIGRpdmlkZSBpbmZsYXRlIGRlbHRh IGJ5IDIKKyAgICByZXN1bHQuaW5mbGF0ZVgodmlzaWJsZVJlY3Qud2lkdGgoKSAqIChtX2NvdmVy QXJlYU11bHRpcGxpZXIud2lkdGgoKSAtIDEpIC8gMik7CisgICAgcmVzdWx0LmluZmxhdGVZKHZp c2libGVSZWN0LmhlaWdodCgpICogKG1fY292ZXJBcmVhTXVsdGlwbGllci5oZWlnaHQoKSAtIDEp IC8gMik7CiAgICAgcmVzdWx0LmludGVyc2VjdChjb250ZW50c1JlY3QoKSk7CiAgICAgcmV0dXJu IHJlc3VsdDsKIH0K