26352 2009-06-12 12:44:56 -0700 Remove void QWebFrame::renderContents(...) 2009-07-25 14:34:03 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 apedralho webkit-unassigned abarth kenneth manyoso tonikitoo oldest_to_newest 125510 0 apedralho 2009-06-12 12:44:56 -0700 Remove method void QWebFrame::renderContents(...) as decided during the API review. 125513 1 31208 apedralho 2009-06-12 12:48:45 -0700 Created attachment 31208 Removing QWebFrame::renderContents and adding Q_PROPERTY(bool clipRenderToViewport). 125941 2 manyoso 2009-06-15 08:04:21 -0700 The qdoc should be changed to reflect the new property and make sure to explicitly say that the property modifies the behavior of the 'render' method. 125944 3 tonikitoo 2009-06-15 08:20:38 -0700 pedralho, as per ariya's comment on IRC, please add tests , probably in qwebframe. 126090 4 eric 2009-06-15 17:23:41 -0700 I'm confused. This patch is r+, but there are two requests in the comments above. The submitter is not a committer, so they have no way to correct them when landing. Shouldn't this patch be r-'d asking for a patch with the above noted corrections? 127015 5 31208 apedralho 2009-06-19 13:21:20 -0700 Comment on attachment 31208 Removing QWebFrame::renderContents and adding Q_PROPERTY(bool clipRenderToViewport). Set patch r- as per previous comments. 131781 6 manyoso 2009-07-14 18:17:46 -0700 Are you still working on this? 134186 7 kenneth 2009-07-23 12:00:29 -0700 Pedralho just confirmed to me that he is indeed still working on this bug 134522 8 33431 apedralho 2009-07-24 05:43:41 -0700 Created attachment 33431 Added tests and qdoc headers. Patch updated according to the suggestions. 134525 9 33431 manyoso 2009-07-24 06:14:07 -0700 Comment on attachment 33431 Added tests and qdoc headers. > +void tst_QWebFrame::render() > +{ > + QString html("<html>" \ > + "<head><style>" \ > + "body, iframe { margin: 0px; border: none; }" \ > + "</style></head>" \ > + "<body><iframe width='100px' height='100px'/></body>" \ > + "</html>"); > + > + QWebPage page; > + page.mainFrame()->setHtml(html); > + > + QList<QWebFrame*> frames = page.mainFrame()->childFrames(); > + QWebFrame *frame = frames.at(0); > + QString innerHtml("<body style='margin: 0px;'><img src='qrc:/image.png'/></body>"); > + frame->setHtml(innerHtml); > + > + QPicture picture; > + > + // render clipping to Viewport > + frame->setClipRenderToViewport(true); > + QPainter painter1(&picture); > + frame->render(&painter1); > + painter1.end(); > + > + QSize size = page.mainFrame()->contentsSize(); > + page.setViewportSize(size); > + QCOMPARE(size.width(), image.boundingRect().width()); // 100px > + QCOMPARE(size.height(), image.boundingRect().height()); // 100px Where is this 'image' variable at? Do you mean 'picture' here? Will this fail to compile? 134533 10 33431 manyoso 2009-07-24 07:00:39 -0700 Comment on attachment 33431 Added tests and qdoc headers. > +void tst_QWebFrame::render() > +{ > + QString html("<html>" \ > + "<head><style>" \ > + "body, iframe { margin: 0px; border: none; }" \ > + "</style></head>" \ > + "<body><iframe width='100px' height='100px'/></body>" \ > + "</html>"); > + > + QWebPage page; > + page.mainFrame()->setHtml(html); > + > + QList<QWebFrame*> frames = page.mainFrame()->childFrames(); > + QWebFrame *frame = frames.at(0); > + QString innerHtml("<body style='margin: 0px;'><img src='qrc:/image.png'/></body>"); > + frame->setHtml(innerHtml); > + > + QPicture picture; > + > + // render clipping to Viewport > + frame->setClipRenderToViewport(true); > + QPainter painter1(&picture); > + frame->render(&painter1); > + painter1.end(); > + > + QSize size = page.mainFrame()->contentsSize(); > + page.setViewportSize(size); > + QCOMPARE(size.width(), image.boundingRect().width()); // 100px > + QCOMPARE(size.height(), image.boundingRect().height()); // 100px Where is this 'image' variable at? Do you mean 'picture' here? Will this fail to compile? 134535 11 33437 apedralho 2009-07-24 07:02:53 -0700 Created attachment 33437 Fixed variable name and update ToT. 134537 12 tonikitoo 2009-07-24 07:09:29 -0700 @pedralho, in render method header (in qwebframe.cpp), i'd add a "\sa clipRenderToViewport , setClipRenderToViewport" ... and it would go the the docs that both functions are related 134540 13 apedralho 2009-07-24 07:13:03 -0700 (In reply to comment #12) > @pedralho, in render method header (in qwebframe.cpp), i'd add a "\sa > clipRenderToViewport , setClipRenderToViewport" ... and it would go the the > docs that both functions are related Actually, there are some docs that can be updated accordingly, including the one in QWebPage titled "Using QWebPage in a Widget-less Environment". Should I do it, or there is a specific person to update that documents? 134542 14 33437 manyoso 2009-07-24 07:17:45 -0700 Comment on attachment 33437 Fixed variable name and update ToT. Looks good. 134768 15 abarth 2009-07-25 14:34:03 -0700 This appears to have already landed. 31208 2009-06-12 12:48:45 -0700 2009-07-24 05:43:41 -0700 Removing QWebFrame::renderContents and adding Q_PROPERTY(bool clipRenderToViewport). remove_renderContent.diff text/plain 5373 apedralho Y29tbWl0IDNjM2ZjMDIzOGUxMTQ3MTFmZmRlMWU4NGMzNzJhYzFkOGZmYWQ4NzUKQXV0aG9yOiBB bmRyZSBQZWRyYWxobyA8YW5kcmUucGVkcmFsaG9Ab3BlbmJvc3NhLm9yZz4KRGF0ZTogICBUaHUg SnVuIDExIDE2OjQ1OjAzIDIwMDkgLTA0MDAKCiAgICAyMDA5LTA2LTExICBBbmRyZSBQZWRyYWxo byAgPGFuZHJlLnBlZHJhbGhvQG9wZW5ib3NzYS5vcmc+CiAgICAKICAgICAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAgICAKICAgICAgICAgICAgUmVtb3ZlZCB2b2lkIFFXZWJG cmFtZTo6cmVuZGVyQ29udGVudHMoLi4uKSBhbmQgYWRkZWQgdGhlIFFfUFJPUEVSVFkKICAgICAg ICAgICAgY2xpcFJlbmRlclRvVmlld3BvcnQgdG8gY29udHJvbCB3aGV0aGVyIFFXZWJGcmFtZTo6 cmVuZGVyIHdvdWxkIGNhbGwKICAgICAgICAgICAgRnJhbWVWaWV3OjpwYWludENvbnRlbnRzIHJh dGhlciB0aGFuIEZyYW1lVmlldzo6cGFpbnQuCiAgICAKICAgICAgICAgICAgKiBBcGkvcXdlYmZy YW1lLmNwcDoKICAgICAgICAgICAgKFFXZWJGcmFtZVByaXZhdGU6OnJlbmRlclByaXZhdGUpOgog ICAgICAgICAgICAoUVdlYkZyYW1lOjpjbGlwUmVuZGVyVG9WaWV3cG9ydCk6CiAgICAgICAgICAg IChRV2ViRnJhbWU6OnNldENsaXBSZW5kZXJUb1ZpZXdwb3J0KToKICAgICAgICAgICAgKiBBcGkv cXdlYmZyYW1lLmg6CiAgICAgICAgICAgICogQXBpL3F3ZWJmcmFtZV9wLmg6CiAgICAgICAgICAg IChRV2ViRnJhbWVQcml2YXRlOjpRV2ViRnJhbWVQcml2YXRlKToKCmRpZmYgLS1naXQgYS9XZWJL aXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKaW5k ZXggYzEwYzkxYy4uYWJiNWI1NiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUu Y3BwCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcApAQCAtMjA1LDcgKzIwNSw3IEBA IFdlYkNvcmU6OlNjcm9sbGJhciogUVdlYkZyYW1lUHJpdmF0ZTo6dmVydGljYWxTY3JvbGxCYXIo KSBjb25zdAogICAgIHJldHVybiBmcmFtZS0+dmlldygpLT52ZXJ0aWNhbFNjcm9sbGJhcigpOwog fQogCi12b2lkIFFXZWJGcmFtZVByaXZhdGU6OnJlbmRlclByaXZhdGUoUVBhaW50ZXIgKnBhaW50 ZXIsIGNvbnN0IFFSZWdpb24gJmNsaXAsIGJvb2wgY29udGVudHMpCit2b2lkIFFXZWJGcmFtZVBy aXZhdGU6OnJlbmRlclByaXZhdGUoUVBhaW50ZXIgKnBhaW50ZXIsIGNvbnN0IFFSZWdpb24gJmNs aXApCiB7CiAgICAgaWYgKCFmcmFtZS0+dmlldygpIHx8ICFmcmFtZS0+Y29udGVudFJlbmRlcmVy KCkpCiAgICAgICAgIHJldHVybjsKQEAgLTIxOSw3ICsyMTksNyBAQCB2b2lkIFFXZWJGcmFtZVBy aXZhdGU6OnJlbmRlclByaXZhdGUoUVBhaW50ZXIgKnBhaW50ZXIsIGNvbnN0IFFSZWdpb24gJmNs aXAsIGJvbwogCiAgICAgR3JhcGhpY3NDb250ZXh0IGNvbnRleHQocGFpbnRlcik7CiAKLSAgICBp ZiAoIWNvbnRlbnRzKQorICAgIGlmIChjbGlwUmVuZGVyVG9WaWV3cG9ydCkKICAgICAgICAgdmll dy0+cGFpbnQoJmNvbnRleHQsIHZlY3Rvci5maXJzdCgpKTsKICAgICBlbHNlCiAgICAgICAgIHZp ZXctPnBhaW50Q29udGVudHMoJmNvbnRleHQsIHZlY3Rvci5maXJzdCgpKTsKQEAgLTIyOCw3ICsy MjgsNyBAQCB2b2lkIFFXZWJGcmFtZVByaXZhdGU6OnJlbmRlclByaXZhdGUoUVBhaW50ZXIgKnBh aW50ZXIsIGNvbnN0IFFSZWdpb24gJmNsaXAsIGJvbwogICAgICAgICBjb25zdCBRUmVjdCYgY2xp cFJlY3QgPSB2ZWN0b3IuYXQoaSk7CiAgICAgICAgIHBhaW50ZXItPnNhdmUoKTsKICAgICAgICAg cGFpbnRlci0+c2V0Q2xpcFJlY3QoY2xpcFJlY3QsIFF0OjpJbnRlcnNlY3RDbGlwKTsKLSAgICAg ICAgaWYgKCFjb250ZW50cykKKyAgICAgICAgaWYgKGNsaXBSZW5kZXJUb1ZpZXdwb3J0KQogICAg ICAgICAgICAgdmlldy0+cGFpbnQoJmNvbnRleHQsIGNsaXBSZWN0KTsKICAgICAgICAgZWxzZQog ICAgICAgICAgICAgdmlldy0+cGFpbnRDb250ZW50cygmY29udGV4dCwgY2xpcFJlY3QpOwpAQCAt ODgxLDkgKzg4MSwxNSBAQCB2b2lkIFFXZWJGcmFtZTo6cmVuZGVyKFFQYWludGVyICpwYWludGVy KQogICBcc2luY2UgNC42CiAgIFJlbmRlciB0aGUgZnJhbWUncyBcYSBjb250ZW50cyBpbnRvIFxh IHBhaW50ZXIgd2hpbGUgY2xpcHBpbmcgdG8gXGEgY29udGVudHMuCiAqLwotdm9pZCBRV2ViRnJh bWU6OnJlbmRlckNvbnRlbnRzKFFQYWludGVyICpwYWludGVyLCBjb25zdCBRUmVnaW9uICZjb250 ZW50cykKKyovCitib29sIFFXZWJGcmFtZTo6Y2xpcFJlbmRlclRvVmlld3BvcnQoKSBjb25zdAor eworICAgIHJldHVybiBkLT5jbGlwUmVuZGVyVG9WaWV3cG9ydDsKK30KKwordm9pZCBRV2ViRnJh bWU6OnNldENsaXBSZW5kZXJUb1ZpZXdwb3J0KGJvb2wgY2xpcFJlbmRlclRvVmlld3BvcnQpCiB7 Ci0gICAgZC0+cmVuZGVyUHJpdmF0ZShwYWludGVyLCBjb250ZW50cywgdHJ1ZSk7CisgICAgZC0+ Y2xpcFJlbmRlclRvVmlld3BvcnQgPSBjbGlwUmVuZGVyVG9WaWV3cG9ydDsKIH0KIAogLyohCmRp ZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oIGIvV2ViS2l0L3F0L0FwaS9xd2Vi ZnJhbWUuaAppbmRleCA1NzUwM2NlLi42MTI1ZTlmIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBp L3F3ZWJmcmFtZS5oCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmgKQEAgLTExNCw2ICsx MTQsNyBAQCBjbGFzcyBRV0VCS0lUX0VYUE9SVCBRV2ViRnJhbWUgOiBwdWJsaWMgUU9iamVjdAog ICAgIFFfUFJPUEVSVFkoUUljb24gaWNvbiBSRUFEIGljb24pCiAgICAgUV9QUk9QRVJUWShRU2l6 ZSBjb250ZW50c1NpemUgUkVBRCBjb250ZW50c1NpemUpCiAgICAgUV9QUk9QRVJUWShRUG9pbnQg c2Nyb2xsUG9zaXRpb24gUkVBRCBzY3JvbGxQb3NpdGlvbiBXUklURSBzZXRTY3JvbGxQb3NpdGlv bikKKyAgICBRX1BST1BFUlRZKGJvb2wgY2xpcFJlbmRlclRvVmlld3BvcnQgUkVBRCBjbGlwUmVu ZGVyVG9WaWV3cG9ydCBXUklURSBzZXRDbGlwUmVuZGVyVG9WaWV3cG9ydCkKIHByaXZhdGU6CiAg ICAgUVdlYkZyYW1lKFFXZWJQYWdlICpwYXJlbnQsIFFXZWJGcmFtZURhdGEgKmZyYW1lRGF0YSk7 CiAgICAgUVdlYkZyYW1lKFFXZWJGcmFtZSAqcGFyZW50LCBRV2ViRnJhbWVEYXRhICpmcmFtZURh dGEpOwpAQCAtMTY1LDcgKzE2Niw4IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgcmVuZGVyKFFQYWlu dGVyICpwYWludGVyLCBjb25zdCBRUmVnaW9uICZjbGlwKTsKICAgICB2b2lkIHJlbmRlcihRUGFp bnRlciAqcGFpbnRlcik7Ci0gICAgdm9pZCByZW5kZXJDb250ZW50cyhRUGFpbnRlciAqcGFpbnRl ciwgY29uc3QgUVJlZ2lvbiAmY29udGVudHMpOworICAgIGJvb2wgY2xpcFJlbmRlclRvVmlld3Bv cnQoKSBjb25zdDsKKyAgICB2b2lkIHNldENsaXBSZW5kZXJUb1ZpZXdwb3J0KGJvb2wgY2xpcFJl bmRlclRvVmlld3BvcnQpOwogCiAgICAgdm9pZCBzZXRUZXh0U2l6ZU11bHRpcGxpZXIocXJlYWwg ZmFjdG9yKTsKICAgICBxcmVhbCB0ZXh0U2l6ZU11bHRpcGxpZXIoKSBjb25zdDsKZGlmZiAtLWdp dCBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lX3AuaCBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1l X3AuaAppbmRleCAwYzdkYTkwLi4yZDg2M2U2IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3 ZWJmcmFtZV9wLmgKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWVfcC5oCkBAIC02Niw2ICs2 Niw3IEBAIHB1YmxpYzoKICAgICAgICAgLCBhbGxvd3NTY3JvbGxpbmcodHJ1ZSkKICAgICAgICAg LCBtYXJnaW5XaWR0aCgtMSkKICAgICAgICAgLCBtYXJnaW5IZWlnaHQoLTEpCisgICAgICAgICwg Y2xpcFJlbmRlclRvVmlld3BvcnQodHJ1ZSkKICAgICAgICAge30KICAgICB2b2lkIGluaXQoUVdl YkZyYW1lICpxZnJhbWUsIFdlYkNvcmU6OlBhZ2UgKnBhZ2UsCiAgICAgICAgICAgICAgIFFXZWJG cmFtZURhdGEgKmZyYW1lRGF0YSk7CkBAIC04MSw3ICs4Miw3IEBAIHB1YmxpYzoKICAgICBzdGF0 aWMgV2ViQ29yZTo6RnJhbWUqIGNvcmUoUVdlYkZyYW1lKik7CiAgICAgc3RhdGljIFFXZWJGcmFt ZSoga2l0KFdlYkNvcmU6OkZyYW1lKik7CiAKLSAgICB2b2lkIHJlbmRlclByaXZhdGUoUVBhaW50 ZXIgKnBhaW50ZXIsIGNvbnN0IFFSZWdpb24gJmNsaXAsIGJvb2wgY29udGVudHMgPSBmYWxzZSk7 CisgICAgdm9pZCByZW5kZXJQcml2YXRlKFFQYWludGVyICpwYWludGVyLCBjb25zdCBRUmVnaW9u ICZjbGlwKTsKIAogICAgIFFXZWJGcmFtZSAqcTsKICAgICBXZWJDb3JlOjpGcmFtZUxvYWRlckNs aWVudFF0ICpmcmFtZUxvYWRlckNsaWVudDsKQEAgLTkxLDYgKzkyLDcgQEAgcHVibGljOgogICAg IGJvb2wgYWxsb3dzU2Nyb2xsaW5nOwogICAgIGludCBtYXJnaW5XaWR0aDsKICAgICBpbnQgbWFy Z2luSGVpZ2h0OworICAgIGJvb2wgY2xpcFJlbmRlclRvVmlld3BvcnQ7CiB9OwogCiBjbGFzcyBR V2ViSGl0VGVzdFJlc3VsdFByaXZhdGUKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cg Yi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDA4ZGNlZmUuLmQ5MGFmM2QgMTAwNjQ0Ci0tLSBh L1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE5IEBACisyMDA5LTA2LTExICBBbmRyZSBQZWRyYWxobyAgPGFuZHJlLnBlZHJhbGhvQG9wZW5i b3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgUmVtb3ZlZCB2b2lkIFFXZWJGcmFtZTo6cmVuZGVyQ29udGVudHMoLi4uKSBhbmQgYWRkZWQg dGhlIFFfUFJPUEVSVFkKKyAgICAgICAgY2xpcFJlbmRlclRvVmlld3BvcnQgdG8gY29udHJvbCB3 aGV0aGVyIFFXZWJGcmFtZTo6cmVuZGVyIHdvdWxkIGNhbGwKKyAgICAgICAgRnJhbWVWaWV3Ojpw YWludENvbnRlbnRzIHJhdGhlciB0aGFuIEZyYW1lVmlldzo6cGFpbnQuCisKKyAgICAgICAgKiBB cGkvcXdlYmZyYW1lLmNwcDoKKyAgICAgICAgKFFXZWJGcmFtZVByaXZhdGU6OnJlbmRlclByaXZh dGUpOgorICAgICAgICAoUVdlYkZyYW1lOjpjbGlwUmVuZGVyVG9WaWV3cG9ydCk6CisgICAgICAg IChRV2ViRnJhbWU6OnNldENsaXBSZW5kZXJUb1ZpZXdwb3J0KToKKyAgICAgICAgKiBBcGkvcXdl YmZyYW1lLmg6CisgICAgICAgICogQXBpL3F3ZWJmcmFtZV9wLmg6CisgICAgICAgIChRV2ViRnJh bWVQcml2YXRlOjpRV2ViRnJhbWVQcml2YXRlKToKKwogMjAwOS0wNi0xMCAgQW50b25pbyBHb21l cyAgIDxhbnRvbmlvLmdvbWVzQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg QXJpeWEgSGlkYXlhdC4K 33431 2009-07-24 05:43:41 -0700 2009-07-24 07:02:53 -0700 Added tests and qdoc headers. remove_renderContent.diff text/plain 8040 apedralho Y29tbWl0IGU2ZWNmODYyNTAyZDc2MTMyMzg2OGI0OWM3ZGY0NjgzMzgyOWI2OWIKQXV0aG9yOiBB bmRyZSBQZWRyYWxobyA8YW5kcmUucGVkcmFsaG9Ab3BlbmJvc3NhLm9yZz4KRGF0ZTogICBGcmkg SnVsIDI0IDA4OjM4OjM2IDIwMDkgLTA0MDAKCiAgICAyMDA5LTA3LTI0ICBBbmRyZSBQZWRyYWxo byAgPGFuZHJlLnBlZHJhbGhvQG9wZW5ib3NzYS5vcmc+CiAgICAKICAgICAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAgICAKICAgICAgICAgICAgUmVtb3ZlZCB2b2lkIFFXZWJG cmFtZTo6cmVuZGVyQ29udGVudHMoLi4uKSBhbmQgYWRkZWQgdGhlIFFfUFJPUEVSVFkKICAgICAg ICAgICAgY2xpcFJlbmRlclRvVmlld3BvcnQgdG8gY29udHJvbCB3aGV0aGVyIFFXZWJGcmFtZTo6 cmVuZGVyIHdvdWxkIGNhbGwKICAgICAgICAgICAgRnJhbWVWaWV3OjpwYWludENvbnRlbnRzIHJh dGhlciB0aGFuIEZyYW1lVmlldzo6cGFpbnQgYW5kIGRvIG5vdCBjbGlwCiAgICAgICAgICAgIHRo ZSBmcmFtZSBjb250ZW50IHRvIHZpZXdwb3J0LgogICAgICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjYzNTIKICAgIAogICAgICAgICAgICAqIEFwaS9xd2Vi ZnJhbWUuY3BwOgogICAgICAgICAgICAoUVdlYkZyYW1lUHJpdmF0ZTo6cmVuZGVyUHJpdmF0ZSk6 CiAgICAgICAgICAgIChRV2ViRnJhbWU6OmNsaXBSZW5kZXJUb1ZpZXdwb3J0KToKICAgICAgICAg ICAgKFFXZWJGcmFtZTo6c2V0Q2xpcFJlbmRlclRvVmlld3BvcnQpOgogICAgICAgICAgICAqIEFw aS9xd2ViZnJhbWUuaDoKICAgICAgICAgICAgKiBBcGkvcXdlYmZyYW1lX3AuaDoKICAgICAgICAg ICAgKFFXZWJGcmFtZVByaXZhdGU6OlFXZWJGcmFtZVByaXZhdGUpOgogICAgICAgICAgICAqIHRl c3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcDoKCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQv QXBpL3F3ZWJmcmFtZS5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKaW5kZXggYWVh MjM4MC4uNDBlZGRiNSAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCisr KyBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcApAQCAtMjMyLDcgKzIzMiw3IEBAIFdlYkNv cmU6OlNjcm9sbGJhciogUVdlYkZyYW1lUHJpdmF0ZTo6dmVydGljYWxTY3JvbGxCYXIoKSBjb25z dAogICAgIHJldHVybiBmcmFtZS0+dmlldygpLT52ZXJ0aWNhbFNjcm9sbGJhcigpOwogfQogCi12 b2lkIFFXZWJGcmFtZVByaXZhdGU6OnJlbmRlclByaXZhdGUoUVBhaW50ZXIgKnBhaW50ZXIsIGNv bnN0IFFSZWdpb24gJmNsaXAsIGJvb2wgY29udGVudHMpCit2b2lkIFFXZWJGcmFtZVByaXZhdGU6 OnJlbmRlclByaXZhdGUoUVBhaW50ZXIgKnBhaW50ZXIsIGNvbnN0IFFSZWdpb24gJmNsaXApCiB7 CiAgICAgaWYgKCFmcmFtZS0+dmlldygpIHx8ICFmcmFtZS0+Y29udGVudFJlbmRlcmVyKCkpCiAg ICAgICAgIHJldHVybjsKQEAgLTI0Niw3ICsyNDYsNyBAQCB2b2lkIFFXZWJGcmFtZVByaXZhdGU6 OnJlbmRlclByaXZhdGUoUVBhaW50ZXIgKnBhaW50ZXIsIGNvbnN0IFFSZWdpb24gJmNsaXAsIGJv bwogCiAgICAgR3JhcGhpY3NDb250ZXh0IGNvbnRleHQocGFpbnRlcik7CiAKLSAgICBpZiAoIWNv bnRlbnRzKQorICAgIGlmIChjbGlwUmVuZGVyVG9WaWV3cG9ydCkKICAgICAgICAgdmlldy0+cGFp bnQoJmNvbnRleHQsIHZlY3Rvci5maXJzdCgpKTsKICAgICBlbHNlCiAgICAgICAgIHZpZXctPnBh aW50Q29udGVudHMoJmNvbnRleHQsIHZlY3Rvci5maXJzdCgpKTsKQEAgLTI1NSw3ICsyNTUsNyBA QCB2b2lkIFFXZWJGcmFtZVByaXZhdGU6OnJlbmRlclByaXZhdGUoUVBhaW50ZXIgKnBhaW50ZXIs IGNvbnN0IFFSZWdpb24gJmNsaXAsIGJvbwogICAgICAgICBjb25zdCBRUmVjdCYgY2xpcFJlY3Qg PSB2ZWN0b3IuYXQoaSk7CiAgICAgICAgIHBhaW50ZXItPnNhdmUoKTsKICAgICAgICAgcGFpbnRl ci0+c2V0Q2xpcFJlY3QoY2xpcFJlY3QsIFF0OjpJbnRlcnNlY3RDbGlwKTsKLSAgICAgICAgaWYg KCFjb250ZW50cykKKyAgICAgICAgaWYgKGNsaXBSZW5kZXJUb1ZpZXdwb3J0KQogICAgICAgICAg ICAgdmlldy0+cGFpbnQoJmNvbnRleHQsIGNsaXBSZWN0KTsKICAgICAgICAgZWxzZQogICAgICAg ICAgICAgdmlldy0+cGFpbnRDb250ZW50cygmY29udGV4dCwgY2xpcFJlY3QpOwpAQCAtOTIzLDEy ICs5MjMsMjMgQEAgdm9pZCBRV2ViRnJhbWU6OnJlbmRlcihRUGFpbnRlciAqcGFpbnRlcikKIH0K IAogLyohCi0gIFxzaW5jZSA0LjYKLSAgUmVuZGVyIHRoZSBmcmFtZSdzIFxhIGNvbnRlbnRzIGlu dG8gXGEgcGFpbnRlciB3aGlsZSBjbGlwcGluZyB0byBcYSBjb250ZW50cy4KKyAgICBcc2luY2Ug NC42CisgICAgXHByb3BlcnR5IFFXZWJGcmFtZTo6Y2xpcFJlbmRlclRvVmlld3BvcnQKKworICAg IFJldHVybnMgdHJ1ZSBpZiByZW5kZXIgd2lsbCBjbGlwIGNvbnRlbnQgdG8gdmlld3BvcnQ7IG90 aGVyd2lzZSByZXR1cm5zIGZhbHNlLgorKi8KK2Jvb2wgUVdlYkZyYW1lOjpjbGlwUmVuZGVyVG9W aWV3cG9ydCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIGQtPmNsaXBSZW5kZXJUb1ZpZXdwb3J0Owor fQorCisvKiEKKyAgICBcc2luY2UgNC42CisgICAgU2V0cyB3aGV0aGVyIHRoZSBjb250ZW50IG9m IGEgZnJhbWUgd2lsbCBiZSBjbGlwcGVkIHRvIHZpZXdwb3J0IHdoZW4gcmVuZGVyZWQuCiAqLwot dm9pZCBRV2ViRnJhbWU6OnJlbmRlckNvbnRlbnRzKFFQYWludGVyICpwYWludGVyLCBjb25zdCBR UmVnaW9uICZjb250ZW50cykKK3ZvaWQgUVdlYkZyYW1lOjpzZXRDbGlwUmVuZGVyVG9WaWV3cG9y dChib29sIGNsaXBSZW5kZXJUb1ZpZXdwb3J0KQogewotICAgIGQtPnJlbmRlclByaXZhdGUocGFp bnRlciwgY29udGVudHMsIHRydWUpOworICAgIGQtPmNsaXBSZW5kZXJUb1ZpZXdwb3J0ID0gY2xp cFJlbmRlclRvVmlld3BvcnQ7CiB9CiAKIC8qIQpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9x d2ViZnJhbWUuaCBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmgKaW5kZXggZjE0MGEyMS4uMTBh NzE0YSAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuaAorKysgYi9XZWJLaXQv cXQvQXBpL3F3ZWJmcmFtZS5oCkBAIC0xMTEsNiArMTExLDcgQEAgY2xhc3MgUVdFQktJVF9FWFBP UlQgUVdlYkZyYW1lIDogcHVibGljIFFPYmplY3QgewogICAgIFFfUFJPUEVSVFkoUUljb24gaWNv biBSRUFEIGljb24pCiAgICAgUV9QUk9QRVJUWShRU2l6ZSBjb250ZW50c1NpemUgUkVBRCBjb250 ZW50c1NpemUpCiAgICAgUV9QUk9QRVJUWShRUG9pbnQgc2Nyb2xsUG9zaXRpb24gUkVBRCBzY3Jv bGxQb3NpdGlvbiBXUklURSBzZXRTY3JvbGxQb3NpdGlvbikKKyAgICBRX1BST1BFUlRZKGJvb2wg Y2xpcFJlbmRlclRvVmlld3BvcnQgUkVBRCBjbGlwUmVuZGVyVG9WaWV3cG9ydCBXUklURSBzZXRD bGlwUmVuZGVyVG9WaWV3cG9ydCkKICAgICBRX1BST1BFUlRZKGJvb2wgZm9jdXMgUkVBRCBoYXNG b2N1cykKIHByaXZhdGU6CiAgICAgUVdlYkZyYW1lKFFXZWJQYWdlICpwYXJlbnQsIFFXZWJGcmFt ZURhdGEgKmZyYW1lRGF0YSk7CkBAIC0xNjQsNyArMTY1LDggQEAgcHVibGljOgogCiAgICAgdm9p ZCByZW5kZXIoUVBhaW50ZXIgKnBhaW50ZXIsIGNvbnN0IFFSZWdpb24gJmNsaXApOwogICAgIHZv aWQgcmVuZGVyKFFQYWludGVyICpwYWludGVyKTsKLSAgICB2b2lkIHJlbmRlckNvbnRlbnRzKFFQ YWludGVyICpwYWludGVyLCBjb25zdCBRUmVnaW9uICZjb250ZW50cyk7CisgICAgYm9vbCBjbGlw UmVuZGVyVG9WaWV3cG9ydCgpIGNvbnN0OworICAgIHZvaWQgc2V0Q2xpcFJlbmRlclRvVmlld3Bv cnQoYm9vbCBjbGlwUmVuZGVyVG9WaWV3cG9ydCk7CiAKICAgICB2b2lkIHNldFRleHRTaXplTXVs dGlwbGllcihxcmVhbCBmYWN0b3IpOwogICAgIHFyZWFsIHRleHRTaXplTXVsdGlwbGllcigpIGNv bnN0OwpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWVfcC5oIGIvV2ViS2l0L3F0 L0FwaS9xd2ViZnJhbWVfcC5oCmluZGV4IDI1NWQ2YmQuLmQ2YWZjMDEgMTAwNjQ0Ci0tLSBhL1dl YktpdC9xdC9BcGkvcXdlYmZyYW1lX3AuaAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZV9w LmgKQEAgLTcwLDYgKzcwLDcgQEAgcHVibGljOgogICAgICAgICAsIGFsbG93c1Njcm9sbGluZyh0 cnVlKQogICAgICAgICAsIG1hcmdpbldpZHRoKC0xKQogICAgICAgICAsIG1hcmdpbkhlaWdodCgt MSkKKyAgICAgICAgLCBjbGlwUmVuZGVyVG9WaWV3cG9ydCh0cnVlKQogICAgICAgICB7fQogICAg IHZvaWQgaW5pdChRV2ViRnJhbWUqIHFmcmFtZSwgUVdlYkZyYW1lRGF0YSogZnJhbWVEYXRhKTsK IApAQCAtODQsNyArODUsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFdlYkNvcmU6OkZyYW1lKiBj b3JlKFFXZWJGcmFtZSopOwogICAgIHN0YXRpYyBRV2ViRnJhbWUqIGtpdChXZWJDb3JlOjpGcmFt ZSopOwogCi0gICAgdm9pZCByZW5kZXJQcml2YXRlKFFQYWludGVyICpwYWludGVyLCBjb25zdCBR UmVnaW9uICZjbGlwLCBib29sIGNvbnRlbnRzID0gZmFsc2UpOworICAgIHZvaWQgcmVuZGVyUHJp dmF0ZShRUGFpbnRlciAqcGFpbnRlciwgY29uc3QgUVJlZ2lvbiAmY2xpcCk7CiAKICAgICBRV2Vi RnJhbWUgKnE7CiAgICAgV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRRdCAqZnJhbWVMb2FkZXJD bGllbnQ7CkBAIC05NCw2ICs5NSw3IEBAIHB1YmxpYzoKICAgICBib29sIGFsbG93c1Njcm9sbGlu ZzsKICAgICBpbnQgbWFyZ2luV2lkdGg7CiAgICAgaW50IG1hcmdpbkhlaWdodDsKKyAgICBib29s IGNsaXBSZW5kZXJUb1ZpZXdwb3J0OwogfTsKIAogY2xhc3MgUVdlYkhpdFRlc3RSZXN1bHRQcml2 YXRlIHsKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdl TG9nCmluZGV4IGU5YmNmY2UuLjVjZWQwMGYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDA5LTA3LTI0 ICBBbmRyZSBQZWRyYWxobyAgPGFuZHJlLnBlZHJhbGhvQG9wZW5ib3NzYS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlZCB2b2lkIFFX ZWJGcmFtZTo6cmVuZGVyQ29udGVudHMoLi4uKSBhbmQgYWRkZWQgdGhlIFFfUFJPUEVSVFkKKyAg ICAgICAgY2xpcFJlbmRlclRvVmlld3BvcnQgdG8gY29udHJvbCB3aGV0aGVyIFFXZWJGcmFtZTo6 cmVuZGVyIHdvdWxkIGNhbGwKKyAgICAgICAgRnJhbWVWaWV3OjpwYWludENvbnRlbnRzIHJhdGhl ciB0aGFuIEZyYW1lVmlldzo6cGFpbnQgYW5kIGRvIG5vdCBjbGlwCisgICAgICAgIHRoZSBmcmFt ZSBjb250ZW50IHRvIHZpZXdwb3J0LgorCisKKyAgICAgICAgKiBBcGkvcXdlYmZyYW1lLmNwcDoK KyAgICAgICAgKFFXZWJGcmFtZVByaXZhdGU6OnJlbmRlclByaXZhdGUpOgorICAgICAgICAoUVdl YkZyYW1lOjpjbGlwUmVuZGVyVG9WaWV3cG9ydCk6CisgICAgICAgIChRV2ViRnJhbWU6OnNldENs aXBSZW5kZXJUb1ZpZXdwb3J0KToKKyAgICAgICAgKiBBcGkvcXdlYmZyYW1lLmg6CisgICAgICAg ICogQXBpL3F3ZWJmcmFtZV9wLmg6CisgICAgICAgIChRV2ViRnJhbWVQcml2YXRlOjpRV2ViRnJh bWVQcml2YXRlKToKKyAgICAgICAgKiB0ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHA6 CisKIDIwMDktMDctMjQgIEFuZHJlaSBQb3Blc2N1ICA8YW5kcmVpcEBnb29nbGUuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEFuZGVycyBDYXJsc3Nvbi4KZGlmZiAtLWdpdCBhL1dlYktpdC9x dC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAgYi9XZWJLaXQvcXQvdGVzdHMvcXdl YmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCmluZGV4IGMwZTcyYmUuLjhjZjg4MzEgMTAwNjQ0Ci0t LSBhL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAKKysrIGIvV2Vi S2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcApAQCAtMjksNiArMjksNyBA QAogI2luY2x1ZGUgPFFBYnN0cmFjdEl0ZW1WaWV3PgogI2luY2x1ZGUgPFFBcHBsaWNhdGlvbj4K ICNpbmNsdWRlIDxRQ29tYm9Cb3g+CisjaW5jbHVkZSA8UVBpY3R1cmU+CiAjaW5jbHVkZSA8UVJl Z0V4cD4KICNpbmNsdWRlIDxRTmV0d29ya1JlcXVlc3Q+CiAvL1RFU1RFRF9DTEFTUz0KQEAgLTU4 NSw2ICs1ODYsNyBAQCBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgYmFzZVVybF9kYXRhKCk7CiAg ICAgdm9pZCBiYXNlVXJsKCk7CiAgICAgdm9pZCBoYXNTZXRGb2N1cygpOworICAgIHZvaWQgcmVu ZGVyKCk7CiAKIHByaXZhdGU6CiAgICAgUVN0cmluZyAgZXZhbEpTKGNvbnN0IFFTdHJpbmcmcykg ewpAQCAtMjQ3Myw1ICsyNDc1LDQ2IEBAIHZvaWQgdHN0X1FXZWJGcmFtZTo6aGFzU2V0Rm9jdXMo KQogICAgIFFWRVJJRlkobV9wYWdlLT5tYWluRnJhbWUoKS0+aGFzRm9jdXMoKSk7CiB9CiAKK3Zv aWQgdHN0X1FXZWJGcmFtZTo6cmVuZGVyKCkKK3sKKyAgICBRU3RyaW5nIGh0bWwoIjxodG1sPiIg XAorICAgICAgICAgICAgICAgICAgICAiPGhlYWQ+PHN0eWxlPiIgXAorICAgICAgICAgICAgICAg ICAgICAgICAiYm9keSwgaWZyYW1lIHsgbWFyZ2luOiAwcHg7IGJvcmRlcjogbm9uZTsgfSIgXAor ICAgICAgICAgICAgICAgICAgICAiPC9zdHlsZT48L2hlYWQ+IiBcCisgICAgICAgICAgICAgICAg ICAgICI8Ym9keT48aWZyYW1lIHdpZHRoPScxMDBweCcgaGVpZ2h0PScxMDBweCcvPjwvYm9keT4i IFwKKyAgICAgICAgICAgICAgICAgIjwvaHRtbD4iKTsKKworICAgIFFXZWJQYWdlIHBhZ2U7Cisg ICAgcGFnZS5tYWluRnJhbWUoKS0+c2V0SHRtbChodG1sKTsKKworICAgIFFMaXN0PFFXZWJGcmFt ZSo+IGZyYW1lcyA9IHBhZ2UubWFpbkZyYW1lKCktPmNoaWxkRnJhbWVzKCk7CisgICAgUVdlYkZy YW1lICpmcmFtZSA9IGZyYW1lcy5hdCgwKTsKKyAgICBRU3RyaW5nIGlubmVySHRtbCgiPGJvZHkg c3R5bGU9J21hcmdpbjogMHB4Oyc+PGltZyBzcmM9J3FyYzovaW1hZ2UucG5nJy8+PC9ib2R5PiIp OworICAgIGZyYW1lLT5zZXRIdG1sKGlubmVySHRtbCk7CisKKyAgICBRUGljdHVyZSBwaWN0dXJl OworCisgICAgLy8gcmVuZGVyIGNsaXBwaW5nIHRvIFZpZXdwb3J0CisgICAgZnJhbWUtPnNldENs aXBSZW5kZXJUb1ZpZXdwb3J0KHRydWUpOworICAgIFFQYWludGVyIHBhaW50ZXIxKCZwaWN0dXJl KTsKKyAgICBmcmFtZS0+cmVuZGVyKCZwYWludGVyMSk7CisgICAgcGFpbnRlcjEuZW5kKCk7CisK KyAgICBRU2l6ZSBzaXplID0gcGFnZS5tYWluRnJhbWUoKS0+Y29udGVudHNTaXplKCk7CisgICAg cGFnZS5zZXRWaWV3cG9ydFNpemUoc2l6ZSk7CisgICAgUUNPTVBBUkUoc2l6ZS53aWR0aCgpLCBp bWFnZS5ib3VuZGluZ1JlY3QoKS53aWR0aCgpKTsgICAvLyAxMDBweAorICAgIFFDT01QQVJFKHNp emUuaGVpZ2h0KCksIGltYWdlLmJvdW5kaW5nUmVjdCgpLmhlaWdodCgpKTsgLy8gMTAwcHgKKwor ICAgIC8vIHJlbmRlciB3aXRob3V0IGNsaXBwaW5nIHRvIFZpZXdwb3J0CisgICAgZnJhbWUtPnNl dENsaXBSZW5kZXJUb1ZpZXdwb3J0KGZhbHNlKTsKKyAgICBRUGFpbnRlciBwYWludGVyMigmcGlj dHVyZSk7CisgICAgZnJhbWUtPnJlbmRlcigmcGFpbnRlcjIpOworICAgIHBhaW50ZXIyLmVuZCgp OworCisgICAgUUltYWdlIHJlc291cmNlKCI6L2ltYWdlLnBuZyIpOworICAgIFFDT01QQVJFKHJl c291cmNlLndpZHRoKCksIHBpY3R1cmUuYm91bmRpbmdSZWN0KCkud2lkdGgoKSk7ICAgLy8gcmVz b3VyY2Ugd2lkdGg6IDEyOHB4CisgICAgUUNPTVBBUkUocmVzb3VyY2UuaGVpZ2h0KCksIHBpY3R1 cmUuYm91bmRpbmdSZWN0KCkuaGVpZ2h0KCkpOyAvLyByZXNvdXJjZSBoZWlnaHQ6IDEyOHB4Cit9 CisKIFFURVNUX01BSU4odHN0X1FXZWJGcmFtZSkKICNpbmNsdWRlICJ0c3RfcXdlYmZyYW1lLm1v YyIK 33437 2009-07-24 07:02:53 -0700 2009-07-24 07:17:44 -0700 Fixed variable name and update ToT. remove_renderContent.diff text/plain 8041 apedralho Y29tbWl0IDBhZjYxNTBjZjY1YzM4OGQxMWNmODliOGU3YmEyMTIxNmUzOTM5NDQKQXV0aG9yOiBB bmRyZSBQZWRyYWxobyA8YW5kcmUucGVkcmFsaG9Ab3BlbmJvc3NhLm9yZz4KRGF0ZTogICBGcmkg SnVsIDI0IDA4OjM4OjM2IDIwMDkgLTA0MDAKCiAgICAyMDA5LTA3LTI0ICBBbmRyZSBQZWRyYWxo byAgPGFuZHJlLnBlZHJhbGhvQG9wZW5ib3NzYS5vcmc+CiAgICAKICAgICAgICAgICAgUmV2aWV3 ZWQgYnkgQWRhbSBUcmVhdC4KICAgIAogICAgICAgICAgICBSZW1vdmVkIHZvaWQgUVdlYkZyYW1l OjpyZW5kZXJDb250ZW50cyguLi4pIGFuZCBhZGRlZCB0aGUgUV9QUk9QRVJUWQogICAgICAgICAg ICBjbGlwUmVuZGVyVG9WaWV3cG9ydCB0byBjb250cm9sIHdoZXRoZXIgUVdlYkZyYW1lOjpyZW5k ZXIgd291bGQgY2FsbAogICAgICAgICAgICBGcmFtZVZpZXc6OnBhaW50Q29udGVudHMgcmF0aGVy IHRoYW4gRnJhbWVWaWV3OjpwYWludCBhbmQgZG8gbm90IGNsaXAKICAgICAgICAgICAgdGhlIGZy YW1lIGNvbnRlbnQgdG8gdmlld3BvcnQuCiAgICAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yNjM1MgogICAgCiAgICAgICAgICAgICogQXBpL3F3ZWJmcmFt ZS5jcHA6CiAgICAgICAgICAgIChRV2ViRnJhbWVQcml2YXRlOjpyZW5kZXJQcml2YXRlKToKICAg ICAgICAgICAgKFFXZWJGcmFtZTo6Y2xpcFJlbmRlclRvVmlld3BvcnQpOgogICAgICAgICAgICAo UVdlYkZyYW1lOjpzZXRDbGlwUmVuZGVyVG9WaWV3cG9ydCk6CiAgICAgICAgICAgICogQXBpL3F3 ZWJmcmFtZS5oOgogICAgICAgICAgICAqIEFwaS9xd2ViZnJhbWVfcC5oOgogICAgICAgICAgICAo UVdlYkZyYW1lUHJpdmF0ZTo6UVdlYkZyYW1lUHJpdmF0ZSk6CiAgICAgICAgICAgICogdGVzdHMv cXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwOgoKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkv cXdlYmZyYW1lLmNwcCBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAppbmRleCBhZWEyMzgw Li40MGVkZGI1IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKKysrIGIv V2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCkBAIC0yMzIsNyArMjMyLDcgQEAgV2ViQ29yZTo6 U2Nyb2xsYmFyKiBRV2ViRnJhbWVQcml2YXRlOjp2ZXJ0aWNhbFNjcm9sbEJhcigpIGNvbnN0CiAg ICAgcmV0dXJuIGZyYW1lLT52aWV3KCktPnZlcnRpY2FsU2Nyb2xsYmFyKCk7CiB9CiAKLXZvaWQg UVdlYkZyYW1lUHJpdmF0ZTo6cmVuZGVyUHJpdmF0ZShRUGFpbnRlciAqcGFpbnRlciwgY29uc3Qg UVJlZ2lvbiAmY2xpcCwgYm9vbCBjb250ZW50cykKK3ZvaWQgUVdlYkZyYW1lUHJpdmF0ZTo6cmVu ZGVyUHJpdmF0ZShRUGFpbnRlciAqcGFpbnRlciwgY29uc3QgUVJlZ2lvbiAmY2xpcCkKIHsKICAg ICBpZiAoIWZyYW1lLT52aWV3KCkgfHwgIWZyYW1lLT5jb250ZW50UmVuZGVyZXIoKSkKICAgICAg ICAgcmV0dXJuOwpAQCAtMjQ2LDcgKzI0Niw3IEBAIHZvaWQgUVdlYkZyYW1lUHJpdmF0ZTo6cmVu ZGVyUHJpdmF0ZShRUGFpbnRlciAqcGFpbnRlciwgY29uc3QgUVJlZ2lvbiAmY2xpcCwgYm9vCiAK ICAgICBHcmFwaGljc0NvbnRleHQgY29udGV4dChwYWludGVyKTsKIAotICAgIGlmICghY29udGVu dHMpCisgICAgaWYgKGNsaXBSZW5kZXJUb1ZpZXdwb3J0KQogICAgICAgICB2aWV3LT5wYWludCgm Y29udGV4dCwgdmVjdG9yLmZpcnN0KCkpOwogICAgIGVsc2UKICAgICAgICAgdmlldy0+cGFpbnRD b250ZW50cygmY29udGV4dCwgdmVjdG9yLmZpcnN0KCkpOwpAQCAtMjU1LDcgKzI1NSw3IEBAIHZv aWQgUVdlYkZyYW1lUHJpdmF0ZTo6cmVuZGVyUHJpdmF0ZShRUGFpbnRlciAqcGFpbnRlciwgY29u c3QgUVJlZ2lvbiAmY2xpcCwgYm9vCiAgICAgICAgIGNvbnN0IFFSZWN0JiBjbGlwUmVjdCA9IHZl Y3Rvci5hdChpKTsKICAgICAgICAgcGFpbnRlci0+c2F2ZSgpOwogICAgICAgICBwYWludGVyLT5z ZXRDbGlwUmVjdChjbGlwUmVjdCwgUXQ6OkludGVyc2VjdENsaXApOwotICAgICAgICBpZiAoIWNv bnRlbnRzKQorICAgICAgICBpZiAoY2xpcFJlbmRlclRvVmlld3BvcnQpCiAgICAgICAgICAgICB2 aWV3LT5wYWludCgmY29udGV4dCwgY2xpcFJlY3QpOwogICAgICAgICBlbHNlCiAgICAgICAgICAg ICB2aWV3LT5wYWludENvbnRlbnRzKCZjb250ZXh0LCBjbGlwUmVjdCk7CkBAIC05MjMsMTIgKzky MywyMyBAQCB2b2lkIFFXZWJGcmFtZTo6cmVuZGVyKFFQYWludGVyICpwYWludGVyKQogfQogCiAv KiEKLSAgXHNpbmNlIDQuNgotICBSZW5kZXIgdGhlIGZyYW1lJ3MgXGEgY29udGVudHMgaW50byBc YSBwYWludGVyIHdoaWxlIGNsaXBwaW5nIHRvIFxhIGNvbnRlbnRzLgorICAgIFxzaW5jZSA0LjYK KyAgICBccHJvcGVydHkgUVdlYkZyYW1lOjpjbGlwUmVuZGVyVG9WaWV3cG9ydAorCisgICAgUmV0 dXJucyB0cnVlIGlmIHJlbmRlciB3aWxsIGNsaXAgY29udGVudCB0byB2aWV3cG9ydDsgb3RoZXJ3 aXNlIHJldHVybnMgZmFsc2UuCisqLworYm9vbCBRV2ViRnJhbWU6OmNsaXBSZW5kZXJUb1ZpZXdw b3J0KCkgY29uc3QKK3sKKyAgICByZXR1cm4gZC0+Y2xpcFJlbmRlclRvVmlld3BvcnQ7Cit9CisK Ky8qIQorICAgIFxzaW5jZSA0LjYKKyAgICBTZXRzIHdoZXRoZXIgdGhlIGNvbnRlbnQgb2YgYSBm cmFtZSB3aWxsIGJlIGNsaXBwZWQgdG8gdmlld3BvcnQgd2hlbiByZW5kZXJlZC4KICovCi12b2lk IFFXZWJGcmFtZTo6cmVuZGVyQ29udGVudHMoUVBhaW50ZXIgKnBhaW50ZXIsIGNvbnN0IFFSZWdp b24gJmNvbnRlbnRzKQordm9pZCBRV2ViRnJhbWU6OnNldENsaXBSZW5kZXJUb1ZpZXdwb3J0KGJv b2wgY2xpcFJlbmRlclRvVmlld3BvcnQpCiB7Ci0gICAgZC0+cmVuZGVyUHJpdmF0ZShwYWludGVy LCBjb250ZW50cywgdHJ1ZSk7CisgICAgZC0+Y2xpcFJlbmRlclRvVmlld3BvcnQgPSBjbGlwUmVu ZGVyVG9WaWV3cG9ydDsKIH0KIAogLyohCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJm cmFtZS5oIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuaAppbmRleCBmMTQwYTIxLi4xMGE3MTRh IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oCisrKyBiL1dlYktpdC9xdC9B cGkvcXdlYmZyYW1lLmgKQEAgLTExMSw2ICsxMTEsNyBAQCBjbGFzcyBRV0VCS0lUX0VYUE9SVCBR V2ViRnJhbWUgOiBwdWJsaWMgUU9iamVjdCB7CiAgICAgUV9QUk9QRVJUWShRSWNvbiBpY29uIFJF QUQgaWNvbikKICAgICBRX1BST1BFUlRZKFFTaXplIGNvbnRlbnRzU2l6ZSBSRUFEIGNvbnRlbnRz U2l6ZSkKICAgICBRX1BST1BFUlRZKFFQb2ludCBzY3JvbGxQb3NpdGlvbiBSRUFEIHNjcm9sbFBv c2l0aW9uIFdSSVRFIHNldFNjcm9sbFBvc2l0aW9uKQorICAgIFFfUFJPUEVSVFkoYm9vbCBjbGlw UmVuZGVyVG9WaWV3cG9ydCBSRUFEIGNsaXBSZW5kZXJUb1ZpZXdwb3J0IFdSSVRFIHNldENsaXBS ZW5kZXJUb1ZpZXdwb3J0KQogICAgIFFfUFJPUEVSVFkoYm9vbCBmb2N1cyBSRUFEIGhhc0ZvY3Vz KQogcHJpdmF0ZToKICAgICBRV2ViRnJhbWUoUVdlYlBhZ2UgKnBhcmVudCwgUVdlYkZyYW1lRGF0 YSAqZnJhbWVEYXRhKTsKQEAgLTE2NCw3ICsxNjUsOCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHJl bmRlcihRUGFpbnRlciAqcGFpbnRlciwgY29uc3QgUVJlZ2lvbiAmY2xpcCk7CiAgICAgdm9pZCBy ZW5kZXIoUVBhaW50ZXIgKnBhaW50ZXIpOwotICAgIHZvaWQgcmVuZGVyQ29udGVudHMoUVBhaW50 ZXIgKnBhaW50ZXIsIGNvbnN0IFFSZWdpb24gJmNvbnRlbnRzKTsKKyAgICBib29sIGNsaXBSZW5k ZXJUb1ZpZXdwb3J0KCkgY29uc3Q7CisgICAgdm9pZCBzZXRDbGlwUmVuZGVyVG9WaWV3cG9ydChi b29sIGNsaXBSZW5kZXJUb1ZpZXdwb3J0KTsKIAogICAgIHZvaWQgc2V0VGV4dFNpemVNdWx0aXBs aWVyKHFyZWFsIGZhY3Rvcik7CiAgICAgcXJlYWwgdGV4dFNpemVNdWx0aXBsaWVyKCkgY29uc3Q7 CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZV9wLmggYi9XZWJLaXQvcXQvQXBp L3F3ZWJmcmFtZV9wLmgKaW5kZXggMjU1ZDZiZC4uZDZhZmMwMSAxMDA2NDQKLS0tIGEvV2ViS2l0 L3F0L0FwaS9xd2ViZnJhbWVfcC5oCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lX3AuaApA QCAtNzAsNiArNzAsNyBAQCBwdWJsaWM6CiAgICAgICAgICwgYWxsb3dzU2Nyb2xsaW5nKHRydWUp CiAgICAgICAgICwgbWFyZ2luV2lkdGgoLTEpCiAgICAgICAgICwgbWFyZ2luSGVpZ2h0KC0xKQor ICAgICAgICAsIGNsaXBSZW5kZXJUb1ZpZXdwb3J0KHRydWUpCiAgICAgICAgIHt9CiAgICAgdm9p ZCBpbml0KFFXZWJGcmFtZSogcWZyYW1lLCBRV2ViRnJhbWVEYXRhKiBmcmFtZURhdGEpOwogCkBA IC04NCw3ICs4NSw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgV2ViQ29yZTo6RnJhbWUqIGNvcmUo UVdlYkZyYW1lKik7CiAgICAgc3RhdGljIFFXZWJGcmFtZSoga2l0KFdlYkNvcmU6OkZyYW1lKik7 CiAKLSAgICB2b2lkIHJlbmRlclByaXZhdGUoUVBhaW50ZXIgKnBhaW50ZXIsIGNvbnN0IFFSZWdp b24gJmNsaXAsIGJvb2wgY29udGVudHMgPSBmYWxzZSk7CisgICAgdm9pZCByZW5kZXJQcml2YXRl KFFQYWludGVyICpwYWludGVyLCBjb25zdCBRUmVnaW9uICZjbGlwKTsKIAogICAgIFFXZWJGcmFt ZSAqcTsKICAgICBXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0ICpmcmFtZUxvYWRlckNsaWVu dDsKQEAgLTk0LDYgKzk1LDcgQEAgcHVibGljOgogICAgIGJvb2wgYWxsb3dzU2Nyb2xsaW5nOwog ICAgIGludCBtYXJnaW5XaWR0aDsKICAgICBpbnQgbWFyZ2luSGVpZ2h0OworICAgIGJvb2wgY2xp cFJlbmRlclRvVmlld3BvcnQ7CiB9OwogCiBjbGFzcyBRV2ViSGl0VGVzdFJlc3VsdFByaXZhdGUg ewpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cK aW5kZXggNDJlNDM4ZC4uY2Q5MDJmZCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0NoYW5nZUxvZwor KysgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMDktMDctMjQgIEFu ZHJlIFBlZHJhbGhvICA8YW5kcmUucGVkcmFsaG9Ab3BlbmJvc3NhLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmVkIHZvaWQgUVdlYkZy YW1lOjpyZW5kZXJDb250ZW50cyguLi4pIGFuZCBhZGRlZCB0aGUgUV9QUk9QRVJUWQorICAgICAg ICBjbGlwUmVuZGVyVG9WaWV3cG9ydCB0byBjb250cm9sIHdoZXRoZXIgUVdlYkZyYW1lOjpyZW5k ZXIgd291bGQgY2FsbAorICAgICAgICBGcmFtZVZpZXc6OnBhaW50Q29udGVudHMgcmF0aGVyIHRo YW4gRnJhbWVWaWV3OjpwYWludCBhbmQgZG8gbm90IGNsaXAKKyAgICAgICAgdGhlIGZyYW1lIGNv bnRlbnQgdG8gdmlld3BvcnQuCisKKworICAgICAgICAqIEFwaS9xd2ViZnJhbWUuY3BwOgorICAg ICAgICAoUVdlYkZyYW1lUHJpdmF0ZTo6cmVuZGVyUHJpdmF0ZSk6CisgICAgICAgIChRV2ViRnJh bWU6OmNsaXBSZW5kZXJUb1ZpZXdwb3J0KToKKyAgICAgICAgKFFXZWJGcmFtZTo6c2V0Q2xpcFJl bmRlclRvVmlld3BvcnQpOgorICAgICAgICAqIEFwaS9xd2ViZnJhbWUuaDoKKyAgICAgICAgKiBB cGkvcXdlYmZyYW1lX3AuaDoKKyAgICAgICAgKFFXZWJGcmFtZVByaXZhdGU6OlFXZWJGcmFtZVBy aXZhdGUpOgorICAgICAgICAqIHRlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcDoKKwog MjAwOS0wNy0yNCAgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4gIDxrZW5uZXRoQHdlYmtpdC5v cmc+CiAKICAgICAgICAgQnVpbGQgZml4IGZvciBRdC4KZGlmZiAtLWdpdCBhL1dlYktpdC9xdC90 ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAgYi9XZWJLaXQvcXQvdGVzdHMvcXdlYmZy YW1lL3RzdF9xd2ViZnJhbWUuY3BwCmluZGV4IGMwZTcyYmUuLmNiNjNmNTIgMTAwNjQ0Ci0tLSBh L1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAKKysrIGIvV2ViS2l0 L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcApAQCAtMjksNiArMjksNyBAQAog I2luY2x1ZGUgPFFBYnN0cmFjdEl0ZW1WaWV3PgogI2luY2x1ZGUgPFFBcHBsaWNhdGlvbj4KICNp bmNsdWRlIDxRQ29tYm9Cb3g+CisjaW5jbHVkZSA8UVBpY3R1cmU+CiAjaW5jbHVkZSA8UVJlZ0V4 cD4KICNpbmNsdWRlIDxRTmV0d29ya1JlcXVlc3Q+CiAvL1RFU1RFRF9DTEFTUz0KQEAgLTU4NSw2 ICs1ODYsNyBAQCBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgYmFzZVVybF9kYXRhKCk7CiAgICAg dm9pZCBiYXNlVXJsKCk7CiAgICAgdm9pZCBoYXNTZXRGb2N1cygpOworICAgIHZvaWQgcmVuZGVy KCk7CiAKIHByaXZhdGU6CiAgICAgUVN0cmluZyAgZXZhbEpTKGNvbnN0IFFTdHJpbmcmcykgewpA QCAtMjQ3Myw1ICsyNDc1LDQ2IEBAIHZvaWQgdHN0X1FXZWJGcmFtZTo6aGFzU2V0Rm9jdXMoKQog ICAgIFFWRVJJRlkobV9wYWdlLT5tYWluRnJhbWUoKS0+aGFzRm9jdXMoKSk7CiB9CiAKK3ZvaWQg dHN0X1FXZWJGcmFtZTo6cmVuZGVyKCkKK3sKKyAgICBRU3RyaW5nIGh0bWwoIjxodG1sPiIgXAor ICAgICAgICAgICAgICAgICAgICAiPGhlYWQ+PHN0eWxlPiIgXAorICAgICAgICAgICAgICAgICAg ICAgICAiYm9keSwgaWZyYW1lIHsgbWFyZ2luOiAwcHg7IGJvcmRlcjogbm9uZTsgfSIgXAorICAg ICAgICAgICAgICAgICAgICAiPC9zdHlsZT48L2hlYWQ+IiBcCisgICAgICAgICAgICAgICAgICAg ICI8Ym9keT48aWZyYW1lIHdpZHRoPScxMDBweCcgaGVpZ2h0PScxMDBweCcvPjwvYm9keT4iIFwK KyAgICAgICAgICAgICAgICAgIjwvaHRtbD4iKTsKKworICAgIFFXZWJQYWdlIHBhZ2U7CisgICAg cGFnZS5tYWluRnJhbWUoKS0+c2V0SHRtbChodG1sKTsKKworICAgIFFMaXN0PFFXZWJGcmFtZSo+ IGZyYW1lcyA9IHBhZ2UubWFpbkZyYW1lKCktPmNoaWxkRnJhbWVzKCk7CisgICAgUVdlYkZyYW1l ICpmcmFtZSA9IGZyYW1lcy5hdCgwKTsKKyAgICBRU3RyaW5nIGlubmVySHRtbCgiPGJvZHkgc3R5 bGU9J21hcmdpbjogMHB4Oyc+PGltZyBzcmM9J3FyYzovaW1hZ2UucG5nJy8+PC9ib2R5PiIpOwor ICAgIGZyYW1lLT5zZXRIdG1sKGlubmVySHRtbCk7CisKKyAgICBRUGljdHVyZSBwaWN0dXJlOwor CisgICAgLy8gcmVuZGVyIGNsaXBwaW5nIHRvIFZpZXdwb3J0CisgICAgZnJhbWUtPnNldENsaXBS ZW5kZXJUb1ZpZXdwb3J0KHRydWUpOworICAgIFFQYWludGVyIHBhaW50ZXIxKCZwaWN0dXJlKTsK KyAgICBmcmFtZS0+cmVuZGVyKCZwYWludGVyMSk7CisgICAgcGFpbnRlcjEuZW5kKCk7CisKKyAg ICBRU2l6ZSBzaXplID0gcGFnZS5tYWluRnJhbWUoKS0+Y29udGVudHNTaXplKCk7CisgICAgcGFn ZS5zZXRWaWV3cG9ydFNpemUoc2l6ZSk7CisgICAgUUNPTVBBUkUoc2l6ZS53aWR0aCgpLCBwaWN0 dXJlLmJvdW5kaW5nUmVjdCgpLndpZHRoKCkpOyAgIC8vIDEwMHB4CisgICAgUUNPTVBBUkUoc2l6 ZS5oZWlnaHQoKSwgcGljdHVyZS5ib3VuZGluZ1JlY3QoKS5oZWlnaHQoKSk7IC8vIDEwMHB4CisK KyAgICAvLyByZW5kZXIgd2l0aG91dCBjbGlwcGluZyB0byBWaWV3cG9ydAorICAgIGZyYW1lLT5z ZXRDbGlwUmVuZGVyVG9WaWV3cG9ydChmYWxzZSk7CisgICAgUVBhaW50ZXIgcGFpbnRlcjIoJnBp Y3R1cmUpOworICAgIGZyYW1lLT5yZW5kZXIoJnBhaW50ZXIyKTsKKyAgICBwYWludGVyMi5lbmQo KTsKKworICAgIFFJbWFnZSByZXNvdXJjZSgiOi9pbWFnZS5wbmciKTsKKyAgICBRQ09NUEFSRShy ZXNvdXJjZS53aWR0aCgpLCBwaWN0dXJlLmJvdW5kaW5nUmVjdCgpLndpZHRoKCkpOyAgIC8vIHJl c291cmNlIHdpZHRoOiAxMjhweAorICAgIFFDT01QQVJFKHJlc291cmNlLmhlaWdodCgpLCBwaWN0 dXJlLmJvdW5kaW5nUmVjdCgpLmhlaWdodCgpKTsgLy8gcmVzb3VyY2UgaGVpZ2h0OiAxMjhweAor fQorCiBRVEVTVF9NQUlOKHRzdF9RV2ViRnJhbWUpCiAjaW5jbHVkZSAidHN0X3F3ZWJmcmFtZS5t b2MiCg==