80714 2012-03-09 11:46:53 -0800 [Qt] [WK2] Shouldn't use item for clipping rect calculation in paint node. 2012-03-09 20:50:41 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt P3 Normal --- 76661 1 ostap73 webkit-unassigned menard noam webkit.review.bot zoltan oldest_to_newest 575037 0 ostap73 2012-03-09 11:46:53 -0800 This will not work with threaded rendering or require some synchronization and clipping nodes have all necessary information. 575041 1 131067 ostap73 2012-03-09 11:51:45 -0800 Created attachment 131067 Patch 575156 2 131067 noam 2012-03-09 13:27:09 -0800 Comment on attachment 131067 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=131067&action=review > Source/WebKit2/ChangeLog:8 > + Replace item based clipping rect calculation with clipping nodes based. Explain that this is needed for threaded rendering, where you don't have access to the items. > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:121 > + static void adjustBoundingRect(QRectF& rect, const QPointF& point) rename uniteRectWithPoint > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:131 > + if (rect.top() > point.y()) > + rect.setTop(point.y()); > + else if (rect.bottom() < point.y()) > + rect.setBottom(point.y()); > + > + if (rect.left() > point.x()) > + rect.setLeft(point.x()); > + else if (rect.right() < point.x()) > + rect.setRight(point.x()); rect |= QRectF(point, QSizeF(1, 1)); > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:137 > + QRectF retRect(0, 0, -1, -1); retRect -> resultRect > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:139 > + while (clip) { Would be nicer as a for loop for (const QSGClipNode* clip = clipList(); clip; clip = clip->clipList) > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:140 > + QMatrix4x4 m; m -> matrix or clipMatrix > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:142 > + m *= *clip->matrix(); Why multiply instead of assign? > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:152 > + if (geometry->vertexCount() > 1) { Shouldn't it be 2? I don't see the point in a single-line clip. Also, this requires a comment. > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:153 > + currentClip.setTopLeft(m.map(QPoint(geometryPoints[0].x, geometryPoints[0].y))); If you use my unite suggestion, you don't need this and can simply start from 0. 575201 3 ostap73 2012-03-09 14:05:06 -0800 (In reply to comment #2) > (From update of attachment 131067 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=131067&action=review > > > Source/WebKit2/ChangeLog:8 > > + Replace item based clipping rect calculation with clipping nodes based. > > Explain that this is needed for threaded rendering, where you don't have access to the items. > > > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:121 > > + static void adjustBoundingRect(QRectF& rect, const QPointF& point) > > rename uniteRectWithPoint > > > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:131 > > + if (rect.top() > point.y()) > > + rect.setTop(point.y()); > > + else if (rect.bottom() < point.y()) > > + rect.setBottom(point.y()); > > + > > + if (rect.left() > point.x()) > > + rect.setLeft(point.x()); > > + else if (rect.right() < point.x()) > > + rect.setRight(point.x()); > > rect |= QRectF(point, QSizeF(1, 1)); This will give rect bigger by 1 on right and bottom sides. QSize(0, 0) will not work becase QRectF operator| has check for null rect and will return original rect. > > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:137 > > + QRectF retRect(0, 0, -1, -1); > > retRect -> resultRect > > > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:139 > > + while (clip) { > > Would be nicer as a for loop > for (const QSGClipNode* clip = clipList(); clip; clip = clip->clipList) > > > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:140 > > + QMatrix4x4 m; > > m -> matrix or clipMatrix > > > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:142 > > + m *= *clip->matrix(); Remaining artifacts ;) > Why multiply instead of assign? > > > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:152 > > + if (geometry->vertexCount() > 1) { > > Shouldn't it be 2? I don't see the point in a single-line clip. > Also, this requires a comment. Yes, 2 make more sense. > > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:153 > > + currentClip.setTopLeft(m.map(QPoint(geometryPoints[0].x, geometryPoints[0].y))); > > If you use my unite suggestion, you don't need this and can simply start from 0. 575222 4 noam 2012-03-09 14:24:24 -0800 > QSize(0, 0) will not work becase QRectF operator| has check for null rect and will return original rect. How about: Use a QPolygonF Add the points to the polygon Use polygon->boundingRect 575229 5 131111 ostap73 2012-03-09 14:29:28 -0800 Created attachment 131111 Updated patch 575234 6 ostap73 2012-03-09 14:32:37 -0800 (In reply to comment #4) > > QSize(0, 0) will not work becase QRectF operator| has check for null rect and will return original rect. > How about: > Use a QPolygonF > Add the points to the polygon > Use polygon->boundingRect Didn't know that such thing exists. Was looking for it some time ago and there was QPolygon only. I'll try. 575237 7 131111 noam 2012-03-09 14:36:21 -0800 Comment on attachment 131111 Updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=131111&action=review > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:159 > + const QSGGeometry::Point2D* geometryPoints = geometry->vertexDataAsPoint2D(); > + > + // Clip region should be at least triangle to make valid clip. > + if (geometry->vertexCount() > 2) { > + currentClip.setTopLeft(clipMatrix.map(QPoint(geometryPoints[0].x, geometryPoints[0].y))); > + > + for (int i = 1; i < geometry->vertexCount(); i++) > + uniteRectWithPoint(currentClip, clipMatrix.map(QPoint(geometryPoints[i].x, geometryPoints[i].y))); > + } Better to add the points to a QPolygonF and then call boundingRect. Otherwise patch is good. > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:162 > + if (!currentClip.isEmpty()) { if (currentClip.isEmpty()) continue; > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:163 > + if (resultRect.isValid()) Comment. 575253 8 131115 ostap73 2012-03-09 14:43:44 -0800 Created attachment 131115 Updated patch 575263 9 131115 noam 2012-03-09 14:52:03 -0800 Comment on attachment 131115 Updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=131115&action=review This is good. Let's fix the nitpicks and commit. > Source/WebKit2/ChangeLog:11 > + Replace item based clipping rect calculation with clipping nodes based. > + Part of threaded rendering implementation. > + In Qt5 threaded rendering paint nodes live on paint thread and items on > + main thread. Paint nodes should not have any direct access to items. Some rewording if you don't mind :) Replace item based clip-rect calculation with clipping-nodes based calculation. This is required for threaded rendering, since we don't have access to the QSGItems from the render thread. > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:25 > +#include <QPolygonF> This belongs at the end, before the QtQuick includes. > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:126 > + QRectF resultRect(0, 0, -1, -1); Comment: start with an invalid rect. > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:142 > + if (geometry->vertexCount() > 2) { <nitpick> if (geometry->vertexCount() < 3) continue; > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:151 > + if (!currentClip.isEmpty()) { if (currentClip.isEmpty()) continue; 575288 10 131122 ostap73 2012-03-09 15:12:06 -0800 Created attachment 131122 Patch for commit. 575428 11 131122 webkit.review.bot 2012-03-09 20:50:35 -0800 Comment on attachment 131122 Patch for commit. Clearing flags on attachment: 131122 Committed r110368: <http://trac.webkit.org/changeset/110368> 575429 12 webkit.review.bot 2012-03-09 20:50:41 -0800 All reviewed patches have been landed. Closing bug. 131067 2012-03-09 11:51:45 -0800 2012-03-09 14:29:28 -0800 Patch clipping_rect_fix_01.diff text/plain 5742 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzM2ZhZTgwLi4zYzNjZTRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTItMDMtMDkgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPG9zdGFwZW5rby52aWF0Y2hl c2xhdkBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XSBbV0syXSBTaG91bGRuJ3QgdXNlIGl0ZW0g Zm9yIGNsaXBwaW5nIHJlY3QgY2FsY3VsYXRpb24gaW4gcGFpbnQgbm9kZS4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwNzE0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBpdGVtIGJhc2VkIGNs aXBwaW5nIHJlY3QgY2FsY3VsYXRpb24gd2l0aCBjbGlwcGluZyBub2RlcyBiYXNlZC4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZS5jcHA6CisgICAgICAgIChRUXVp Y2tXZWJQYWdlOjpRUXVpY2tXZWJQYWdlKToKKyAgICAgICAgKFFRdWlja1dlYlBhZ2VQcml2YXRl OjpwYWludFRvQ3VycmVudEdMQ29udGV4dCk6CisgICAgICAgIChQYWdlUHJveHlOb2RlOjpyZW5k ZXIpOgorICAgICAgICAoUGFnZVByb3h5Tm9kZTo6YWRqdXN0Qm91bmRpbmdSZWN0KToKKyAgICAg ICAgKFBhZ2VQcm94eU5vZGUpOgorICAgICAgICAoUGFnZVByb3h5Tm9kZTo6Y2xpcFJlY3QpOgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZV9wX3AuaDoKKyAgICAgICAg KFFRdWlja1dlYlBhZ2VQcml2YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlj a3dlYnZpZXcuY3BwOgorICAgICAgICAoUVF1aWNrV2ViVmlldzo6UVF1aWNrV2ViVmlldyk6CisK IDIwMTItMDMtMDcgIEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuICA8a2VubmV0aEB3ZWJraXQu b3JnPgogCiAgICAgICAgIFBpbmNoIHpvb20gYWN0cyB3ZWlyZGx5IG9uIG55dGltZXMuY29tIHdo aWxlIGxvYWRpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQv cXF1aWNrd2VicGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlj a3dlYnBhZ2UuY3BwCmluZGV4IGQ1OGZlZmUuLmRhYmY1YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZS5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlLmNwcApAQCAtMzYsNiArMzYsNyBA QCBRUXVpY2tXZWJQYWdlOjpRUXVpY2tXZWJQYWdlKFFRdWlja1dlYlZpZXcqIHZpZXdwb3J0SXRl bSkKICAgICAsIGQobmV3IFFRdWlja1dlYlBhZ2VQcml2YXRlKHRoaXMsIHZpZXdwb3J0SXRlbSkp CiB7CiAgICAgc2V0RmxhZyhJdGVtSGFzQ29udGVudHMpOworICAgIHNldENsaXAodHJ1ZSk7CiAK ICAgICAvLyBXZSBkbyB0aGUgdHJhbnNmb3JtIGZyb20gdGhlIHRvcCBsZWZ0IHNvIHRoZSB2aWV3 cG9ydCBjYW4gYXNzdW1lIHRoZSBwb3NpdGlvbiAwLCAwCiAgICAgLy8gaXMgYWx3YXlzIHdoZXJl IHJlbmRlcmluZyBzdGFydHMuCkBAIC03NywxMyArNzgsMTEgQEAgdm9pZCBRUXVpY2tXZWJQYWdl UHJpdmF0ZTo6cGFpbnQoUVBhaW50ZXIqIHBhaW50ZXIpCiAgICAgICAgIHdlYlBhZ2VQcm94eS0+ ZHJhd2luZ0FyZWEoKS0+cGFpbnRMYXllclRyZWUocGFpbnRlcik7CiB9CiAKLXZvaWQgUVF1aWNr V2ViUGFnZVByaXZhdGU6OnBhaW50VG9DdXJyZW50R0xDb250ZXh0KGNvbnN0IFFUcmFuc2Zvcm0m IHRyYW5zZm9ybSwgZmxvYXQgb3BhY2l0eSkKK3ZvaWQgUVF1aWNrV2ViUGFnZVByaXZhdGU6OnBh aW50VG9DdXJyZW50R0xDb250ZXh0KGNvbnN0IFFUcmFuc2Zvcm0mIHRyYW5zZm9ybSwgZmxvYXQg b3BhY2l0eSwgY29uc3QgUVJlY3RGJiBjbGlwUmVjdCkKIHsKICAgICBpZiAoIXEtPmlzVmlzaWJs ZSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBRUmVjdEYgY2xpcFJlY3QgPSB2aWV3cG9ydEl0 ZW0tPm1hcFJlY3RUb1NjZW5lKHZpZXdwb3J0SXRlbS0+Ym91bmRpbmdSZWN0KCkpOwotCiAgICAg aWYgKCFjbGlwUmVjdC5pc1ZhbGlkKCkpCiAgICAgICAgIHJldHVybjsKIApAQCAtMTA1LDEyICsx MDQsMTIgQEAgc3RydWN0IFBhZ2VQcm94eU5vZGUgOiBwdWJsaWMgUVNHUmVuZGVyTm9kZSB7CiAg ICAgICAgIHJldHVybiBTdGF0ZUZsYWdzKFN0ZW5jaWxTdGF0ZSkgfCBDb2xvclN0YXRlIHwgQmxl bmRTdGF0ZTsKICAgICB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgcmVuZGVyKGNvbnN0IFJlbmRlclN0 YXRlJikKKyAgICB2aXJ0dWFsIHZvaWQgcmVuZGVyKGNvbnN0IFJlbmRlclN0YXRlJiBzdGF0ZSkK ICAgICB7CiAgICAgICAgIGlmICghbV9wYWdlUHJpdmF0ZSkKICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgUVRyYW5zZm9ybSB0cmFuc2Zvcm0gPSBtYXRyaXgoKSA/IG1hdHJpeCgpLT50b1Ry YW5zZm9ybSgpIDogUVRyYW5zZm9ybSgpOwotICAgICAgICBtX3BhZ2VQcml2YXRlLT5wYWludFRv Q3VycmVudEdMQ29udGV4dCh0cmFuc2Zvcm0sIGluaGVyaXRlZE9wYWNpdHkoKSk7CisgICAgICAg IG1fcGFnZVByaXZhdGUtPnBhaW50VG9DdXJyZW50R0xDb250ZXh0KHRyYW5zZm9ybSwgaW5oZXJp dGVkT3BhY2l0eSgpLCBjbGlwUmVjdChzdGF0ZSkpOwogICAgIH0KIAogICAgIH5QYWdlUHJveHlO b2RlKCkKQEAgLTExOSw2ICsxMTgsNTggQEAgc3RydWN0IFBhZ2VQcm94eU5vZGUgOiBwdWJsaWMg UVNHUmVuZGVyTm9kZSB7CiAgICAgICAgICAgICBtX3BhZ2VQcml2YXRlLT5yZXNldFBhaW50Tm9k ZSgpOwogICAgIH0KIAorICAgIHN0YXRpYyB2b2lkIGFkanVzdEJvdW5kaW5nUmVjdChRUmVjdEYm IHJlY3QsIGNvbnN0IFFQb2ludEYmIHBvaW50KQorICAgIHsKKyAgICAgICAgaWYgKHJlY3QudG9w KCkgPiBwb2ludC55KCkpCisgICAgICAgICAgICByZWN0LnNldFRvcChwb2ludC55KCkpOworICAg ICAgICBlbHNlIGlmIChyZWN0LmJvdHRvbSgpIDwgcG9pbnQueSgpKQorICAgICAgICAgICAgcmVj dC5zZXRCb3R0b20ocG9pbnQueSgpKTsKKworICAgICAgICBpZiAocmVjdC5sZWZ0KCkgPiBwb2lu dC54KCkpCisgICAgICAgICAgICByZWN0LnNldExlZnQocG9pbnQueCgpKTsKKyAgICAgICAgZWxz ZSBpZiAocmVjdC5yaWdodCgpIDwgcG9pbnQueCgpKQorICAgICAgICAgICAgcmVjdC5zZXRSaWdo dChwb2ludC54KCkpOworICAgIH0KKworICAgIFFSZWN0RiBjbGlwUmVjdChjb25zdCBSZW5kZXJT dGF0ZSAmc3RhdGUpIGNvbnN0CisgICAgeworICAgICAgICBjb25zdCBRU0dDbGlwTm9kZSogY2xp cCA9IGNsaXBMaXN0KCk7CisgICAgICAgIFFSZWN0RiByZXRSZWN0KDAsIDAsIC0xLCAtMSk7CisK KyAgICAgICAgd2hpbGUgKGNsaXApIHsKKyAgICAgICAgICAgIFFNYXRyaXg0eDQgbTsKKyAgICAg ICAgICAgIGlmIChjbGlwLT5tYXRyaXgoKSkKKyAgICAgICAgICAgICAgICBtICo9ICpjbGlwLT5t YXRyaXgoKTsKKyAgICAgICAgICAgIFFSZWN0RiBjdXJyZW50Q2xpcDsKKworICAgICAgICAgICAg aWYgKGNsaXAtPmlzUmVjdGFuZ3VsYXIoKSkKKyAgICAgICAgICAgICAgICBjdXJyZW50Q2xpcCA9 IG0ubWFwUmVjdChjbGlwLT5jbGlwUmVjdCgpKTsKKyAgICAgICAgICAgIGVsc2UgeworICAgICAg ICAgICAgICAgIGNvbnN0IFFTR0dlb21ldHJ5KiBnZW9tZXRyeSA9IGNsaXAtPmdlb21ldHJ5KCk7 CisgICAgICAgICAgICAgICAgLy8gQXNzdW1lIGhlcmUgdGhhdCBjbGlwTm9kZSBoYXMgb25seSBj b29yZGluYXRlIGRhdGEuCisgICAgICAgICAgICAgICAgY29uc3QgUVNHR2VvbWV0cnk6OlBvaW50 MkQqIGdlb21ldHJ5UG9pbnRzID0gZ2VvbWV0cnktPnZlcnRleERhdGFBc1BvaW50MkQoKTsKKwor ICAgICAgICAgICAgICAgIGlmIChnZW9tZXRyeS0+dmVydGV4Q291bnQoKSA+IDEpIHsKKyAgICAg ICAgICAgICAgICAgICAgY3VycmVudENsaXAuc2V0VG9wTGVmdChtLm1hcChRUG9pbnQoZ2VvbWV0 cnlQb2ludHNbMF0ueCwgZ2VvbWV0cnlQb2ludHNbMF0ueSkpKTsKKworICAgICAgICAgICAgICAg ICAgICBmb3IgKGludCBpID0gMTsgaSA8IGdlb21ldHJ5LT52ZXJ0ZXhDb3VudCgpOyBpKyspCisg ICAgICAgICAgICAgICAgICAgICAgICBhZGp1c3RCb3VuZGluZ1JlY3QoY3VycmVudENsaXAsIG0u bWFwKFFQb2ludChnZW9tZXRyeVBvaW50c1tpXS54LCBnZW9tZXRyeVBvaW50c1tpXS55KSkpOwor ICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgaWYgKCFjdXJy ZW50Q2xpcC5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgICAgICBpZiAocmV0UmVjdC5pc1ZhbGlk KCkpCisgICAgICAgICAgICAgICAgICAgIHJldFJlY3QgJj0gY3VycmVudENsaXA7CisgICAgICAg ICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICByZXRSZWN0ID0gY3VycmVudENsaXA7 CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGNsaXAgPSBjbGlwLT5jbGlwTGlzdCgpOwor ICAgICAgICB9CisKKyAgICAgICAgcmV0dXJuIHJldFJlY3Q7CisgICAgfQorCiAgICAgUVF1aWNr V2ViUGFnZVByaXZhdGUqIG1fcGFnZVByaXZhdGU7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2VfcF9wLmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2VfcF9wLmgKaW5kZXggZmE3ZDY4Yy4u YjI4MTc0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVp Y2t3ZWJwYWdlX3BfcC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1 aWNrd2VicGFnZV9wX3AuaApAQCAtNDEsNyArNDEsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHVw ZGF0ZVNpemUoKTsKIAotICAgIHZvaWQgcGFpbnRUb0N1cnJlbnRHTENvbnRleHQoY29uc3QgUVRy YW5zZm9ybSYsIGZsb2F0IG9wYWNpdHkpOworICAgIHZvaWQgcGFpbnRUb0N1cnJlbnRHTENvbnRl eHQoY29uc3QgUVRyYW5zZm9ybSYsIGZsb2F0IG9wYWNpdHksIGNvbnN0IFFSZWN0RiYgY2xpcFJl Y3QpOwogICAgIHZvaWQgcGFpbnQoUVBhaW50ZXIqKTsKICAgICB2b2lkIHJlc2V0UGFpbnROb2Rl KCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNr d2Vidmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZp ZXcuY3BwCmluZGV4IGYwMWNlMDIuLmRhN2I3YmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcApAQCAtMTEyNyw2ICsxMTI3LDcgQEAg UVF1aWNrV2ViVmlldzo6UVF1aWNrV2ViVmlldyhXS0NvbnRleHRSZWYgY29udGV4dFJlZiwgV0tQ YWdlR3JvdXBSZWYgcGFnZUdyb3VwUmUKIHsKICAgICBRX0QoUVF1aWNrV2ViVmlldyk7CiAgICAg ZC0+aW5pdGlhbGl6ZShjb250ZXh0UmVmLCBwYWdlR3JvdXBSZWYpOworICAgIHNldENsaXAodHJ1 ZSk7CiB9CiAKIFFRdWlja1dlYlZpZXc6On5RUXVpY2tXZWJWaWV3KCkK 131111 2012-03-09 14:29:28 -0800 2012-03-09 14:43:44 -0800 Updated patch clipping_rect_fix_02.diff text/plain 5914 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzM2ZhZTgwLi40M2ZlZGJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTItMDMtMDkgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPG9zdGFwZW5rby52aWF0Y2hl c2xhdkBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XSBbV0syXSBTaG91bGRuJ3QgdXNlIGl0ZW0g Zm9yIGNsaXBwaW5nIHJlY3QgY2FsY3VsYXRpb24gaW4gcGFpbnQgbm9kZS4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwNzE0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBpdGVtIGJhc2VkIGNs aXBwaW5nIHJlY3QgY2FsY3VsYXRpb24gd2l0aCBjbGlwcGluZyBub2RlcyBiYXNlZC4KKyAgICAg ICAgUGFydCBvZiB0aHJlYWRlZCByZW5kZXJpbmcgaW1wbGVtZW50YXRpb24uCisgICAgICAgIElu IFF0NSB0aHJlYWRlZCByZW5kZXJpbmcgcGFpbnQgbm9kZXMgbGl2ZSBvbiBwYWludCB0aHJlYWQg YW5kIGl0ZW1zIG9uIAorICAgICAgICBtYWluIHRocmVhZC4gUGFpbnQgbm9kZXMgc2hvdWxkIG5v dCBoYXZlIGFueSBkaXJlY3QgYWNjZXNzIHRvIGl0ZW1zLgorCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9xdC9xcXVpY2t3ZWJwYWdlLmNwcDoKKyAgICAgICAgKFFRdWlja1dlYlBhZ2U6OlFRdWlj a1dlYlBhZ2UpOgorICAgICAgICAoUVF1aWNrV2ViUGFnZVByaXZhdGU6OnBhaW50VG9DdXJyZW50 R0xDb250ZXh0KToKKyAgICAgICAgKFBhZ2VQcm94eU5vZGU6OnJlbmRlcik6CisgICAgICAgIChQ YWdlUHJveHlOb2RlOjp1bml0ZVJlY3RXaXRoUG9pbnQpOgorICAgICAgICAoUGFnZVByb3h5Tm9k ZSk6CisgICAgICAgIChQYWdlUHJveHlOb2RlOjpjbGlwUmVjdCk6CisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlX3BfcC5oOgorICAgICAgICAoUVF1aWNrV2ViUGFnZVBy aXZhdGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHA6Cisg ICAgICAgIChRUXVpY2tXZWJWaWV3OjpRUXVpY2tXZWJWaWV3KToKKwogMjAxMi0wMy0wNyAgS2Vu bmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4gIDxrZW5uZXRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAg UGluY2ggem9vbSBhY3RzIHdlaXJkbHkgb24gbnl0aW1lcy5jb20gd2hpbGUgbG9hZGluZwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZS5jcHAKaW5k ZXggZDU4ZmVmZS4uYWEyYWQ1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC9xcXVpY2t3ZWJwYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3FxdWlja3dlYnBhZ2UuY3BwCkBAIC0zNiw2ICszNiw3IEBAIFFRdWlja1dlYlBhZ2U6 OlFRdWlja1dlYlBhZ2UoUVF1aWNrV2ViVmlldyogdmlld3BvcnRJdGVtKQogICAgICwgZChuZXcg UVF1aWNrV2ViUGFnZVByaXZhdGUodGhpcywgdmlld3BvcnRJdGVtKSkKIHsKICAgICBzZXRGbGFn KEl0ZW1IYXNDb250ZW50cyk7CisgICAgc2V0Q2xpcCh0cnVlKTsKIAogICAgIC8vIFdlIGRvIHRo ZSB0cmFuc2Zvcm0gZnJvbSB0aGUgdG9wIGxlZnQgc28gdGhlIHZpZXdwb3J0IGNhbiBhc3N1bWUg dGhlIHBvc2l0aW9uIDAsIDAKICAgICAvLyBpcyBhbHdheXMgd2hlcmUgcmVuZGVyaW5nIHN0YXJ0 cy4KQEAgLTc3LDEzICs3OCwxMSBAQCB2b2lkIFFRdWlja1dlYlBhZ2VQcml2YXRlOjpwYWludChR UGFpbnRlciogcGFpbnRlcikKICAgICAgICAgd2ViUGFnZVByb3h5LT5kcmF3aW5nQXJlYSgpLT5w YWludExheWVyVHJlZShwYWludGVyKTsKIH0KIAotdm9pZCBRUXVpY2tXZWJQYWdlUHJpdmF0ZTo6 cGFpbnRUb0N1cnJlbnRHTENvbnRleHQoY29uc3QgUVRyYW5zZm9ybSYgdHJhbnNmb3JtLCBmbG9h dCBvcGFjaXR5KQordm9pZCBRUXVpY2tXZWJQYWdlUHJpdmF0ZTo6cGFpbnRUb0N1cnJlbnRHTENv bnRleHQoY29uc3QgUVRyYW5zZm9ybSYgdHJhbnNmb3JtLCBmbG9hdCBvcGFjaXR5LCBjb25zdCBR UmVjdEYmIGNsaXBSZWN0KQogewogICAgIGlmICghcS0+aXNWaXNpYmxlKCkpCiAgICAgICAgIHJl dHVybjsKIAotICAgIFFSZWN0RiBjbGlwUmVjdCA9IHZpZXdwb3J0SXRlbS0+bWFwUmVjdFRvU2Nl bmUodmlld3BvcnRJdGVtLT5ib3VuZGluZ1JlY3QoKSk7Ci0KICAgICBpZiAoIWNsaXBSZWN0Lmlz VmFsaWQoKSkKICAgICAgICAgcmV0dXJuOwogCkBAIC0xMTAsNyArMTA5LDkgQEAgc3RydWN0IFBh Z2VQcm94eU5vZGUgOiBwdWJsaWMgUVNHUmVuZGVyTm9kZSB7CiAgICAgICAgIGlmICghbV9wYWdl UHJpdmF0ZSkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgUVRyYW5zZm9ybSB0cmFuc2Zv cm0gPSBtYXRyaXgoKSA/IG1hdHJpeCgpLT50b1RyYW5zZm9ybSgpIDogUVRyYW5zZm9ybSgpOwot ICAgICAgICBtX3BhZ2VQcml2YXRlLT5wYWludFRvQ3VycmVudEdMQ29udGV4dCh0cmFuc2Zvcm0s IGluaGVyaXRlZE9wYWNpdHkoKSk7CisKKyAgICAgICAgLy8gRklYTUU6IFN1cHBvcnQgbm9uLXJl Y3Rhbmd1bGFyIGNsaXBwaW5ncy4KKyAgICAgICAgbV9wYWdlUHJpdmF0ZS0+cGFpbnRUb0N1cnJl bnRHTENvbnRleHQodHJhbnNmb3JtLCBpbmhlcml0ZWRPcGFjaXR5KCksIGNsaXBSZWN0KCkpOwog ICAgIH0KIAogICAgIH5QYWdlUHJveHlOb2RlKCkKQEAgLTExOSw2ICsxMjAsNTcgQEAgc3RydWN0 IFBhZ2VQcm94eU5vZGUgOiBwdWJsaWMgUVNHUmVuZGVyTm9kZSB7CiAgICAgICAgICAgICBtX3Bh Z2VQcml2YXRlLT5yZXNldFBhaW50Tm9kZSgpOwogICAgIH0KIAorICAgIHN0YXRpYyB2b2lkIHVu aXRlUmVjdFdpdGhQb2ludChRUmVjdEYmIHJlY3QsIGNvbnN0IFFQb2ludEYmIHBvaW50KQorICAg IHsKKyAgICAgICAgaWYgKHJlY3QudG9wKCkgPiBwb2ludC55KCkpCisgICAgICAgICAgICByZWN0 LnNldFRvcChwb2ludC55KCkpOworICAgICAgICBlbHNlIGlmIChyZWN0LmJvdHRvbSgpIDwgcG9p bnQueSgpKQorICAgICAgICAgICAgcmVjdC5zZXRCb3R0b20ocG9pbnQueSgpKTsKKworICAgICAg ICBpZiAocmVjdC5sZWZ0KCkgPiBwb2ludC54KCkpCisgICAgICAgICAgICByZWN0LnNldExlZnQo cG9pbnQueCgpKTsKKyAgICAgICAgZWxzZSBpZiAocmVjdC5yaWdodCgpIDwgcG9pbnQueCgpKQor ICAgICAgICAgICAgcmVjdC5zZXRSaWdodChwb2ludC54KCkpOworICAgIH0KKworICAgIFFSZWN0 RiBjbGlwUmVjdCgpIGNvbnN0CisgICAgeworICAgICAgICBRUmVjdEYgcmVzdWx0UmVjdCgwLCAw LCAtMSwgLTEpOworCisgICAgICAgIGZvciAoY29uc3QgUVNHQ2xpcE5vZGUqIGNsaXAgPSBjbGlw TGlzdCgpOyBjbGlwOyBjbGlwID0gY2xpcC0+Y2xpcExpc3QoKSkgeworICAgICAgICAgICAgUU1h dHJpeDR4NCBjbGlwTWF0cml4OworICAgICAgICAgICAgaWYgKGNsaXAtPm1hdHJpeCgpKQorICAg ICAgICAgICAgICAgIGNsaXBNYXRyaXggPSAqY2xpcC0+bWF0cml4KCk7CisgICAgICAgICAgICBR UmVjdEYgY3VycmVudENsaXA7CisKKyAgICAgICAgICAgIGlmIChjbGlwLT5pc1JlY3Rhbmd1bGFy KCkpCisgICAgICAgICAgICAgICAgY3VycmVudENsaXAgPSBjbGlwTWF0cml4Lm1hcFJlY3QoY2xp cC0+Y2xpcFJlY3QoKSk7CisgICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICAgICBjb25z dCBRU0dHZW9tZXRyeSogZ2VvbWV0cnkgPSBjbGlwLT5nZW9tZXRyeSgpOworICAgICAgICAgICAg ICAgIC8vIEFzc3VtZSBoZXJlIHRoYXQgY2xpcE5vZGUgaGFzIG9ubHkgY29vcmRpbmF0ZSBkYXRh LgorICAgICAgICAgICAgICAgIGNvbnN0IFFTR0dlb21ldHJ5OjpQb2ludDJEKiBnZW9tZXRyeVBv aW50cyA9IGdlb21ldHJ5LT52ZXJ0ZXhEYXRhQXNQb2ludDJEKCk7CisKKyAgICAgICAgICAgICAg ICAvLyBDbGlwIHJlZ2lvbiBzaG91bGQgYmUgYXQgbGVhc3QgdHJpYW5nbGUgdG8gbWFrZSB2YWxp ZCBjbGlwLgorICAgICAgICAgICAgICAgIGlmIChnZW9tZXRyeS0+dmVydGV4Q291bnQoKSA+IDIp IHsKKyAgICAgICAgICAgICAgICAgICAgY3VycmVudENsaXAuc2V0VG9wTGVmdChjbGlwTWF0cml4 Lm1hcChRUG9pbnQoZ2VvbWV0cnlQb2ludHNbMF0ueCwgZ2VvbWV0cnlQb2ludHNbMF0ueSkpKTsK KworICAgICAgICAgICAgICAgICAgICBmb3IgKGludCBpID0gMTsgaSA8IGdlb21ldHJ5LT52ZXJ0 ZXhDb3VudCgpOyBpKyspCisgICAgICAgICAgICAgICAgICAgICAgICB1bml0ZVJlY3RXaXRoUG9p bnQoY3VycmVudENsaXAsIGNsaXBNYXRyaXgubWFwKFFQb2ludChnZW9tZXRyeVBvaW50c1tpXS54 LCBnZW9tZXRyeVBvaW50c1tpXS55KSkpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAg IH0KKworICAgICAgICAgICAgaWYgKCFjdXJyZW50Q2xpcC5pc0VtcHR5KCkpIHsKKyAgICAgICAg ICAgICAgICBpZiAocmVzdWx0UmVjdC5pc1ZhbGlkKCkpCisgICAgICAgICAgICAgICAgICAgIHJl c3VsdFJlY3QgJj0gY3VycmVudENsaXA7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAg ICAgICAgICAgICByZXN1bHRSZWN0ID0gY3VycmVudENsaXA7CisgICAgICAgICAgICB9CisKKyAg ICAgICAgfQorCisgICAgICAgIHJldHVybiByZXN1bHRSZWN0OworICAgIH0KKwogICAgIFFRdWlj a1dlYlBhZ2VQcml2YXRlKiBtX3BhZ2VQcml2YXRlOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlX3BfcC5oIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlX3BfcC5oCmluZGV4IGZhN2Q2OGMu LmIyODE3NDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1 aWNrd2VicGFnZV9wX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Fx dWlja3dlYnBhZ2VfcF9wLmgKQEAgLTQxLDcgKzQxLDcgQEAgcHVibGljOgogCiAgICAgdm9pZCB1 cGRhdGVTaXplKCk7CiAKLSAgICB2b2lkIHBhaW50VG9DdXJyZW50R0xDb250ZXh0KGNvbnN0IFFU cmFuc2Zvcm0mLCBmbG9hdCBvcGFjaXR5KTsKKyAgICB2b2lkIHBhaW50VG9DdXJyZW50R0xDb250 ZXh0KGNvbnN0IFFUcmFuc2Zvcm0mLCBmbG9hdCBvcGFjaXR5LCBjb25zdCBRUmVjdEYmIGNsaXBS ZWN0KTsKICAgICB2b2lkIHBhaW50KFFQYWludGVyKik7CiAgICAgdm9pZCByZXNldFBhaW50Tm9k ZSgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlj a3dlYnZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2 aWV3LmNwcAppbmRleCBmMDFjZTAyLi5kYTdiN2JkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKQEAgLTExMjcsNiArMTEyNyw3IEBA IFFRdWlja1dlYlZpZXc6OlFRdWlja1dlYlZpZXcoV0tDb250ZXh0UmVmIGNvbnRleHRSZWYsIFdL UGFnZUdyb3VwUmVmIHBhZ2VHcm91cFJlCiB7CiAgICAgUV9EKFFRdWlja1dlYlZpZXcpOwogICAg IGQtPmluaXRpYWxpemUoY29udGV4dFJlZiwgcGFnZUdyb3VwUmVmKTsKKyAgICBzZXRDbGlwKHRy dWUpOwogfQogCiBRUXVpY2tXZWJWaWV3Ojp+UVF1aWNrV2ViVmlldygpCg== 131115 2012-03-09 14:43:44 -0800 2012-03-09 15:12:06 -0800 Updated patch clipping_rect_fix_03.diff text/plain 5639 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzM2ZhZTgwLi41OTFjYjRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTItMDMtMDkgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPG9zdGFwZW5rby52aWF0Y2hl c2xhdkBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XSBbV0syXSBTaG91bGRuJ3QgdXNlIGl0ZW0g Zm9yIGNsaXBwaW5nIHJlY3QgY2FsY3VsYXRpb24gaW4gcGFpbnQgbm9kZS4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwNzE0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBpdGVtIGJhc2VkIGNs aXBwaW5nIHJlY3QgY2FsY3VsYXRpb24gd2l0aCBjbGlwcGluZyBub2RlcyBiYXNlZC4KKyAgICAg ICAgUGFydCBvZiB0aHJlYWRlZCByZW5kZXJpbmcgaW1wbGVtZW50YXRpb24uCisgICAgICAgIElu IFF0NSB0aHJlYWRlZCByZW5kZXJpbmcgcGFpbnQgbm9kZXMgbGl2ZSBvbiBwYWludCB0aHJlYWQg YW5kIGl0ZW1zIG9uIAorICAgICAgICBtYWluIHRocmVhZC4gUGFpbnQgbm9kZXMgc2hvdWxkIG5v dCBoYXZlIGFueSBkaXJlY3QgYWNjZXNzIHRvIGl0ZW1zLgorCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9xdC9xcXVpY2t3ZWJwYWdlLmNwcDoKKyAgICAgICAgKFFRdWlja1dlYlBhZ2U6OlFRdWlj a1dlYlBhZ2UpOgorICAgICAgICAoUVF1aWNrV2ViUGFnZVByaXZhdGU6OnBhaW50VG9DdXJyZW50 R0xDb250ZXh0KToKKyAgICAgICAgKFBhZ2VQcm94eU5vZGU6OnJlbmRlcik6CisgICAgICAgIChQ YWdlUHJveHlOb2RlOjpjbGlwUmVjdCk6CisgICAgICAgIChQYWdlUHJveHlOb2RlKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2VfcF9wLmg6CisgICAgICAgIChRUXVp Y2tXZWJQYWdlUHJpdmF0ZSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2 aWV3LmNwcDoKKyAgICAgICAgKFFRdWlja1dlYlZpZXc6OlFRdWlja1dlYlZpZXcpOgorCiAyMDEy LTAzLTA3ICBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4K IAogICAgICAgICBQaW5jaCB6b29tIGFjdHMgd2VpcmRseSBvbiBueXRpbWVzLmNvbSB3aGlsZSBs b2FkaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlj a3dlYnBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJw YWdlLmNwcAppbmRleCBkNThmZWZlLi42Njg1MTE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZS5jcHAKQEAgLTIyLDYgKzIyLDcgQEAKICNp bmNsdWRlICJxcXVpY2t3ZWJwYWdlX3AuaCIKIAogI2luY2x1ZGUgIkxheWVyVHJlZUhvc3RQcm94 eS5oIgorI2luY2x1ZGUgPFFQb2x5Z29uRj4KICNpbmNsdWRlICJRdFdlYlBhZ2VFdmVudEhhbmRs ZXIuaCIKICNpbmNsdWRlICJUcmFuc2Zvcm1hdGlvbk1hdHJpeC5oIgogI2luY2x1ZGUgInFxdWlj a3dlYnBhZ2VfcF9wLmgiCkBAIC0zNiw2ICszNyw3IEBAIFFRdWlja1dlYlBhZ2U6OlFRdWlja1dl YlBhZ2UoUVF1aWNrV2ViVmlldyogdmlld3BvcnRJdGVtKQogICAgICwgZChuZXcgUVF1aWNrV2Vi UGFnZVByaXZhdGUodGhpcywgdmlld3BvcnRJdGVtKSkKIHsKICAgICBzZXRGbGFnKEl0ZW1IYXND b250ZW50cyk7CisgICAgc2V0Q2xpcCh0cnVlKTsKIAogICAgIC8vIFdlIGRvIHRoZSB0cmFuc2Zv cm0gZnJvbSB0aGUgdG9wIGxlZnQgc28gdGhlIHZpZXdwb3J0IGNhbiBhc3N1bWUgdGhlIHBvc2l0 aW9uIDAsIDAKICAgICAvLyBpcyBhbHdheXMgd2hlcmUgcmVuZGVyaW5nIHN0YXJ0cy4KQEAgLTc3 LDEzICs3OSwxMSBAQCB2b2lkIFFRdWlja1dlYlBhZ2VQcml2YXRlOjpwYWludChRUGFpbnRlciog cGFpbnRlcikKICAgICAgICAgd2ViUGFnZVByb3h5LT5kcmF3aW5nQXJlYSgpLT5wYWludExheWVy VHJlZShwYWludGVyKTsKIH0KIAotdm9pZCBRUXVpY2tXZWJQYWdlUHJpdmF0ZTo6cGFpbnRUb0N1 cnJlbnRHTENvbnRleHQoY29uc3QgUVRyYW5zZm9ybSYgdHJhbnNmb3JtLCBmbG9hdCBvcGFjaXR5 KQordm9pZCBRUXVpY2tXZWJQYWdlUHJpdmF0ZTo6cGFpbnRUb0N1cnJlbnRHTENvbnRleHQoY29u c3QgUVRyYW5zZm9ybSYgdHJhbnNmb3JtLCBmbG9hdCBvcGFjaXR5LCBjb25zdCBRUmVjdEYmIGNs aXBSZWN0KQogewogICAgIGlmICghcS0+aXNWaXNpYmxlKCkpCiAgICAgICAgIHJldHVybjsKIAot ICAgIFFSZWN0RiBjbGlwUmVjdCA9IHZpZXdwb3J0SXRlbS0+bWFwUmVjdFRvU2NlbmUodmlld3Bv cnRJdGVtLT5ib3VuZGluZ1JlY3QoKSk7Ci0KICAgICBpZiAoIWNsaXBSZWN0LmlzVmFsaWQoKSkK ICAgICAgICAgcmV0dXJuOwogCkBAIC0xMTAsNyArMTEwLDkgQEAgc3RydWN0IFBhZ2VQcm94eU5v ZGUgOiBwdWJsaWMgUVNHUmVuZGVyTm9kZSB7CiAgICAgICAgIGlmICghbV9wYWdlUHJpdmF0ZSkK ICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgUVRyYW5zZm9ybSB0cmFuc2Zvcm0gPSBtYXRy aXgoKSA/IG1hdHJpeCgpLT50b1RyYW5zZm9ybSgpIDogUVRyYW5zZm9ybSgpOwotICAgICAgICBt X3BhZ2VQcml2YXRlLT5wYWludFRvQ3VycmVudEdMQ29udGV4dCh0cmFuc2Zvcm0sIGluaGVyaXRl ZE9wYWNpdHkoKSk7CisKKyAgICAgICAgLy8gRklYTUU6IFN1cHBvcnQgbm9uLXJlY3Rhbmd1bGFy IGNsaXBwaW5ncy4KKyAgICAgICAgbV9wYWdlUHJpdmF0ZS0+cGFpbnRUb0N1cnJlbnRHTENvbnRl eHQodHJhbnNmb3JtLCBpbmhlcml0ZWRPcGFjaXR5KCksIGNsaXBSZWN0KCkpOwogICAgIH0KIAog ICAgIH5QYWdlUHJveHlOb2RlKCkKQEAgLTExOSw2ICsxMjEsNDUgQEAgc3RydWN0IFBhZ2VQcm94 eU5vZGUgOiBwdWJsaWMgUVNHUmVuZGVyTm9kZSB7CiAgICAgICAgICAgICBtX3BhZ2VQcml2YXRl LT5yZXNldFBhaW50Tm9kZSgpOwogICAgIH0KIAorICAgIFFSZWN0RiBjbGlwUmVjdCgpIGNvbnN0 CisgICAgeworICAgICAgICBRUmVjdEYgcmVzdWx0UmVjdCgwLCAwLCAtMSwgLTEpOworCisgICAg ICAgIGZvciAoY29uc3QgUVNHQ2xpcE5vZGUqIGNsaXAgPSBjbGlwTGlzdCgpOyBjbGlwOyBjbGlw ID0gY2xpcC0+Y2xpcExpc3QoKSkgeworICAgICAgICAgICAgUU1hdHJpeDR4NCBjbGlwTWF0cml4 OworICAgICAgICAgICAgaWYgKGNsaXAtPm1hdHJpeCgpKQorICAgICAgICAgICAgICAgIGNsaXBN YXRyaXggPSAqY2xpcC0+bWF0cml4KCk7CisgICAgICAgICAgICBRUmVjdEYgY3VycmVudENsaXA7 CisKKyAgICAgICAgICAgIGlmIChjbGlwLT5pc1JlY3Rhbmd1bGFyKCkpCisgICAgICAgICAgICAg ICAgY3VycmVudENsaXAgPSBjbGlwTWF0cml4Lm1hcFJlY3QoY2xpcC0+Y2xpcFJlY3QoKSk7Cisg ICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICAgICBjb25zdCBRU0dHZW9tZXRyeSogZ2Vv bWV0cnkgPSBjbGlwLT5nZW9tZXRyeSgpOworICAgICAgICAgICAgICAgIC8vIEFzc3VtZSBoZXJl IHRoYXQgY2xpcE5vZGUgaGFzIG9ubHkgY29vcmRpbmF0ZSBkYXRhLgorICAgICAgICAgICAgICAg IGNvbnN0IFFTR0dlb21ldHJ5OjpQb2ludDJEKiBnZW9tZXRyeVBvaW50cyA9IGdlb21ldHJ5LT52 ZXJ0ZXhEYXRhQXNQb2ludDJEKCk7CisKKyAgICAgICAgICAgICAgICAvLyBDbGlwIHJlZ2lvbiBz aG91bGQgYmUgYXQgbGVhc3QgdHJpYW5nbGUgdG8gbWFrZSB2YWxpZCBjbGlwLgorICAgICAgICAg ICAgICAgIGlmIChnZW9tZXRyeS0+dmVydGV4Q291bnQoKSA+IDIpIHsKKyAgICAgICAgICAgICAg ICAgICAgUVBvbHlnb25GIHBvbHlnb247CisKKyAgICAgICAgICAgICAgICAgICAgZm9yIChpbnQg aSA9IDA7IGkgPCBnZW9tZXRyeS0+dmVydGV4Q291bnQoKTsgaSsrKQorICAgICAgICAgICAgICAg ICAgICAgICAgcG9seWdvbi5hcHBlbmQoY2xpcE1hdHJpeC5tYXAoUVBvaW50KGdlb21ldHJ5UG9p bnRzW2ldLngsIGdlb21ldHJ5UG9pbnRzW2ldLnkpKSk7CisgICAgICAgICAgICAgICAgICAgIGN1 cnJlbnRDbGlwID0gcG9seWdvbi5ib3VuZGluZ1JlY3QoKTsKKyAgICAgICAgICAgICAgICB9Cisg ICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGlmICghY3VycmVudENsaXAuaXNFbXB0eSgpKSB7 CisgICAgICAgICAgICAgICAgaWYgKHJlc3VsdFJlY3QuaXNWYWxpZCgpKQorICAgICAgICAgICAg ICAgICAgICByZXN1bHRSZWN0ICY9IGN1cnJlbnRDbGlwOworICAgICAgICAgICAgICAgIGVsc2UK KyAgICAgICAgICAgICAgICAgICAgcmVzdWx0UmVjdCA9IGN1cnJlbnRDbGlwOworICAgICAgICAg ICAgfQorCisgICAgICAgIH0KKworICAgICAgICByZXR1cm4gcmVzdWx0UmVjdDsKKyAgICB9CisK ICAgICBRUXVpY2tXZWJQYWdlUHJpdmF0ZSogbV9wYWdlUHJpdmF0ZTsKIH07CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZV9wX3AuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZV9wX3AuaAppbmRl eCBmYTdkNjhjLi5iMjgxNzQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3FxdWlja3dlYnBhZ2VfcF9wLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC9xcXVpY2t3ZWJwYWdlX3BfcC5oCkBAIC00MSw3ICs0MSw3IEBAIHB1YmxpYzoKIAog ICAgIHZvaWQgdXBkYXRlU2l6ZSgpOwogCi0gICAgdm9pZCBwYWludFRvQ3VycmVudEdMQ29udGV4 dChjb25zdCBRVHJhbnNmb3JtJiwgZmxvYXQgb3BhY2l0eSk7CisgICAgdm9pZCBwYWludFRvQ3Vy cmVudEdMQ29udGV4dChjb25zdCBRVHJhbnNmb3JtJiwgZmxvYXQgb3BhY2l0eSwgY29uc3QgUVJl Y3RGJiBjbGlwUmVjdCk7CiAgICAgdm9pZCBwYWludChRUGFpbnRlciopOwogICAgIHZvaWQgcmVz ZXRQYWludE5vZGUoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQv cXF1aWNrd2Vidmlldy5jcHAKaW5kZXggZjAxY2UwMi4uZGE3YjdiZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCkBAIC0xMTI3LDYg KzExMjcsNyBAQCBRUXVpY2tXZWJWaWV3OjpRUXVpY2tXZWJWaWV3KFdLQ29udGV4dFJlZiBjb250 ZXh0UmVmLCBXS1BhZ2VHcm91cFJlZiBwYWdlR3JvdXBSZQogewogICAgIFFfRChRUXVpY2tXZWJW aWV3KTsKICAgICBkLT5pbml0aWFsaXplKGNvbnRleHRSZWYsIHBhZ2VHcm91cFJlZik7CisgICAg c2V0Q2xpcCh0cnVlKTsKIH0KIAogUVF1aWNrV2ViVmlldzo6flFRdWlja1dlYlZpZXcoKQo= 131122 2012-03-09 15:12:06 -0800 2012-03-09 20:50:35 -0800 Patch for commit. clipping_rect_fix_04.diff text/plain 5620 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzM2ZhZTgwLi4yNjcwNTI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTItMDMtMDkgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPG9zdGFwZW5rby52aWF0Y2hl c2xhdkBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XSBbV0syXSBTaG91bGRuJ3QgdXNlIGl0ZW0g Zm9yIGNsaXBwaW5nIHJlY3QgY2FsY3VsYXRpb24gaW4gcGFpbnQgbm9kZS4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwNzE0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTm9hbSBSb3NlbnRoYWwuCisKKyAgICAgICAgUmVwbGFjZSBpdGVtIGJhc2VkIGNs aXAtcmVjdCBjYWxjdWxhdGlvbiB3aXRoIGNsaXBwaW5nLW5vZGVzIGJhc2VkIGNhbGN1bGF0aW9u LgorICAgICAgICBUaGlzIGlzIHJlcXVpcmVkIGZvciB0aHJlYWRlZCByZW5kZXJpbmcsIHNpbmNl IHdlIGRvbid0IGhhdmUgYWNjZXNzIHRvIHRoZSBRU0dJdGVtcworICAgICAgICBmcm9tIHRoZSBy ZW5kZXIgdGhyZWFkLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdl LmNwcDoKKyAgICAgICAgKFFRdWlja1dlYlBhZ2U6OlFRdWlja1dlYlBhZ2UpOgorICAgICAgICAo UVF1aWNrV2ViUGFnZVByaXZhdGU6OnBhaW50VG9DdXJyZW50R0xDb250ZXh0KToKKyAgICAgICAg KFBhZ2VQcm94eU5vZGU6OnJlbmRlcik6CisgICAgICAgIChQYWdlUHJveHlOb2RlOjpjbGlwUmVj dCk6CisgICAgICAgIChQYWdlUHJveHlOb2RlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0 L3FxdWlja3dlYnBhZ2VfcF9wLmg6CisgICAgICAgIChRUXVpY2tXZWJQYWdlUHJpdmF0ZSk6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKFFR dWlja1dlYlZpZXc6OlFRdWlja1dlYlZpZXcpOgorCiAyMDEyLTAzLTA3ICBLZW5uZXRoIFJvaGRl IENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBQaW5jaCB6b29t IGFjdHMgd2VpcmRseSBvbiBueXRpbWVzLmNvbSB3aGlsZSBsb2FkaW5nCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2UuY3BwIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlLmNwcAppbmRleCBkNThmZWZl Li4wZTQ1MTliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Fx dWlja3dlYnBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1 aWNrd2VicGFnZS5jcHAKQEAgLTI2LDYgKzI2LDcgQEAKICNpbmNsdWRlICJUcmFuc2Zvcm1hdGlv bk1hdHJpeC5oIgogI2luY2x1ZGUgInFxdWlja3dlYnBhZ2VfcF9wLmgiCiAjaW5jbHVkZSAicXF1 aWNrd2Vidmlld19wLmgiCisjaW5jbHVkZSA8UVBvbHlnb25GPgogI2luY2x1ZGUgPFF0UXVpY2sv UVF1aWNrQ2FudmFzPgogI2luY2x1ZGUgPFF0UXVpY2svUVNHR2VvbWV0cnlOb2RlPgogI2luY2x1 ZGUgPFF0UXVpY2svUVNHTWF0ZXJpYWw+CkBAIC0zNiw2ICszNyw3IEBAIFFRdWlja1dlYlBhZ2U6 OlFRdWlja1dlYlBhZ2UoUVF1aWNrV2ViVmlldyogdmlld3BvcnRJdGVtKQogICAgICwgZChuZXcg UVF1aWNrV2ViUGFnZVByaXZhdGUodGhpcywgdmlld3BvcnRJdGVtKSkKIHsKICAgICBzZXRGbGFn KEl0ZW1IYXNDb250ZW50cyk7CisgICAgc2V0Q2xpcCh0cnVlKTsKIAogICAgIC8vIFdlIGRvIHRo ZSB0cmFuc2Zvcm0gZnJvbSB0aGUgdG9wIGxlZnQgc28gdGhlIHZpZXdwb3J0IGNhbiBhc3N1bWUg dGhlIHBvc2l0aW9uIDAsIDAKICAgICAvLyBpcyBhbHdheXMgd2hlcmUgcmVuZGVyaW5nIHN0YXJ0 cy4KQEAgLTc3LDEzICs3OSwxMSBAQCB2b2lkIFFRdWlja1dlYlBhZ2VQcml2YXRlOjpwYWludChR UGFpbnRlciogcGFpbnRlcikKICAgICAgICAgd2ViUGFnZVByb3h5LT5kcmF3aW5nQXJlYSgpLT5w YWludExheWVyVHJlZShwYWludGVyKTsKIH0KIAotdm9pZCBRUXVpY2tXZWJQYWdlUHJpdmF0ZTo6 cGFpbnRUb0N1cnJlbnRHTENvbnRleHQoY29uc3QgUVRyYW5zZm9ybSYgdHJhbnNmb3JtLCBmbG9h dCBvcGFjaXR5KQordm9pZCBRUXVpY2tXZWJQYWdlUHJpdmF0ZTo6cGFpbnRUb0N1cnJlbnRHTENv bnRleHQoY29uc3QgUVRyYW5zZm9ybSYgdHJhbnNmb3JtLCBmbG9hdCBvcGFjaXR5LCBjb25zdCBR UmVjdEYmIGNsaXBSZWN0KQogewogICAgIGlmICghcS0+aXNWaXNpYmxlKCkpCiAgICAgICAgIHJl dHVybjsKIAotICAgIFFSZWN0RiBjbGlwUmVjdCA9IHZpZXdwb3J0SXRlbS0+bWFwUmVjdFRvU2Nl bmUodmlld3BvcnRJdGVtLT5ib3VuZGluZ1JlY3QoKSk7Ci0KICAgICBpZiAoIWNsaXBSZWN0Lmlz VmFsaWQoKSkKICAgICAgICAgcmV0dXJuOwogCkBAIC0xMTAsNyArMTEwLDkgQEAgc3RydWN0IFBh Z2VQcm94eU5vZGUgOiBwdWJsaWMgUVNHUmVuZGVyTm9kZSB7CiAgICAgICAgIGlmICghbV9wYWdl UHJpdmF0ZSkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgUVRyYW5zZm9ybSB0cmFuc2Zv cm0gPSBtYXRyaXgoKSA/IG1hdHJpeCgpLT50b1RyYW5zZm9ybSgpIDogUVRyYW5zZm9ybSgpOwot ICAgICAgICBtX3BhZ2VQcml2YXRlLT5wYWludFRvQ3VycmVudEdMQ29udGV4dCh0cmFuc2Zvcm0s IGluaGVyaXRlZE9wYWNpdHkoKSk7CisKKyAgICAgICAgLy8gRklYTUU6IFN1cHBvcnQgbm9uLXJl Y3Rhbmd1bGFyIGNsaXBwaW5ncy4KKyAgICAgICAgbV9wYWdlUHJpdmF0ZS0+cGFpbnRUb0N1cnJl bnRHTENvbnRleHQodHJhbnNmb3JtLCBpbmhlcml0ZWRPcGFjaXR5KCksIGNsaXBSZWN0KCkpOwog ICAgIH0KIAogICAgIH5QYWdlUHJveHlOb2RlKCkKQEAgLTExOSw2ICsxMjEsNDcgQEAgc3RydWN0 IFBhZ2VQcm94eU5vZGUgOiBwdWJsaWMgUVNHUmVuZGVyTm9kZSB7CiAgICAgICAgICAgICBtX3Bh Z2VQcml2YXRlLT5yZXNldFBhaW50Tm9kZSgpOwogICAgIH0KIAorICAgIFFSZWN0RiBjbGlwUmVj dCgpIGNvbnN0CisgICAgeworICAgICAgICAvLyBTdGFydCB3aXRoIGFuIGludmFsaWQgcmVjdC4K KyAgICAgICAgUVJlY3RGIHJlc3VsdFJlY3QoMCwgMCwgLTEsIC0xKTsKKworICAgICAgICBmb3Ig KGNvbnN0IFFTR0NsaXBOb2RlKiBjbGlwID0gY2xpcExpc3QoKTsgY2xpcDsgY2xpcCA9IGNsaXAt PmNsaXBMaXN0KCkpIHsKKyAgICAgICAgICAgIFFNYXRyaXg0eDQgY2xpcE1hdHJpeDsKKyAgICAg ICAgICAgIGlmIChjbGlwLT5tYXRyaXgoKSkKKyAgICAgICAgICAgICAgICBjbGlwTWF0cml4ID0g KmNsaXAtPm1hdHJpeCgpOworICAgICAgICAgICAgUVJlY3RGIGN1cnJlbnRDbGlwOworCisgICAg ICAgICAgICBpZiAoY2xpcC0+aXNSZWN0YW5ndWxhcigpKQorICAgICAgICAgICAgICAgIGN1cnJl bnRDbGlwID0gY2xpcE1hdHJpeC5tYXBSZWN0KGNsaXAtPmNsaXBSZWN0KCkpOworICAgICAgICAg ICAgZWxzZSB7CisgICAgICAgICAgICAgICAgY29uc3QgUVNHR2VvbWV0cnkqIGdlb21ldHJ5ID0g Y2xpcC0+Z2VvbWV0cnkoKTsKKyAgICAgICAgICAgICAgICAvLyBBc3N1bWUgaGVyZSB0aGF0IGNs aXBOb2RlIGhhcyBvbmx5IGNvb3JkaW5hdGUgZGF0YS4KKyAgICAgICAgICAgICAgICBjb25zdCBR U0dHZW9tZXRyeTo6UG9pbnQyRCogZ2VvbWV0cnlQb2ludHMgPSBnZW9tZXRyeS0+dmVydGV4RGF0 YUFzUG9pbnQyRCgpOworCisgICAgICAgICAgICAgICAgLy8gQ2xpcCByZWdpb24gc2hvdWxkIGJl IGF0IGxlYXN0IHRyaWFuZ2xlIHRvIG1ha2UgdmFsaWQgY2xpcC4KKyAgICAgICAgICAgICAgICBp ZiAoZ2VvbWV0cnktPnZlcnRleENvdW50KCkgPCAzKQorICAgICAgICAgICAgICAgICAgICBjb250 aW51ZTsKKworICAgICAgICAgICAgICAgIFFQb2x5Z29uRiBwb2x5Z29uOworCisgICAgICAgICAg ICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBnZW9tZXRyeS0+dmVydGV4Q291bnQoKTsgaSsrKQor ICAgICAgICAgICAgICAgICAgICBwb2x5Z29uLmFwcGVuZChjbGlwTWF0cml4Lm1hcChRUG9pbnQo Z2VvbWV0cnlQb2ludHNbaV0ueCwgZ2VvbWV0cnlQb2ludHNbaV0ueSkpKTsKKyAgICAgICAgICAg ICAgICBjdXJyZW50Q2xpcCA9IHBvbHlnb24uYm91bmRpbmdSZWN0KCk7CisgICAgICAgICAgICB9 CisKKyAgICAgICAgICAgIGlmIChjdXJyZW50Q2xpcC5pc0VtcHR5KCkpCisgICAgICAgICAgICAg ICAgY29udGludWU7CisKKyAgICAgICAgICAgIGlmIChyZXN1bHRSZWN0LmlzVmFsaWQoKSkKKyAg ICAgICAgICAgICAgICByZXN1bHRSZWN0ICY9IGN1cnJlbnRDbGlwOworICAgICAgICAgICAgZWxz ZQorICAgICAgICAgICAgICAgIHJlc3VsdFJlY3QgPSBjdXJyZW50Q2xpcDsKKyAgICAgICAgfQor CisgICAgICAgIHJldHVybiByZXN1bHRSZWN0OworICAgIH0KKwogICAgIFFRdWlja1dlYlBhZ2VQ cml2YXRlKiBtX3BhZ2VQcml2YXRlOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlX3BfcC5oIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlX3BfcC5oCmluZGV4IGZhN2Q2OGMuLmIyODE3NDEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFn ZV9wX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBh Z2VfcF9wLmgKQEAgLTQxLDcgKzQxLDcgQEAgcHVibGljOgogCiAgICAgdm9pZCB1cGRhdGVTaXpl KCk7CiAKLSAgICB2b2lkIHBhaW50VG9DdXJyZW50R0xDb250ZXh0KGNvbnN0IFFUcmFuc2Zvcm0m LCBmbG9hdCBvcGFjaXR5KTsKKyAgICB2b2lkIHBhaW50VG9DdXJyZW50R0xDb250ZXh0KGNvbnN0 IFFUcmFuc2Zvcm0mLCBmbG9hdCBvcGFjaXR5LCBjb25zdCBRUmVjdEYmIGNsaXBSZWN0KTsKICAg ICB2b2lkIHBhaW50KFFQYWludGVyKik7CiAgICAgdm9pZCByZXNldFBhaW50Tm9kZSgpOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcu Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcApp bmRleCBmMDFjZTAyLi5kYTdiN2JkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKQEAgLTExMjcsNiArMTEyNyw3IEBAIFFRdWlja1dl YlZpZXc6OlFRdWlja1dlYlZpZXcoV0tDb250ZXh0UmVmIGNvbnRleHRSZWYsIFdLUGFnZUdyb3Vw UmVmIHBhZ2VHcm91cFJlCiB7CiAgICAgUV9EKFFRdWlja1dlYlZpZXcpOwogICAgIGQtPmluaXRp YWxpemUoY29udGV4dFJlZiwgcGFnZUdyb3VwUmVmKTsKKyAgICBzZXRDbGlwKHRydWUpOwogfQog CiBRUXVpY2tXZWJWaWV3Ojp+UVF1aWNrV2ViVmlldygpCg==