87505 2012-05-25 08:20:37 -0700 Add a != operator to ViewportArguments 2012-06-20 16:03:21 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jkjiang jkjiang jkjiang kenneth kpiascik rwlbuis tonikitoo zalan oldest_to_newest 633944 0 jkjiang 2012-05-25 08:20:37 -0700 As suggested on bug 87438, we should add a != operator to ViewportArguments. Hopefully this is right thing to do. Open for discussions in case there are different ideas. 634617 1 kenneth 2012-05-26 01:38:57 -0700 You should explain better why that it needed. I actually believe that we used to have that. 634642 2 tonikitoo 2012-05-26 04:20:46 -0700 I think it is only about convenience. in blackberry/ we have 3 or 4 cases of if (!(m_viewportArgument == DefaultViewportArguments)) { ... } 651101 3 tonikitoo 2012-06-17 19:15:58 -0700 Any update here? Looks straightforward and useful... 651136 4 jkjiang 2012-06-17 20:21:46 -0700 (In reply to comment #3) > Any update here? Looks straightforward and useful... I will update this. Assign to myself. 653800 5 148632 jkjiang 2012-06-20 12:58:13 -0700 Created attachment 148632 Patch 653806 6 148632 kpiascik 2012-06-20 13:04:37 -0700 Comment on attachment 148632 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=148632&action=review > Source/WebCore/dom/ViewportArguments.h:111 > + bool operator!=(const ViewportArguments& other) const You don't want this duplicated code. What you should do is this: return !(this == other); 653814 7 148632 jkjiang 2012-06-20 13:09:00 -0700 Comment on attachment 148632 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=148632&action=review >> Source/WebCore/dom/ViewportArguments.h:111 >> + bool operator!=(const ViewportArguments& other) const > > You don't want this duplicated code. What you should do is this: > return !(this == other); Thanks, should be this !(*this == other) if we don't want duplicate this code I think. 653836 8 148644 jkjiang 2012-06-20 13:27:34 -0700 Created attachment 148644 Patch 653965 9 148644 jkjiang 2012-06-20 16:02:46 -0700 Comment on attachment 148644 Patch Committed r120874: <http://trac.webkit.org/changeset/120874> 148632 2012-06-20 12:58:13 -0700 2012-06-20 13:27:23 -0700 Patch bug-87505-20120620155813.patch text/plain 4905 jkjiang U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwODUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTcxMjhjZGJhZDBmMTRj YzM0MWE5Mzk4NmM1M2FkNmUzOTI3NTc3OS4uY2RjZGU0ZDcyYWIwODlhZjViM2NlMjA3OTY5NTll ZjQxZTVlMWNkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA2LTIwICBKYWNr eSBKaWFuZyAgPHpoYWppYW5nQHJpbS5jb20+CisKKyAgICAgICAgQWRkIGEgIT0gb3BlcmF0b3Ig dG8gVmlld3BvcnRBcmd1bWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTg3NTA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisgICAgICAgIFBhdGNoIGJ5IEphY2t5IEppYW5nICA8emhhamlhbmdAcmltLmNvbT4KKworICAg ICAgICBBZGQgYSAhPSBvcGVyYXRvciB0byBWaWV3cG9ydEFyZ3VtZW50cyBmb3IgY29udmVuaWVu Y2UuCisKKyAgICAgICAgKiBkb20vVmlld3BvcnRBcmd1bWVudHMuaDoKKyAgICAgICAgKFZpZXdw b3J0QXJndW1lbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OlZpZXdwb3J0QXJndW1lbnRzOjpvcGVy YXRvciE9KToKKwogMjAxMi0wNi0yMCAgVG9ueSBDaGFuZyAgPHRvbnlAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFJlZ3Jlc3Npb24ocjExNjQwOCk6IEN0cmwtQSAoc2VsZWN0IGFsbCkgb24gbGFy Z2UgdGV4dCBmaWxlIGhhbmdzIHRoZSB0YWIgd2l0aCBoaWdoIENQVSB1c2FnZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9DaGFuZ2VMb2cKaW5kZXggNjI0NTRhZDFjMjcyZDk0ODM4ZjYzM2QzZjY0OWM5ZmVk ZDgxOTI0Zi4uZmJjMzA0ZGI1OGMyNzMxYjZkMWI1YjAwMDY3NmQ1YmU1NmNkOTg0ZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTItMDYtMjAgIEph Y2t5IEppYW5nICA8emhhamlhbmdAcmltLmNvbT4KKworICAgICAgICBBZGQgYSAhPSBvcGVyYXRv ciB0byBWaWV3cG9ydEFyZ3VtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODc1MDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKyAgICAgICAgUGF0Y2ggYnkgSmFja3kgSmlhbmcgIDx6aGFqaWFuZ0ByaW0uY29tPgorCisg ICAgICAgIFVzZSAhPSBvcGVyYXRvciBvZiBWaWV3cG9ydEFyZ3VtZW50cy4KKworICAgICAgICAq IEFwaS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVBy aXZhdGU6OnNldExvYWRTdGF0ZSk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBh Z2VQcml2YXRlOjpzZXRWaWV3cG9ydFNpemUpOgorICAgICAgICAqIEFwaS9XZWJWaWV3cG9ydEFy Z3VtZW50cy5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlZpZXdwb3J0QXJn dW1lbnRzOjpvcGVyYXRvciE9KToKKwogMjAxMi0wNi0yMCAgS29ucmFkIFBpYXNjaWsgIDxrcGlh c2Npa0ByaW0uY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBFbmFibGUgc2V0QWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0ZvckZpeGVkUG9zaXRpb25FbmFibGVkCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9kb20vVmlld3BvcnRBcmd1bWVudHMuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9WaWV3 cG9ydEFyZ3VtZW50cy5oCmluZGV4IDk2MjRlNGFlM2QxNTMyOWFlMGQ2YWY3MTRhOTE0NmRmYjk0 MjRjMmQuLjcxZTU5MTIzOTI1MGM2YTVmOTg4MjFkZTdlMjQxZDQ3ZWExOTA4MTQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9WaWV3cG9ydEFyZ3VtZW50cy5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9WaWV3cG9ydEFyZ3VtZW50cy5oCkBAIC0xMDcsNiArMTA3LDE2IEBAIHN0cnVj dCBWaWV3cG9ydEFyZ3VtZW50cyB7CiAgICAgICAgICAgICAmJiBoZWlnaHQgPT0gb3RoZXIuaGVp Z2h0CiAgICAgICAgICAgICAmJiB1c2VyU2NhbGFibGUgPT0gb3RoZXIudXNlclNjYWxhYmxlOwog ICAgIH0KKworICAgIGJvb2wgb3BlcmF0b3IhPShjb25zdCBWaWV3cG9ydEFyZ3VtZW50cyYgb3Ro ZXIpIGNvbnN0CisgICAgeworICAgICAgICByZXR1cm4gaW5pdGlhbFNjYWxlICE9IG90aGVyLmlu aXRpYWxTY2FsZQorICAgICAgICAgICAgfHwgbWluaW11bVNjYWxlICE9IG90aGVyLm1pbmltdW1T Y2FsZQorICAgICAgICAgICAgfHwgbWF4aW11bVNjYWxlICE9IG90aGVyLm1heGltdW1TY2FsZQor ICAgICAgICAgICAgfHwgd2lkdGggIT0gb3RoZXIud2lkdGgKKyAgICAgICAgICAgIHx8IGhlaWdo dCAhPSBvdGhlci5oZWlnaHQKKyAgICAgICAgICAgIHx8IHVzZXJTY2FsYWJsZSAhPSBvdGhlci51 c2VyU2NhbGFibGU7CisgICAgfQogfTsKIAogVmlld3BvcnRBdHRyaWJ1dGVzIGNvbXB1dGVWaWV3 cG9ydEF0dHJpYnV0ZXMoVmlld3BvcnRBcmd1bWVudHMgYXJncywgaW50IGRlc2t0b3BXaWR0aCwg aW50IGRldmljZVdpZHRoLCBpbnQgZGV2aWNlSGVpZ2h0LCBpbnQgZGV2aWNlRFBJLCBJbnRTaXpl IHZpc2libGVWaWV3cG9ydCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv QXBpL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNw cAppbmRleCBiYTY5OGNlNjU5ZjRlZTdkMTI4MTZhYzc4OWZkNGM1NGUwYThiODYxLi44MmY1Yjli YzI5NDY2MDk2OGVlMTkzNDIxNzdmMGFlNDVkZDUxOTQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9BcGkvV2ViUGFnZS5jcHAKQEAgLTk1Nyw3ICs5NTcsNyBAQCB2b2lkIFdlYlBhZ2VQcml2 YXRlOjpzZXRMb2FkU3RhdGUoTG9hZFN0YXRlIHN0YXRlKQogICAgICAgICAgICAgc3RhdGljIFZp ZXdwb3J0QXJndW1lbnRzIGRlZmF1bHRWaWV3cG9ydEFyZ3VtZW50czsKICAgICAgICAgICAgIGJv b2wgZG9jdW1lbnRIYXNWaWV3cG9ydEFyZ3VtZW50cyA9IGZhbHNlOwogICAgICAgICAgICAgRnJh bWVMb2FkVHlwZSBmcmFtZUxvYWRUeXBlID0gRnJhbWVMb2FkVHlwZVN0YW5kYXJkOwotICAgICAg ICAgICAgaWYgKG1fbWFpbkZyYW1lICYmIG1fbWFpbkZyYW1lLT5kb2N1bWVudCgpICYmICEobV9t YWluRnJhbWUtPmRvY3VtZW50KCktPnZpZXdwb3J0QXJndW1lbnRzKCkgPT0gZGVmYXVsdFZpZXdw b3J0QXJndW1lbnRzKSkKKyAgICAgICAgICAgIGlmIChtX21haW5GcmFtZSAmJiBtX21haW5GcmFt ZS0+ZG9jdW1lbnQoKSAmJiBtX21haW5GcmFtZS0+ZG9jdW1lbnQoKS0+dmlld3BvcnRBcmd1bWVu dHMoKSAhPSBkZWZhdWx0Vmlld3BvcnRBcmd1bWVudHMpCiAgICAgICAgICAgICAgICAgZG9jdW1l bnRIYXNWaWV3cG9ydEFyZ3VtZW50cyA9IHRydWU7CiAgICAgICAgICAgICBpZiAobV9tYWluRnJh bWUgJiYgbV9tYWluRnJhbWUtPmxvYWRlcigpKQogICAgICAgICAgICAgICAgIGZyYW1lTG9hZFR5 cGUgPSBtX21haW5GcmFtZS0+bG9hZGVyKCktPmxvYWRUeXBlKCk7CkBAIC0zNjQ1LDcgKzM2NDUs NyBAQCB2b2lkIFdlYlBhZ2VQcml2YXRlOjpzZXRWaWV3cG9ydFNpemUoY29uc3QgSW50U2l6ZSYg dHJhbnNmb3JtZWRBY3R1YWxWaXNpYmxlU2l6ZQogCiAgICAgLy8gUmVjb21wdXRlIG91ciB2aXJ0 dWFsIHZpZXdwb3J0LgogICAgIHN0YXRpYyBWaWV3cG9ydEFyZ3VtZW50cyBkZWZhdWx0Vmlld3Bv cnRBcmd1bWVudHM7Ci0gICAgaWYgKCEobV92aWV3cG9ydEFyZ3VtZW50cyA9PSBkZWZhdWx0Vmll d3BvcnRBcmd1bWVudHMpKSB7CisgICAgaWYgKG1fdmlld3BvcnRBcmd1bWVudHMgIT0gZGVmYXVs dFZpZXdwb3J0QXJndW1lbnRzKSB7CiAgICAgICAgIC8vIFdlIG1heSBuZWVkIHRvIGluZmVyIHRo ZSB3aWR0aCBhbmQgaGVpZ2h0IGZvciB0aGUgdmlld3BvcnQgd2l0aCByZXNwZWN0IHRvIHRoZSBy b3RhdGlvbi4KICAgICAgICAgSW50U2l6ZSBuZXdWaXJ0dWFsVmlld3BvcnQgPSByZWNvbXB1dGVW aXJ0dWFsVmlld3BvcnRGcm9tVmlld3BvcnRBcmd1bWVudHMoKTsKICAgICAgICAgQVNTRVJUKCFu ZXdWaXJ0dWFsVmlld3BvcnQuaXNFbXB0eSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9BcGkvV2ViVmlld3BvcnRBcmd1bWVudHMuY3BwIGIvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L0FwaS9XZWJWaWV3cG9ydEFyZ3VtZW50cy5jcHAKaW5kZXggNzk4YzNkNWMxYjg2 MmE0NGY1OWY2OTc5Yjc0NWE3NWUyMGY4MzljZS4uYWI1NzBhOTc1NTY4YzFlN2ZlODA5NmQwYThl ZDMxZjc2YTI1NDVkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9X ZWJWaWV3cG9ydEFyZ3VtZW50cy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9XZWJWaWV3cG9ydEFyZ3VtZW50cy5jcHAKQEAgLTExMSw3ICsxMTEsNyBAQCBib29sIFdlYlZp ZXdwb3J0QXJndW1lbnRzOjpvcGVyYXRvcj09KGNvbnN0IFdlYlZpZXdwb3J0QXJndW1lbnRzJiBv dGhlcikKIAogYm9vbCBXZWJWaWV3cG9ydEFyZ3VtZW50czo6b3BlcmF0b3IhPShjb25zdCBXZWJW aWV3cG9ydEFyZ3VtZW50cyYgb3RoZXIpCiB7Ci0gICAgcmV0dXJuICEoKnRoaXMgPT0gb3RoZXIp OworICAgIHJldHVybiAqZCAhPSAqKG90aGVyLmQpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJL aXQK 148644 2012-06-20 13:27:34 -0700 2012-06-20 16:02:46 -0700 Patch bug-87505-20120620162733.patch text/plain 4659 jkjiang U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwODUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTcxMjhjZGJhZDBmMTRj YzM0MWE5Mzk4NmM1M2FkNmUzOTI3NTc3OS4uY2RjZGU0ZDcyYWIwODlhZjViM2NlMjA3OTY5NTll ZjQxZTVlMWNkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA2LTIwICBKYWNr eSBKaWFuZyAgPHpoYWppYW5nQHJpbS5jb20+CisKKyAgICAgICAgQWRkIGEgIT0gb3BlcmF0b3Ig dG8gVmlld3BvcnRBcmd1bWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTg3NTA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisgICAgICAgIFBhdGNoIGJ5IEphY2t5IEppYW5nICA8emhhamlhbmdAcmltLmNvbT4KKworICAg ICAgICBBZGQgYSAhPSBvcGVyYXRvciB0byBWaWV3cG9ydEFyZ3VtZW50cyBmb3IgY29udmVuaWVu Y2UuCisKKyAgICAgICAgKiBkb20vVmlld3BvcnRBcmd1bWVudHMuaDoKKyAgICAgICAgKFZpZXdw b3J0QXJndW1lbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OlZpZXdwb3J0QXJndW1lbnRzOjpvcGVy YXRvciE9KToKKwogMjAxMi0wNi0yMCAgVG9ueSBDaGFuZyAgPHRvbnlAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFJlZ3Jlc3Npb24ocjExNjQwOCk6IEN0cmwtQSAoc2VsZWN0IGFsbCkgb24gbGFy Z2UgdGV4dCBmaWxlIGhhbmdzIHRoZSB0YWIgd2l0aCBoaWdoIENQVSB1c2FnZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9DaGFuZ2VMb2cKaW5kZXggNjI0NTRhZDFjMjcyZDk0ODM4ZjYzM2QzZjY0OWM5ZmVk ZDgxOTI0Zi4uZmJjMzA0ZGI1OGMyNzMxYjZkMWI1YjAwMDY3NmQ1YmU1NmNkOTg0ZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTItMDYtMjAgIEph Y2t5IEppYW5nICA8emhhamlhbmdAcmltLmNvbT4KKworICAgICAgICBBZGQgYSAhPSBvcGVyYXRv ciB0byBWaWV3cG9ydEFyZ3VtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODc1MDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKyAgICAgICAgUGF0Y2ggYnkgSmFja3kgSmlhbmcgIDx6aGFqaWFuZ0ByaW0uY29tPgorCisg ICAgICAgIFVzZSAhPSBvcGVyYXRvciBvZiBWaWV3cG9ydEFyZ3VtZW50cy4KKworICAgICAgICAq IEFwaS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVBy aXZhdGU6OnNldExvYWRTdGF0ZSk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBh Z2VQcml2YXRlOjpzZXRWaWV3cG9ydFNpemUpOgorICAgICAgICAqIEFwaS9XZWJWaWV3cG9ydEFy Z3VtZW50cy5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlZpZXdwb3J0QXJn dW1lbnRzOjpvcGVyYXRvciE9KToKKwogMjAxMi0wNi0yMCAgS29ucmFkIFBpYXNjaWsgIDxrcGlh c2Npa0ByaW0uY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBFbmFibGUgc2V0QWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0ZvckZpeGVkUG9zaXRpb25FbmFibGVkCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9kb20vVmlld3BvcnRBcmd1bWVudHMuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9WaWV3 cG9ydEFyZ3VtZW50cy5oCmluZGV4IDk2MjRlNGFlM2QxNTMyOWFlMGQ2YWY3MTRhOTE0NmRmYjk0 MjRjMmQuLjcwNzYzMDU5MjE2NjhiYTgzYTNmODQyMjY4MzRlYmYwNzE4MWZhZWYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9WaWV3cG9ydEFyZ3VtZW50cy5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9WaWV3cG9ydEFyZ3VtZW50cy5oCkBAIC0xMDcsNiArMTA3LDExIEBAIHN0cnVj dCBWaWV3cG9ydEFyZ3VtZW50cyB7CiAgICAgICAgICAgICAmJiBoZWlnaHQgPT0gb3RoZXIuaGVp Z2h0CiAgICAgICAgICAgICAmJiB1c2VyU2NhbGFibGUgPT0gb3RoZXIudXNlclNjYWxhYmxlOwog ICAgIH0KKworICAgIGJvb2wgb3BlcmF0b3IhPShjb25zdCBWaWV3cG9ydEFyZ3VtZW50cyYgb3Ro ZXIpIGNvbnN0CisgICAgeworICAgICAgICByZXR1cm4gISgqdGhpcyA9PSBvdGhlcik7CisgICAg fQogfTsKIAogVmlld3BvcnRBdHRyaWJ1dGVzIGNvbXB1dGVWaWV3cG9ydEF0dHJpYnV0ZXMoVmll d3BvcnRBcmd1bWVudHMgYXJncywgaW50IGRlc2t0b3BXaWR0aCwgaW50IGRldmljZVdpZHRoLCBp bnQgZGV2aWNlSGVpZ2h0LCBpbnQgZGV2aWNlRFBJLCBJbnRTaXplIHZpc2libGVWaWV3cG9ydCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwIGIv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAppbmRleCBiYTY5OGNlNjU5 ZjRlZTdkMTI4MTZhYzc4OWZkNGM1NGUwYThiODYxLi44MmY1YjliYzI5NDY2MDk2OGVlMTkzNDIx NzdmMGFlNDVkZDUxOTQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBp L1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5j cHAKQEAgLTk1Nyw3ICs5NTcsNyBAQCB2b2lkIFdlYlBhZ2VQcml2YXRlOjpzZXRMb2FkU3RhdGUo TG9hZFN0YXRlIHN0YXRlKQogICAgICAgICAgICAgc3RhdGljIFZpZXdwb3J0QXJndW1lbnRzIGRl ZmF1bHRWaWV3cG9ydEFyZ3VtZW50czsKICAgICAgICAgICAgIGJvb2wgZG9jdW1lbnRIYXNWaWV3 cG9ydEFyZ3VtZW50cyA9IGZhbHNlOwogICAgICAgICAgICAgRnJhbWVMb2FkVHlwZSBmcmFtZUxv YWRUeXBlID0gRnJhbWVMb2FkVHlwZVN0YW5kYXJkOwotICAgICAgICAgICAgaWYgKG1fbWFpbkZy YW1lICYmIG1fbWFpbkZyYW1lLT5kb2N1bWVudCgpICYmICEobV9tYWluRnJhbWUtPmRvY3VtZW50 KCktPnZpZXdwb3J0QXJndW1lbnRzKCkgPT0gZGVmYXVsdFZpZXdwb3J0QXJndW1lbnRzKSkKKyAg ICAgICAgICAgIGlmIChtX21haW5GcmFtZSAmJiBtX21haW5GcmFtZS0+ZG9jdW1lbnQoKSAmJiBt X21haW5GcmFtZS0+ZG9jdW1lbnQoKS0+dmlld3BvcnRBcmd1bWVudHMoKSAhPSBkZWZhdWx0Vmll d3BvcnRBcmd1bWVudHMpCiAgICAgICAgICAgICAgICAgZG9jdW1lbnRIYXNWaWV3cG9ydEFyZ3Vt ZW50cyA9IHRydWU7CiAgICAgICAgICAgICBpZiAobV9tYWluRnJhbWUgJiYgbV9tYWluRnJhbWUt PmxvYWRlcigpKQogICAgICAgICAgICAgICAgIGZyYW1lTG9hZFR5cGUgPSBtX21haW5GcmFtZS0+ bG9hZGVyKCktPmxvYWRUeXBlKCk7CkBAIC0zNjQ1LDcgKzM2NDUsNyBAQCB2b2lkIFdlYlBhZ2VQ cml2YXRlOjpzZXRWaWV3cG9ydFNpemUoY29uc3QgSW50U2l6ZSYgdHJhbnNmb3JtZWRBY3R1YWxW aXNpYmxlU2l6ZQogCiAgICAgLy8gUmVjb21wdXRlIG91ciB2aXJ0dWFsIHZpZXdwb3J0LgogICAg IHN0YXRpYyBWaWV3cG9ydEFyZ3VtZW50cyBkZWZhdWx0Vmlld3BvcnRBcmd1bWVudHM7Ci0gICAg aWYgKCEobV92aWV3cG9ydEFyZ3VtZW50cyA9PSBkZWZhdWx0Vmlld3BvcnRBcmd1bWVudHMpKSB7 CisgICAgaWYgKG1fdmlld3BvcnRBcmd1bWVudHMgIT0gZGVmYXVsdFZpZXdwb3J0QXJndW1lbnRz KSB7CiAgICAgICAgIC8vIFdlIG1heSBuZWVkIHRvIGluZmVyIHRoZSB3aWR0aCBhbmQgaGVpZ2h0 IGZvciB0aGUgdmlld3BvcnQgd2l0aCByZXNwZWN0IHRvIHRoZSByb3RhdGlvbi4KICAgICAgICAg SW50U2l6ZSBuZXdWaXJ0dWFsVmlld3BvcnQgPSByZWNvbXB1dGVWaXJ0dWFsVmlld3BvcnRGcm9t Vmlld3BvcnRBcmd1bWVudHMoKTsKICAgICAgICAgQVNTRVJUKCFuZXdWaXJ0dWFsVmlld3BvcnQu aXNFbXB0eSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2Vi Vmlld3BvcnRBcmd1bWVudHMuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJW aWV3cG9ydEFyZ3VtZW50cy5jcHAKaW5kZXggNzk4YzNkNWMxYjg2MmE0NGY1OWY2OTc5Yjc0NWE3 NWUyMGY4MzljZS4uYWI1NzBhOTc1NTY4YzFlN2ZlODA5NmQwYThlZDMxZjc2YTI1NDVkNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJWaWV3cG9ydEFyZ3VtZW50 cy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJWaWV3cG9ydEFyZ3Vt ZW50cy5jcHAKQEAgLTExMSw3ICsxMTEsNyBAQCBib29sIFdlYlZpZXdwb3J0QXJndW1lbnRzOjpv cGVyYXRvcj09KGNvbnN0IFdlYlZpZXdwb3J0QXJndW1lbnRzJiBvdGhlcikKIAogYm9vbCBXZWJW aWV3cG9ydEFyZ3VtZW50czo6b3BlcmF0b3IhPShjb25zdCBXZWJWaWV3cG9ydEFyZ3VtZW50cyYg b3RoZXIpCiB7Ci0gICAgcmV0dXJuICEoKnRoaXMgPT0gb3RoZXIpOworICAgIHJldHVybiAqZCAh PSAqKG90aGVyLmQpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK