34777 2010-02-09 15:04:42 -0800 [Qt] Make possible Qt DRT get a page number for element by ID 2010-02-10 19:01:50 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED FIXED Qt P2 Normal --- 1 diegohcg webkit-unassigned commit-queue hamaji hausmann kenneth tonikitoo webkit.review.bot oldest_to_newest 189156 0 diegohcg 2010-02-09 15:04:42 -0800 Implement pageNumberForElementById() method in Qt DRT LayoutTestController, to make Qt DRT able to get page number. LayoutTests: printing/page-break-always.html printing/pageNumerForElementById.html printing/css2.1/page-break-before-000.html printing/css2.1/page-break-after-000.html printing/css2.1/page-break-after-004.html printing/css2.1/page-break-before-001.html printing/css2.1/page-break-after-001.html printing/css2.1/page-break-after-002.html printing/css2.1/page-break-before-002.html printing/css2.1/page-break-inside-000.html 189161 1 48445 diegohcg 2010-02-09 15:18:52 -0800 Created attachment 48445 Proposed patch 189163 2 webkit.review.bot 2010-02-09 15:21:04 -0800 Attachment 48445 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h:151: Missing spaces around = [whitespace/operators] [4] WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp:462: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Ignoring "WebKit/qt/Api/qwebframe.cpp": this file is exempt from the style guide. Total errors found: 2 If any of these errors are false positives, please file a bug against check-webkit-style. 189222 3 tonikitoo 2010-02-09 20:18:29 -0800 great catch ! (In reply to comment #2) > Attachment 48445 [details] did not pass style-queue: > > Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 > WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h:151: Missing spaces > around = [whitespace/operators] [4] pls fix this. > WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp:462: Tests for > true/false, null/non-null, and zero/non-zero should all be done without > equality comparisons. [readability/comparison_to_zero] [5] well, generally the bot is right, but in this specific case we are comparing |width| and |height| with '0', which makes the code easier to read for me than using "!width", so i would not bother much , unless someone (reviewer) thinks different. otherwise, lgtm. 189324 4 48487 diegohcg 2010-02-10 04:52:12 -0800 Created attachment 48487 Proposed patch Checked style 189326 5 48487 kenneth 2010-02-10 04:55:31 -0800 Comment on attachment 48487 Proposed patch > > +int QWEBKIT_EXPORT qt_drt_pageNumberForElementById(QWebFrame* qFrame, const QString& id, float width, float height) > +{ > + Frame* frame = QWebFramePrivate::core(qFrame); > + if (!frame) I would have used frame and coreFrame :-) > +int LayoutTestController::pageNumberForElementById(const QString& id, float width, float height) > +{ > + // If no size specified, webpage viewport size is used > + if (!width && !height) { > + width = m_drt->webPage()->viewportSize().width(); > + height = m_drt->webPage()->viewportSize().height(); > + } What is with is 0, but height is not? 189327 6 diegohcg 2010-02-10 05:09:00 -0800 (In reply to comment #5) > (From update of attachment 48487 [details]) > > > > > +int QWEBKIT_EXPORT qt_drt_pageNumberForElementById(QWebFrame* qFrame, const QString& id, float width, float height) > > +{ > > + Frame* frame = QWebFramePrivate::core(qFrame); > > + if (!frame) > > I would have used frame and coreFrame :-) humm I just followed the pattern of the others qt_drt* > > +int LayoutTestController::pageNumberForElementById(const QString& id, float width, float height) > > +{ > > + // If no size specified, webpage viewport size is used > > + if (!width && !height) { > > + width = m_drt->webPage()->viewportSize().width(); > > + height = m_drt->webPage()->viewportSize().height(); > > + } > > What is with is 0, but height is not? I assumed the method will calculate using 0 for width and a given value for height, and it will possibly return a invalid value for that. 189425 7 48487 commit-queue 2010-02-10 11:26:55 -0800 Comment on attachment 48487 Proposed patch Clearing flags on attachment: 48487 Committed r54612: <http://trac.webkit.org/changeset/54612> 189426 8 commit-queue 2010-02-10 11:27:04 -0800 All reviewed patches have been landed. Closing bug. 189574 9 tonikitoo 2010-02-10 19:01:50 -0800 *** Bug 34573 has been marked as a duplicate of this bug. *** 48445 2010-02-09 15:18:52 -0800 2010-02-10 04:52:12 -0800 Proposed patch 0001-Qt-DRT-pageNumberForElementById.diff text/plain 8156 diegohcg RnJvbSBhM2QwNzU1OTIwOGM0ODc5MGVlOTBhODJiMTI4YmViMDA5NjkzNzI0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEaWVnbyBHb256YWxleiA8ZGllZ28uZ29uemFsZXpAb3BlbmJv c3NhLm9yZz4KRGF0ZTogVHVlLCA5IEZlYiAyMDEwIDE5OjE3OjA2IC0wNDAwClN1YmplY3Q6IFtQ QVRDSF0gW1F0XSBEUlQgcGFnZU51bWJlckZvckVsZW1lbnRCeUlkCgotLS0KIExheW91dFRlc3Rz L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAyNCArKysrKysrKysr KysrKysrKysKIExheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQgICAgICAgICAgICAgICAg ICAgIHwgICAgNSAtLS0tCiBXZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAgICAgICAgICAgICAg ICAgICAgICAgICB8ICAgMTMgKysrKysrKysrKwogV2ViS2l0L3F0L0NoYW5nZUxvZyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDI1ICsrKysrKysrKysrKysrKysrKysKIFdlYktp dFRvb2xzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAyNiArKysr KysrKysrKysrKysrKysrKwogLi4uL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9s bGVyUXQuY3BwICAgfCAgIDEyICsrKysrKysrKwogLi4uL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91 dFRlc3RDb250cm9sbGVyUXQuaCAgICAgfCAgICAxICsKIDcgZmlsZXMgY2hhbmdlZCwgMTAxIGlu c2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGZhNjRjYzAuLjhiNjg4OTggMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMC0wMi0wOSAgRGllZ28gR29uemFsZXogIDxkaWVnby5n b256YWxlekBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEltcGxlbWVudCBwYWdlTnVtYmVyRm9yRWxlbWVudEJ5SWQoKSBtZXRo b2QgaW4gUXQgRFJUIExheW91dFRlc3RDb250cm9sbGVyLAorICAgICAgICB0byBtYWtlIFF0IERS VCBhYmxlIHRvIGdldCBwYWdlIG51bWJlci4KKworICAgICAgICBMYXlvdXRUZXN0czoKKyAgICAg ICAgICAgIHByaW50aW5nL3BhZ2UtYnJlYWstYWx3YXlzLmh0bWwKKyAgICAgICAgICAgIHByaW50 aW5nL3BhZ2VOdW1lckZvckVsZW1lbnRCeUlkLmh0bWwKKyAgICAgICAgICAgIHByaW50aW5nL2Nz czIuMS9wYWdlLWJyZWFrLWJlZm9yZS0wMDAuaHRtbAorICAgICAgICAgICAgcHJpbnRpbmcvY3Nz Mi4xL3BhZ2UtYnJlYWstYWZ0ZXItMDAwLmh0bWwKKyAgICAgICAgICAgIHByaW50aW5nL2NzczIu MS9wYWdlLWJyZWFrLWFmdGVyLTAwNC5odG1sCisgICAgICAgICAgICBwcmludGluZy9jc3MyLjEv cGFnZS1icmVhay1iZWZvcmUtMDAxLmh0bWwKKyAgICAgICAgICAgIHByaW50aW5nL2NzczIuMS9w YWdlLWJyZWFrLWFmdGVyLTAwMS5odG1sCisgICAgICAgICAgICBwcmludGluZy9jc3MyLjEvcGFn ZS1icmVhay1hZnRlci0wMDIuaHRtbAorICAgICAgICAgICAgcHJpbnRpbmcvY3NzMi4xL3BhZ2Ut YnJlYWstYmVmb3JlLTAwMi5odG1sCisgICAgICAgICAgICBwcmludGluZy9jc3MyLjEvcGFnZS1i cmVhay1pbnNpZGUtMDAwLmh0bWwKKworICAgICAgICBbUXRdIE1ha2UgcG9zc2libGUgUXQgRFJU IGdldCBhIHBhZ2UgbnVtYmVyIGZvciBlbGVtZW50IGJ5IElECisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDc3NworCisgICAgICAgICogcGxhdGZvcm0v cXQvU2tpcHBlZDoKKwogMjAxMC0wMi0wOSAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFuZGVycyBDYXJsc3Nvbi4KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9T a2lwcGVkCmluZGV4IGJkYTkxOTIuLmRlMDBhNGQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3Bs YXRmb3JtL3F0L1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZApA QCAtNTA4MiwxMSArNTA4Miw2IEBAIGNzczIuMS90MTUwNS1jNTI0LWZvbnQtdmFyLTAwLWIuaHRt bAogIyBSZWxpZXMgb24gV2ViS2l0IEFQSSBbV2ViVmlldyBfbG9hZEJhY2tGb3J3YXJkTGlzdEZy b21PdGhlclZpZXc6XQogZmFzdC9sb2FkZXIvY3Jhc2gtY29weWluZy1iYWNrZm9yd2FyZGxpc3Qu aHRtbAogCi0jIEltcGxlbWVudCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6cGFnZU51bWJlckZvckVs ZW1lbnRCeUlkKCkuCi1wcmludGluZy9wYWdlLWJyZWFrLWFsd2F5cy5odG1sCi1wcmludGluZy9w YWdlTnVtZXJGb3JFbGVtZW50QnlJZC5odG1sCi1wcmludGluZy9jc3MyLjEKLQogIyBCZWNhdXNl IEVOQUJMRV9EQVNIQk9BUkRfU1VQUE9SVD0wIGlzIHRoZSBkZWZhdWx0IG9wdGlvbi4gKEFwcGxl J3MgZGFzaGJvYXJkIHN1cHBvcnQgaW4gT1MgWCkKIGZhc3QvY3NzL2Rhc2hib2FyZC1yZWdpb25z LWF0dHItY3Jhc2guaHRtbAogCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5j cHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKaW5kZXggYWViN2EyMi4uNGMxZjMxOCAx MDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCisrKyBiL1dlYktpdC9xdC9B cGkvcXdlYmZyYW1lLmNwcApAQCAtMjIwLDYgKzIyMCwxOSBAQCBRU3RyaW5nIFFXRUJLSVRfRVhQ T1JUIHF0X2RydF9jb3VudGVyVmFsdWVGb3JFbGVtZW50QnlJZChRV2ViRnJhbWUqIHFGcmFtZSwg Y29ucwogICAgIHJldHVybiBRU3RyaW5nKCk7CiB9CiAKK2ludCBRV0VCS0lUX0VYUE9SVCBxdF9k cnRfcGFnZU51bWJlckZvckVsZW1lbnRCeUlkKFFXZWJGcmFtZSogcUZyYW1lLCBjb25zdCBRU3Ry aW5nJiBpZCwgZmxvYXQgd2lkdGgsIGZsb2F0IGhlaWdodCkKK3sKKyAgICBGcmFtZSogZnJhbWUg PSBRV2ViRnJhbWVQcml2YXRlOjpjb3JlKHFGcmFtZSk7CisgICAgaWYgKCFmcmFtZSkKKyAgICAg ICAgcmV0dXJuIC0xOworCisgICAgRWxlbWVudCogZWxlbWVudCA9IGZyYW1lLT5kb2N1bWVudCgp LT5nZXRFbGVtZW50QnlJZChBdG9taWNTdHJpbmcoaWQpKTsKKyAgICBpZiAoIWVsZW1lbnQpCisg ICAgICAgIHJldHVybiAtMTsKKworICAgIHJldHVybiBQcmludENvbnRleHQ6OnBhZ2VOdW1iZXJG b3JFbGVtZW50KGVsZW1lbnQsIEZsb2F0U2l6ZSh3aWR0aCwgaGVpZ2h0KSk7Cit9CisKIC8vIFN1 c3BlbmQgYWN0aXZlIERPTSBvYmplY3RzIGluIHRoaXMgZnJhbWUuCiB2b2lkIFFXRUJLSVRfRVhQ T1JUIHF0X3N1c3BlbmRBY3RpdmVET01PYmplY3RzKFFXZWJGcmFtZSogcUZyYW1lKQogewpkaWZm IC0tZ2l0IGEvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXgg NDg4NTZhNS4uYWE3NjE4NSAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9X ZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTAtMDItMDkgIERpZWdvIEdv bnphbGV6ICA8ZGllZ28uZ29uemFsZXpAb3BlbmJvc3NhLm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgcGFnZU51bWJlckZvckVs ZW1lbnRCeUlkKCkgbWV0aG9kIGluIFF0IERSVCBMYXlvdXRUZXN0Q29udHJvbGxlciwKKyAgICAg ICAgdG8gbWFrZSBRdCBEUlQgYWJsZSB0byBnZXQgcGFnZSBudW1iZXIuCisKKyAgICAgICAgTGF5 b3V0VGVzdHM6CisgICAgICAgICAgICBwcmludGluZy9wYWdlLWJyZWFrLWFsd2F5cy5odG1sCisg ICAgICAgICAgICBwcmludGluZy9wYWdlTnVtZXJGb3JFbGVtZW50QnlJZC5odG1sCisgICAgICAg ICAgICBwcmludGluZy9jc3MyLjEvcGFnZS1icmVhay1iZWZvcmUtMDAwLmh0bWwKKyAgICAgICAg ICAgIHByaW50aW5nL2NzczIuMS9wYWdlLWJyZWFrLWFmdGVyLTAwMC5odG1sCisgICAgICAgICAg ICBwcmludGluZy9jc3MyLjEvcGFnZS1icmVhay1hZnRlci0wMDQuaHRtbAorICAgICAgICAgICAg cHJpbnRpbmcvY3NzMi4xL3BhZ2UtYnJlYWstYmVmb3JlLTAwMS5odG1sCisgICAgICAgICAgICBw cmludGluZy9jc3MyLjEvcGFnZS1icmVhay1hZnRlci0wMDEuaHRtbAorICAgICAgICAgICAgcHJp bnRpbmcvY3NzMi4xL3BhZ2UtYnJlYWstYWZ0ZXItMDAyLmh0bWwKKyAgICAgICAgICAgIHByaW50 aW5nL2NzczIuMS9wYWdlLWJyZWFrLWJlZm9yZS0wMDIuaHRtbAorICAgICAgICAgICAgcHJpbnRp bmcvY3NzMi4xL3BhZ2UtYnJlYWstaW5zaWRlLTAwMC5odG1sCisKKyAgICAgICAgW1F0XSBNYWtl IHBvc3NpYmxlIFF0IERSVCBnZXQgYSBwYWdlIG51bWJlciBmb3IgZWxlbWVudCBieSBJRAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQ3NzcKKworICAg ICAgICAqIEFwaS9xd2ViZnJhbWUuY3BwOgorICAgICAgICAocXRfZHJ0X3BhZ2VOdW1iZXJGb3JF bGVtZW50QnlJZCk6CisKIDIwMTAtMDItMDkgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9r aWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2Vu LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdl TG9nCmluZGV4IGJjNjhjMzguLjQwZjc3OTggMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5n ZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMC0w Mi0wOSAgRGllZ28gR29uemFsZXogIDxkaWVnby5nb256YWxlekBvcGVuYm9zc2Eub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBw YWdlTnVtYmVyRm9yRWxlbWVudEJ5SWQoKSBtZXRob2QgaW4gUXQgRFJUIExheW91dFRlc3RDb250 cm9sbGVyLAorICAgICAgICB0byBtYWtlIFF0IERSVCBhYmxlIHRvIGdldCBwYWdlIG51bWJlci4K KworICAgICAgICBMYXlvdXRUZXN0czoKKyAgICAgICAgICAgIHByaW50aW5nL3BhZ2UtYnJlYWst YWx3YXlzLmh0bWwKKyAgICAgICAgICAgIHByaW50aW5nL3BhZ2VOdW1lckZvckVsZW1lbnRCeUlk Lmh0bWwKKyAgICAgICAgICAgIHByaW50aW5nL2NzczIuMS9wYWdlLWJyZWFrLWJlZm9yZS0wMDAu aHRtbAorICAgICAgICAgICAgcHJpbnRpbmcvY3NzMi4xL3BhZ2UtYnJlYWstYWZ0ZXItMDAwLmh0 bWwKKyAgICAgICAgICAgIHByaW50aW5nL2NzczIuMS9wYWdlLWJyZWFrLWFmdGVyLTAwNC5odG1s CisgICAgICAgICAgICBwcmludGluZy9jc3MyLjEvcGFnZS1icmVhay1iZWZvcmUtMDAxLmh0bWwK KyAgICAgICAgICAgIHByaW50aW5nL2NzczIuMS9wYWdlLWJyZWFrLWFmdGVyLTAwMS5odG1sCisg ICAgICAgICAgICBwcmludGluZy9jc3MyLjEvcGFnZS1icmVhay1hZnRlci0wMDIuaHRtbAorICAg ICAgICAgICAgcHJpbnRpbmcvY3NzMi4xL3BhZ2UtYnJlYWstYmVmb3JlLTAwMi5odG1sCisgICAg ICAgICAgICBwcmludGluZy9jc3MyLjEvcGFnZS1icmVhay1pbnNpZGUtMDAwLmh0bWwKKworICAg ICAgICBbUXRdIE1ha2UgcG9zc2libGUgUXQgRFJUIGdldCBhIHBhZ2UgbnVtYmVyIGZvciBlbGVt ZW50IGJ5IElECisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zNDc3NworCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xs ZXJRdC5jcHA6CisgICAgICAgIChMYXlvdXRUZXN0Q29udHJvbGxlcjo6cGFnZU51bWJlckZvckVs ZW1lbnRCeUlkKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJv bGxlclF0Lmg6CisKIDIwMTAtMDItMDkgIEFsZWphbmRybyBHLiBDYXN0cm8gIDxhbGV4QGlnYWxp YS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZDsgYWRkZWQgbXlzZWxmIHRvIGNvbW1pdHRlcnMK ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250 cm9sbGVyUXQuY3BwIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENv bnRyb2xsZXJRdC5jcHAKaW5kZXggM2QwNTcxYi4uYTIxMWU1ZCAxMDA2NDQKLS0tIGEvV2ViS2l0 VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5jcHAKKysrIGIv V2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5jcHAK QEAgLTQ5LDYgKzQ5LDcgQEAgZXh0ZXJuIHZvaWQgcXRfZHJ0X3NldERvbWFpblJlbGF4YXRpb25G b3JiaWRkZW5Gb3JVUkxTY2hlbWUoYm9vbCBmb3JiaWRkZW4sIGNvbnMKIGV4dGVybiB2b2lkIHF0 X2RydF93aGl0ZUxpc3RBY2Nlc3NGcm9tT3JpZ2luKGNvbnN0IFFTdHJpbmcmIHNvdXJjZU9yaWdp biwgY29uc3QgUVN0cmluZyYgZGVzdGluYXRpb25Qcm90b2NvbCwgY29uc3QgUVN0cmluZyYgZGVz dGluYXRpb25Ib3N0LCBib29sIGFsbG93RGVzdGluYXRpb25TdWJkb21haW5zKTsKIGV4dGVybiBR U3RyaW5nIHF0X2RydF9jb3VudGVyVmFsdWVGb3JFbGVtZW50QnlJZChRV2ViRnJhbWUqIHFGcmFt ZSwgY29uc3QgUVN0cmluZyYgaWQpOwogZXh0ZXJuIGludCBxdF9kcnRfd29ya2VyVGhyZWFkQ291 bnQoKTsKK2V4dGVybiBpbnQgcXRfZHJ0X3BhZ2VOdW1iZXJGb3JFbGVtZW50QnlJZChRV2ViRnJh bWUqIHFGcmFtZSwgY29uc3QgUVN0cmluZyYgaWQsIGZsb2F0IHdpZHRoLCBmbG9hdCBoZWlnaHQp OwogCiBMYXlvdXRUZXN0Q29udHJvbGxlcjo6TGF5b3V0VGVzdENvbnRyb2xsZXIoV2ViQ29yZTo6 RHVtcFJlbmRlclRyZWUqIGRydCkKICAgICA6IFFPYmplY3QoKQpAQCAtNDU0LDMgKzQ1NSwxNCBA QCBpbnQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OndvcmtlclRocmVhZENvdW50KCkKIHsKICAgICBy ZXR1cm4gcXRfZHJ0X3dvcmtlclRocmVhZENvdW50KCk7CiB9CisKK2ludCBMYXlvdXRUZXN0Q29u dHJvbGxlcjo6cGFnZU51bWJlckZvckVsZW1lbnRCeUlkKGNvbnN0IFFTdHJpbmcmIGlkLCBmbG9h dCB3aWR0aCwgZmxvYXQgaGVpZ2h0KQoreworICAgIC8vIElmIG5vIHNpemUgc3BlY2lmaWVkLCB3 ZWJwYWdlIHZpZXdwb3J0IHNpemUgaXMgdXNlZAorICAgIGlmICh3aWR0aCA9PSAwICYmIGhlaWdo dCA9PSAwKSB7CisgICAgICAgIHdpZHRoID0gbV9kcnQtPndlYlBhZ2UoKS0+dmlld3BvcnRTaXpl KCkud2lkdGgoKTsKKyAgICAgICAgaGVpZ2h0ID0gbV9kcnQtPndlYlBhZ2UoKS0+dmlld3BvcnRT aXplKCkuaGVpZ2h0KCk7CisgICAgfQorCisgICAgcmV0dXJuIHF0X2RydF9wYWdlTnVtYmVyRm9y RWxlbWVudEJ5SWQobV9kcnQtPndlYlBhZ2UoKS0+bWFpbkZyYW1lKCksIGlkLCB3aWR0aCwgaGVp Z2h0KTsKK30KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91 dFRlc3RDb250cm9sbGVyUXQuaCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91 dFRlc3RDb250cm9sbGVyUXQuaAppbmRleCAwNTlkYWFiLi40ZWRjZTk0IDEwMDY0NAotLS0gYS9X ZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmgKKysr IGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5o CkBAIC0xNDgsNiArMTQ4LDcgQEAgcHVibGljIHNsb3RzOgogICAgIHZvaWQgc2V0VXNlclN0eWxl U2hlZXRFbmFibGVkKGJvb2wgZW5hYmxlZCk7CiAgICAgdm9pZCBzZXREb21haW5SZWxheGF0aW9u Rm9yYmlkZGVuRm9yVVJMU2NoZW1lKGJvb2wgZm9yYmlkZGVuLCBjb25zdCBRU3RyaW5nJiBzY2hl bWUpOwogICAgIGludCB3b3JrZXJUaHJlYWRDb3VudCgpOworICAgIGludCBwYWdlTnVtYmVyRm9y RWxlbWVudEJ5SWQoY29uc3QgUVN0cmluZyYgaWQsIGZsb2F0IHdpZHRoPTAsIGZsb2F0IGhlaWdo dD0wKTsKIAogcHJpdmF0ZSBzbG90czoKICAgICB2b2lkIHByb2Nlc3NXb3JrKCk7Ci0tIAoxLjYu My4zCgo= 48487 2010-02-10 04:52:12 -0800 2010-02-10 11:26:54 -0800 Proposed patch 0001-Qt-DRT-pageNumberForElementById.diff text/plain 8152 diegohcg RnJvbSA3YjIyM2U5ZWM2MzRiOGIyNmZlMmU0NjczYTI2N2ZlMjI3MDQwZTZiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEaWVnbyBHb256YWxleiA8ZGllZ28uZ29uemFsZXpAb3BlbmJv c3NhLm9yZz4KRGF0ZTogVHVlLCA5IEZlYiAyMDEwIDE5OjE3OjA2IC0wNDAwClN1YmplY3Q6IFtQ QVRDSF0gW1F0XSBEUlQgcGFnZU51bWJlckZvckVsZW1lbnRCeUlkCgotLS0KIExheW91dFRlc3Rz L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAyNCArKysrKysrKysr KysrKysrKysKIExheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQgICAgICAgICAgICAgICAg ICAgIHwgICAgNSAtLS0tCiBXZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAgICAgICAgICAgICAg ICAgICAgICAgICB8ICAgMTMgKysrKysrKysrKwogV2ViS2l0L3F0L0NoYW5nZUxvZyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDI1ICsrKysrKysrKysrKysrKysrKysKIFdlYktp dFRvb2xzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAyNiArKysr KysrKysrKysrKysrKysrKwogLi4uL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9s bGVyUXQuY3BwICAgfCAgIDEyICsrKysrKysrKwogLi4uL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91 dFRlc3RDb250cm9sbGVyUXQuaCAgICAgfCAgICAxICsKIDcgZmlsZXMgY2hhbmdlZCwgMTAxIGlu c2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGZhNjRjYzAuLjhiNjg4OTggMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMC0wMi0wOSAgRGllZ28gR29uemFsZXogIDxkaWVnby5n b256YWxlekBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEltcGxlbWVudCBwYWdlTnVtYmVyRm9yRWxlbWVudEJ5SWQoKSBtZXRo b2QgaW4gUXQgRFJUIExheW91dFRlc3RDb250cm9sbGVyLAorICAgICAgICB0byBtYWtlIFF0IERS VCBhYmxlIHRvIGdldCBwYWdlIG51bWJlci4KKworICAgICAgICBMYXlvdXRUZXN0czoKKyAgICAg ICAgICAgIHByaW50aW5nL3BhZ2UtYnJlYWstYWx3YXlzLmh0bWwKKyAgICAgICAgICAgIHByaW50 aW5nL3BhZ2VOdW1lckZvckVsZW1lbnRCeUlkLmh0bWwKKyAgICAgICAgICAgIHByaW50aW5nL2Nz czIuMS9wYWdlLWJyZWFrLWJlZm9yZS0wMDAuaHRtbAorICAgICAgICAgICAgcHJpbnRpbmcvY3Nz Mi4xL3BhZ2UtYnJlYWstYWZ0ZXItMDAwLmh0bWwKKyAgICAgICAgICAgIHByaW50aW5nL2NzczIu MS9wYWdlLWJyZWFrLWFmdGVyLTAwNC5odG1sCisgICAgICAgICAgICBwcmludGluZy9jc3MyLjEv cGFnZS1icmVhay1iZWZvcmUtMDAxLmh0bWwKKyAgICAgICAgICAgIHByaW50aW5nL2NzczIuMS9w YWdlLWJyZWFrLWFmdGVyLTAwMS5odG1sCisgICAgICAgICAgICBwcmludGluZy9jc3MyLjEvcGFn ZS1icmVhay1hZnRlci0wMDIuaHRtbAorICAgICAgICAgICAgcHJpbnRpbmcvY3NzMi4xL3BhZ2Ut YnJlYWstYmVmb3JlLTAwMi5odG1sCisgICAgICAgICAgICBwcmludGluZy9jc3MyLjEvcGFnZS1i cmVhay1pbnNpZGUtMDAwLmh0bWwKKworICAgICAgICBbUXRdIE1ha2UgcG9zc2libGUgUXQgRFJU IGdldCBhIHBhZ2UgbnVtYmVyIGZvciBlbGVtZW50IGJ5IElECisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDc3NworCisgICAgICAgICogcGxhdGZvcm0v cXQvU2tpcHBlZDoKKwogMjAxMC0wMi0wOSAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFuZGVycyBDYXJsc3Nvbi4KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9T a2lwcGVkCmluZGV4IGJkYTkxOTIuLmRlMDBhNGQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3Bs YXRmb3JtL3F0L1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZApA QCAtNTA4MiwxMSArNTA4Miw2IEBAIGNzczIuMS90MTUwNS1jNTI0LWZvbnQtdmFyLTAwLWIuaHRt bAogIyBSZWxpZXMgb24gV2ViS2l0IEFQSSBbV2ViVmlldyBfbG9hZEJhY2tGb3J3YXJkTGlzdEZy b21PdGhlclZpZXc6XQogZmFzdC9sb2FkZXIvY3Jhc2gtY29weWluZy1iYWNrZm9yd2FyZGxpc3Qu aHRtbAogCi0jIEltcGxlbWVudCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6cGFnZU51bWJlckZvckVs ZW1lbnRCeUlkKCkuCi1wcmludGluZy9wYWdlLWJyZWFrLWFsd2F5cy5odG1sCi1wcmludGluZy9w YWdlTnVtZXJGb3JFbGVtZW50QnlJZC5odG1sCi1wcmludGluZy9jc3MyLjEKLQogIyBCZWNhdXNl IEVOQUJMRV9EQVNIQk9BUkRfU1VQUE9SVD0wIGlzIHRoZSBkZWZhdWx0IG9wdGlvbi4gKEFwcGxl J3MgZGFzaGJvYXJkIHN1cHBvcnQgaW4gT1MgWCkKIGZhc3QvY3NzL2Rhc2hib2FyZC1yZWdpb25z LWF0dHItY3Jhc2guaHRtbAogCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5j cHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKaW5kZXggYWViN2EyMi4uNGMxZjMxOCAx MDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCisrKyBiL1dlYktpdC9xdC9B cGkvcXdlYmZyYW1lLmNwcApAQCAtMjIwLDYgKzIyMCwxOSBAQCBRU3RyaW5nIFFXRUJLSVRfRVhQ T1JUIHF0X2RydF9jb3VudGVyVmFsdWVGb3JFbGVtZW50QnlJZChRV2ViRnJhbWUqIHFGcmFtZSwg Y29ucwogICAgIHJldHVybiBRU3RyaW5nKCk7CiB9CiAKK2ludCBRV0VCS0lUX0VYUE9SVCBxdF9k cnRfcGFnZU51bWJlckZvckVsZW1lbnRCeUlkKFFXZWJGcmFtZSogcUZyYW1lLCBjb25zdCBRU3Ry aW5nJiBpZCwgZmxvYXQgd2lkdGgsIGZsb2F0IGhlaWdodCkKK3sKKyAgICBGcmFtZSogZnJhbWUg PSBRV2ViRnJhbWVQcml2YXRlOjpjb3JlKHFGcmFtZSk7CisgICAgaWYgKCFmcmFtZSkKKyAgICAg ICAgcmV0dXJuIC0xOworCisgICAgRWxlbWVudCogZWxlbWVudCA9IGZyYW1lLT5kb2N1bWVudCgp LT5nZXRFbGVtZW50QnlJZChBdG9taWNTdHJpbmcoaWQpKTsKKyAgICBpZiAoIWVsZW1lbnQpCisg ICAgICAgIHJldHVybiAtMTsKKworICAgIHJldHVybiBQcmludENvbnRleHQ6OnBhZ2VOdW1iZXJG b3JFbGVtZW50KGVsZW1lbnQsIEZsb2F0U2l6ZSh3aWR0aCwgaGVpZ2h0KSk7Cit9CisKIC8vIFN1 c3BlbmQgYWN0aXZlIERPTSBvYmplY3RzIGluIHRoaXMgZnJhbWUuCiB2b2lkIFFXRUJLSVRfRVhQ T1JUIHF0X3N1c3BlbmRBY3RpdmVET01PYmplY3RzKFFXZWJGcmFtZSogcUZyYW1lKQogewpkaWZm IC0tZ2l0IGEvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXgg NDg4NTZhNS4uYWE3NjE4NSAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9X ZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTAtMDItMDkgIERpZWdvIEdv bnphbGV6ICA8ZGllZ28uZ29uemFsZXpAb3BlbmJvc3NhLm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgcGFnZU51bWJlckZvckVs ZW1lbnRCeUlkKCkgbWV0aG9kIGluIFF0IERSVCBMYXlvdXRUZXN0Q29udHJvbGxlciwKKyAgICAg ICAgdG8gbWFrZSBRdCBEUlQgYWJsZSB0byBnZXQgcGFnZSBudW1iZXIuCisKKyAgICAgICAgTGF5 b3V0VGVzdHM6CisgICAgICAgICAgICBwcmludGluZy9wYWdlLWJyZWFrLWFsd2F5cy5odG1sCisg ICAgICAgICAgICBwcmludGluZy9wYWdlTnVtZXJGb3JFbGVtZW50QnlJZC5odG1sCisgICAgICAg ICAgICBwcmludGluZy9jc3MyLjEvcGFnZS1icmVhay1iZWZvcmUtMDAwLmh0bWwKKyAgICAgICAg ICAgIHByaW50aW5nL2NzczIuMS9wYWdlLWJyZWFrLWFmdGVyLTAwMC5odG1sCisgICAgICAgICAg ICBwcmludGluZy9jc3MyLjEvcGFnZS1icmVhay1hZnRlci0wMDQuaHRtbAorICAgICAgICAgICAg cHJpbnRpbmcvY3NzMi4xL3BhZ2UtYnJlYWstYmVmb3JlLTAwMS5odG1sCisgICAgICAgICAgICBw cmludGluZy9jc3MyLjEvcGFnZS1icmVhay1hZnRlci0wMDEuaHRtbAorICAgICAgICAgICAgcHJp bnRpbmcvY3NzMi4xL3BhZ2UtYnJlYWstYWZ0ZXItMDAyLmh0bWwKKyAgICAgICAgICAgIHByaW50 aW5nL2NzczIuMS9wYWdlLWJyZWFrLWJlZm9yZS0wMDIuaHRtbAorICAgICAgICAgICAgcHJpbnRp bmcvY3NzMi4xL3BhZ2UtYnJlYWstaW5zaWRlLTAwMC5odG1sCisKKyAgICAgICAgW1F0XSBNYWtl IHBvc3NpYmxlIFF0IERSVCBnZXQgYSBwYWdlIG51bWJlciBmb3IgZWxlbWVudCBieSBJRAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQ3NzcKKworICAg ICAgICAqIEFwaS9xd2ViZnJhbWUuY3BwOgorICAgICAgICAocXRfZHJ0X3BhZ2VOdW1iZXJGb3JF bGVtZW50QnlJZCk6CisKIDIwMTAtMDItMDkgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9r aWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2Vu LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdl TG9nCmluZGV4IGJjNjhjMzguLjQwZjc3OTggMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5n ZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMC0w Mi0wOSAgRGllZ28gR29uemFsZXogIDxkaWVnby5nb256YWxlekBvcGVuYm9zc2Eub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBw YWdlTnVtYmVyRm9yRWxlbWVudEJ5SWQoKSBtZXRob2QgaW4gUXQgRFJUIExheW91dFRlc3RDb250 cm9sbGVyLAorICAgICAgICB0byBtYWtlIFF0IERSVCBhYmxlIHRvIGdldCBwYWdlIG51bWJlci4K KworICAgICAgICBMYXlvdXRUZXN0czoKKyAgICAgICAgICAgIHByaW50aW5nL3BhZ2UtYnJlYWst YWx3YXlzLmh0bWwKKyAgICAgICAgICAgIHByaW50aW5nL3BhZ2VOdW1lckZvckVsZW1lbnRCeUlk Lmh0bWwKKyAgICAgICAgICAgIHByaW50aW5nL2NzczIuMS9wYWdlLWJyZWFrLWJlZm9yZS0wMDAu aHRtbAorICAgICAgICAgICAgcHJpbnRpbmcvY3NzMi4xL3BhZ2UtYnJlYWstYWZ0ZXItMDAwLmh0 bWwKKyAgICAgICAgICAgIHByaW50aW5nL2NzczIuMS9wYWdlLWJyZWFrLWFmdGVyLTAwNC5odG1s CisgICAgICAgICAgICBwcmludGluZy9jc3MyLjEvcGFnZS1icmVhay1iZWZvcmUtMDAxLmh0bWwK KyAgICAgICAgICAgIHByaW50aW5nL2NzczIuMS9wYWdlLWJyZWFrLWFmdGVyLTAwMS5odG1sCisg ICAgICAgICAgICBwcmludGluZy9jc3MyLjEvcGFnZS1icmVhay1hZnRlci0wMDIuaHRtbAorICAg ICAgICAgICAgcHJpbnRpbmcvY3NzMi4xL3BhZ2UtYnJlYWstYmVmb3JlLTAwMi5odG1sCisgICAg ICAgICAgICBwcmludGluZy9jc3MyLjEvcGFnZS1icmVhay1pbnNpZGUtMDAwLmh0bWwKKworICAg ICAgICBbUXRdIE1ha2UgcG9zc2libGUgUXQgRFJUIGdldCBhIHBhZ2UgbnVtYmVyIGZvciBlbGVt ZW50IGJ5IElECisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zNDc3NworCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xs ZXJRdC5jcHA6CisgICAgICAgIChMYXlvdXRUZXN0Q29udHJvbGxlcjo6cGFnZU51bWJlckZvckVs ZW1lbnRCeUlkKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJv bGxlclF0Lmg6CisKIDIwMTAtMDItMDkgIEFsZWphbmRybyBHLiBDYXN0cm8gIDxhbGV4QGlnYWxp YS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZDsgYWRkZWQgbXlzZWxmIHRvIGNvbW1pdHRlcnMK ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250 cm9sbGVyUXQuY3BwIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENv bnRyb2xsZXJRdC5jcHAKaW5kZXggM2QwNTcxYi4uNDI3OTQ0ZCAxMDA2NDQKLS0tIGEvV2ViS2l0 VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5jcHAKKysrIGIv V2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5jcHAK QEAgLTQ5LDYgKzQ5LDcgQEAgZXh0ZXJuIHZvaWQgcXRfZHJ0X3NldERvbWFpblJlbGF4YXRpb25G b3JiaWRkZW5Gb3JVUkxTY2hlbWUoYm9vbCBmb3JiaWRkZW4sIGNvbnMKIGV4dGVybiB2b2lkIHF0 X2RydF93aGl0ZUxpc3RBY2Nlc3NGcm9tT3JpZ2luKGNvbnN0IFFTdHJpbmcmIHNvdXJjZU9yaWdp biwgY29uc3QgUVN0cmluZyYgZGVzdGluYXRpb25Qcm90b2NvbCwgY29uc3QgUVN0cmluZyYgZGVz dGluYXRpb25Ib3N0LCBib29sIGFsbG93RGVzdGluYXRpb25TdWJkb21haW5zKTsKIGV4dGVybiBR U3RyaW5nIHF0X2RydF9jb3VudGVyVmFsdWVGb3JFbGVtZW50QnlJZChRV2ViRnJhbWUqIHFGcmFt ZSwgY29uc3QgUVN0cmluZyYgaWQpOwogZXh0ZXJuIGludCBxdF9kcnRfd29ya2VyVGhyZWFkQ291 bnQoKTsKK2V4dGVybiBpbnQgcXRfZHJ0X3BhZ2VOdW1iZXJGb3JFbGVtZW50QnlJZChRV2ViRnJh bWUqIHFGcmFtZSwgY29uc3QgUVN0cmluZyYgaWQsIGZsb2F0IHdpZHRoLCBmbG9hdCBoZWlnaHQp OwogCiBMYXlvdXRUZXN0Q29udHJvbGxlcjo6TGF5b3V0VGVzdENvbnRyb2xsZXIoV2ViQ29yZTo6 RHVtcFJlbmRlclRyZWUqIGRydCkKICAgICA6IFFPYmplY3QoKQpAQCAtNDU0LDMgKzQ1NSwxNCBA QCBpbnQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OndvcmtlclRocmVhZENvdW50KCkKIHsKICAgICBy ZXR1cm4gcXRfZHJ0X3dvcmtlclRocmVhZENvdW50KCk7CiB9CisKK2ludCBMYXlvdXRUZXN0Q29u dHJvbGxlcjo6cGFnZU51bWJlckZvckVsZW1lbnRCeUlkKGNvbnN0IFFTdHJpbmcmIGlkLCBmbG9h dCB3aWR0aCwgZmxvYXQgaGVpZ2h0KQoreworICAgIC8vIElmIG5vIHNpemUgc3BlY2lmaWVkLCB3 ZWJwYWdlIHZpZXdwb3J0IHNpemUgaXMgdXNlZAorICAgIGlmICghd2lkdGggJiYgIWhlaWdodCkg eworICAgICAgICB3aWR0aCA9IG1fZHJ0LT53ZWJQYWdlKCktPnZpZXdwb3J0U2l6ZSgpLndpZHRo KCk7CisgICAgICAgIGhlaWdodCA9IG1fZHJ0LT53ZWJQYWdlKCktPnZpZXdwb3J0U2l6ZSgpLmhl aWdodCgpOworICAgIH0KKworICAgIHJldHVybiBxdF9kcnRfcGFnZU51bWJlckZvckVsZW1lbnRC eUlkKG1fZHJ0LT53ZWJQYWdlKCktPm1haW5GcmFtZSgpLCBpZCwgd2lkdGgsIGhlaWdodCk7Cit9 CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29u dHJvbGxlclF0LmggYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29u dHJvbGxlclF0LmgKaW5kZXggMDU5ZGFhYi4uMzU4ODIxOSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9v bHMvRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5oCisrKyBiL1dlYktp dFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuaApAQCAtMTQ4 LDYgKzE0OCw3IEBAIHB1YmxpYyBzbG90czoKICAgICB2b2lkIHNldFVzZXJTdHlsZVNoZWV0RW5h YmxlZChib29sIGVuYWJsZWQpOwogICAgIHZvaWQgc2V0RG9tYWluUmVsYXhhdGlvbkZvcmJpZGRl bkZvclVSTFNjaGVtZShib29sIGZvcmJpZGRlbiwgY29uc3QgUVN0cmluZyYgc2NoZW1lKTsKICAg ICBpbnQgd29ya2VyVGhyZWFkQ291bnQoKTsKKyAgICBpbnQgcGFnZU51bWJlckZvckVsZW1lbnRC eUlkKGNvbnN0IFFTdHJpbmcmIGlkLCBmbG9hdCB3aWR0aCA9IDAsIGZsb2F0IGhlaWdodCA9IDAp OwogCiBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgcHJvY2Vzc1dvcmsoKTsKLS0gCjEuNi4zLjMK Cg==