92698 2012-07-30 18:11:23 -0700 [chromium]Upstream WebViewImpl:StartPageScaleAnimation changes for Chrome for Android 2012-07-31 19:56:15 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 66687 1 yusufo yusufo abarth aelias webkit.review.bot oldest_to_newest 682586 0 yusufo 2012-07-30 18:11:23 -0700 [chromium]Upstream WebViewImpl:StartPageScaleAnimation changes for Chrome for Android 682587 1 155411 yusufo 2012-07-30 18:12:53 -0700 Created attachment 155411 Patch 682683 2 155411 abarth 2012-07-30 20:29:41 -0700 Comment on attachment 155411 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=155411&action=review Thanks for the patch. A number of minor comments below. > Source/WebKit/chromium/ChangeLog:8 > + Additional information of the change such as approach, rationale. Please add per-function descriptions below (OOPS!). Please replace this line of the ChangeLog with a description of why you;re making this change. > Source/WebKit/chromium/src/WebViewImpl.cpp:771 > -void WebViewImpl::startPageScaleAnimation(const IntPoint& scroll, bool useAnchor, float newScale, double durationInSeconds) > +void WebViewImpl::startPageScaleAnimation(const WebPoint& targetPosition, bool useAnchor, float newScale, double durationSec) Typically we use WebCore types (e.g., IntPoint) in the implementation and reserve API types (e.g., WebPoint) for the API. We shouldn't rename durationInSeconds to durationSec. WebKit prefers variable names that use complete works and (ideally) English grammar. > Source/WebKit/chromium/src/WebViewImpl.cpp:781 > + setPageScaleFactor(newScale, clampedPoint); Please use four-space indent. 683593 3 155663 yusufo 2012-07-31 16:13:27 -0700 Created attachment 155663 Patch 683610 4 155670 yusufo 2012-07-31 16:26:47 -0700 Created attachment 155670 Patch 683643 5 155670 abarth 2012-07-31 16:56:59 -0700 Comment on attachment 155670 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=155670&action=review > Source/WebKit/chromium/src/WebViewImpl.cpp:778 > + clampedPoint = clampOffsetAtScale(targetPosition, newScale); Four-space indent. 683651 6 155678 yusufo 2012-07-31 17:01:55 -0700 Created attachment 155678 Patch 683652 7 yusufo 2012-07-31 17:02:13 -0700 Thanks a lot! 683796 8 155678 webkit.review.bot 2012-07-31 19:56:11 -0700 Comment on attachment 155678 Patch Clearing flags on attachment: 155678 Committed r124288: <http://trac.webkit.org/changeset/124288> 683797 9 webkit.review.bot 2012-07-31 19:56:15 -0700 All reviewed patches have been landed. Closing bug. 155411 2012-07-30 18:12:53 -0700 2012-07-31 16:13:24 -0700 Patch bug-92698-20120730181237.patch text/plain 2947 yusufo U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MDg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDJjOWQxZjI2YzdjZDllODcyYWViZDJiNDYxMjVjNGVlMDlmNWY4MDIuLjhlMTEwZjRmMDk2MTE2 YzZjZGEyZmRkZDUwMWQ0MWVhM2YyMDEyOGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTItMDctMzAgIFl1c3VmIE96dXlzYWwgIDx5dXN1Zm9AZ29vZ2xl LmNvbT4KKworICAgICAgICBbY2hyb21pdW1dVXBzdHJlYW0gV2ViVmlld0ltcGw6U3RhcnRQYWdl U2NhbGVBbmltYXRpb24gY2hhbmdlcyBmb3IgQ2hyb21lIGZvciBBbmRyb2lkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjY5OAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGl0aW9uYWwgaW5mb3JtYXRp b24gb2YgdGhlIGNoYW5nZSBzdWNoIGFzIGFwcHJvYWNoLCByYXRpb25hbGUuIFBsZWFzZSBhZGQg cGVyLWZ1bmN0aW9uIGRlc2NyaXB0aW9ucyBiZWxvdyAoT09QUyEpLgorCisgICAgICAgICogc3Jj L1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnN0YXJ0UGFn ZVNjYWxlQW5pbWF0aW9uKToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuaDoKKyAgICAgICAg KFdlYlZpZXdJbXBsKToKKwogMjAxMi0wNy0zMCAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3 LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEyNDAy NS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNw cCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCA3YzZk YTYwZDkzYWJmNmYxMzBiMGIyMTc5N2UwYTMzMzYyODM3MDc4Li4zMTVlYzdjNjU3ZDc4MjZlOTE2 NGY1MTVhZTJlY2M1NTg3MmU1ZWMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuY3BwCkBAIC03NjgsMTAgKzc2OCwyMSBAQCB2b2lkIFdlYlZpZXdJbXBsOjpyZW5k ZXJpbmdTdGF0cyhXZWJSZW5kZXJpbmdTdGF0cyYgc3RhdHMpIGNvbnN0CiAgICAgICAgIG1fbGF5 ZXJUcmVlVmlldy5yZW5kZXJpbmdTdGF0cyhzdGF0cyk7CiB9CiAKLXZvaWQgV2ViVmlld0ltcGw6 OnN0YXJ0UGFnZVNjYWxlQW5pbWF0aW9uKGNvbnN0IEludFBvaW50JiBzY3JvbGwsIGJvb2wgdXNl QW5jaG9yLCBmbG9hdCBuZXdTY2FsZSwgZG91YmxlIGR1cmF0aW9uSW5TZWNvbmRzKQordm9pZCBX ZWJWaWV3SW1wbDo6c3RhcnRQYWdlU2NhbGVBbmltYXRpb24oY29uc3QgV2ViUG9pbnQmIHRhcmdl dFBvc2l0aW9uLCBib29sIHVzZUFuY2hvciwgZmxvYXQgbmV3U2NhbGUsIGRvdWJsZSBkdXJhdGlv blNlYykKIHsKLSAgICBpZiAoIW1fbGF5ZXJUcmVlVmlldy5pc051bGwoKSkKLSAgICAgICAgbV9s YXllclRyZWVWaWV3LnN0YXJ0UGFnZVNjYWxlQW5pbWF0aW9uKHNjcm9sbCwgdXNlQW5jaG9yLCBu ZXdTY2FsZSwgZHVyYXRpb25JblNlY29uZHMpOworICAgIGlmIChtX2xheWVyVHJlZVZpZXcuaXNO dWxsKCkpCisgICAgICAgIHJldHVybjsKKworICAgIFdlYlBvaW50IGNsYW1wZWRQb2ludCA9IHRh cmdldFBvc2l0aW9uOworICAgIGlmICghdXNlQW5jaG9yKQorICAgICAgY2xhbXBlZFBvaW50ID0g Y2xhbXBPZmZzZXRBdFNjYWxlKHRhcmdldFBvc2l0aW9uLCBuZXdTY2FsZSk7CisKKyAgICBpZiAo IWR1cmF0aW9uU2VjICYmICF1c2VBbmNob3IpIHsKKyAgICAgIHNldFBhZ2VTY2FsZUZhY3Rvcihu ZXdTY2FsZSwgY2xhbXBlZFBvaW50KTsKKyAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBtX2xh eWVyVHJlZVZpZXcuc3RhcnRQYWdlU2NhbGVBbmltYXRpb24odGFyZ2V0UG9zaXRpb24sIHVzZUFu Y2hvciwgbmV3U2NhbGUsIGR1cmF0aW9uU2VjKTsKIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAppbmRleCA2MzlkNWU2MWFkOWQwYjNkMmY1ZDJmZDc2 NWIyYWJmNGMwZTZhOTI4Li5iMWJlNDdkMzU0MjIxZDU5ZTYyNGFhYzIzZTk3ZjcwNjA0NDBkNWM2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCisr KyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKQEAgLTM4Miw3ICsz ODIsNyBAQCBwdWJsaWM6CiAgICAgLy8gRXZlbnQgcmVsYXRlZCBtZXRob2RzOgogICAgIHZvaWQg bW91c2VDb250ZXh0TWVudShjb25zdCBXZWJNb3VzZUV2ZW50Jik7CiAgICAgdm9pZCBtb3VzZURv dWJsZUNsaWNrKGNvbnN0IFdlYk1vdXNlRXZlbnQmKTsKLSAgICB2b2lkIHN0YXJ0UGFnZVNjYWxl QW5pbWF0aW9uKGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiB0YXJnZXRQb3NpdGlvbiwgYm9vbCB1 c2VBbmNob3IsIGZsb2F0IG5ld1NjYWxlLCBkb3VibGUgZHVyYXRpb25JblNlY29uZHMpOworICAg IHZvaWQgc3RhcnRQYWdlU2NhbGVBbmltYXRpb24oY29uc3QgV2ViUG9pbnQmIHRhcmdldFBvc2l0 aW9uLCBib29sIHVzZUFuY2hvciwgZmxvYXQgbmV3U2NhbGUsIGRvdWJsZSBkdXJhdGlvblNlYyk7 CiAKICAgICB2b2lkIG51bWJlck9mV2hlZWxFdmVudEhhbmRsZXJzQ2hhbmdlZCh1bnNpZ25lZCk7 CiAgICAgdm9pZCBoYXNUb3VjaEV2ZW50SGFuZGxlcnMoYm9vbCk7Cg== 155663 2012-07-31 16:13:27 -0700 2012-07-31 16:26:45 -0700 Patch bug-92698-20120731161310.patch text/plain 2130 yusufo U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MDg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDJjOWQxZjI2YzdjZDllODcyYWViZDJiNDYxMjVjNGVlMDlmNWY4MDIuLmQ3NTE2NTRkZThlYjc2 NDQzOTAwOTZjMjk1NmYwMjkwMDVkYTgzNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTItMDctMzAgIFl1c3VmIE96dXlzYWwgIDx5dXN1Zm9AZ29vZ2xl LmNvbT4KKworICAgICAgICBbY2hyb21pdW1dVXBzdHJlYW0gV2ViVmlld0ltcGw6U3RhcnRQYWdl U2NhbGVBbmltYXRpb24gY2hhbmdlcyBmb3IgQ2hyb21lIGZvciBBbmRyb2lkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjY5OAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuZm9yY2UgdGhlIG1heGltdW0g YW5kIG1pbmltdW0gc2Nyb2xsIHBvc2l0aW9ucyBhZnRlciB0aGUgc2NhbGUgaGFzIGNoYW5nZWQu CisKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJW aWV3SW1wbDo6c3RhcnRQYWdlU2NhbGVBbmltYXRpb24pOgorICAgICAgICAqIHNyYy9XZWJWaWV3 SW1wbC5oOgorICAgICAgICAoV2ViVmlld0ltcGwpOgorCiAyMDEyLTA3LTMwICBTaGVyaWZmIEJv dCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBy b2xsaW5nIG91dCByMTI0MDI1LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuY3BwCmluZGV4IDdjNmRhNjBkOTNhYmY2ZjEzMGIwYjIxNzk3ZTBhMzMzNjI4MzcwNzguLjA0 NzdlMzVlOGFmNTY0MzRhZDY1YzBmZjg1Y2VlOWRhNmRiZThmZTUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTc2OCwxMCArNzY4LDIxIEBAIHZvaWQg V2ViVmlld0ltcGw6OnJlbmRlcmluZ1N0YXRzKFdlYlJlbmRlcmluZ1N0YXRzJiBzdGF0cykgY29u c3QKICAgICAgICAgbV9sYXllclRyZWVWaWV3LnJlbmRlcmluZ1N0YXRzKHN0YXRzKTsKIH0KIAot dm9pZCBXZWJWaWV3SW1wbDo6c3RhcnRQYWdlU2NhbGVBbmltYXRpb24oY29uc3QgSW50UG9pbnQm IHNjcm9sbCwgYm9vbCB1c2VBbmNob3IsIGZsb2F0IG5ld1NjYWxlLCBkb3VibGUgZHVyYXRpb25J blNlY29uZHMpCit2b2lkIFdlYlZpZXdJbXBsOjpzdGFydFBhZ2VTY2FsZUFuaW1hdGlvbihjb25z dCBJbnRQb2ludCYgdGFyZ2V0UG9zaXRpb24sIGJvb2wgdXNlQW5jaG9yLCBmbG9hdCBuZXdTY2Fs ZSwgZG91YmxlIGR1cmF0aW9uSW5TZWNvbmRzKQogewotICAgIGlmICghbV9sYXllclRyZWVWaWV3 LmlzTnVsbCgpKQotICAgICAgICBtX2xheWVyVHJlZVZpZXcuc3RhcnRQYWdlU2NhbGVBbmltYXRp b24oc2Nyb2xsLCB1c2VBbmNob3IsIG5ld1NjYWxlLCBkdXJhdGlvbkluU2Vjb25kcyk7CisgICAg aWYgKG1fbGF5ZXJUcmVlVmlldy5pc051bGwoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgSW50 UG9pbnQgY2xhbXBlZFBvaW50ID0gdGFyZ2V0UG9zaXRpb247CisgICAgaWYgKCF1c2VBbmNob3Ip CisgICAgICBjbGFtcGVkUG9pbnQgPSBjbGFtcE9mZnNldEF0U2NhbGUodGFyZ2V0UG9zaXRpb24s IG5ld1NjYWxlKTsKKworICAgIGlmICghZHVyYXRpb25JblNlY29uZHMgJiYgIXVzZUFuY2hvcikg eworICAgICAgc2V0UGFnZVNjYWxlRmFjdG9yKG5ld1NjYWxlLCBjbGFtcGVkUG9pbnQpOworICAg ICAgcmV0dXJuOworICAgIH0KKworICAgIG1fbGF5ZXJUcmVlVmlldy5zdGFydFBhZ2VTY2FsZUFu aW1hdGlvbih0YXJnZXRQb3NpdGlvbiwgdXNlQW5jaG9yLCBuZXdTY2FsZSwgZHVyYXRpb25JblNl Y29uZHMpOwogfQogI2VuZGlmCiAK 155670 2012-07-31 16:26:47 -0700 2012-07-31 17:01:52 -0700 Patch bug-92698-20120731162630.patch text/plain 2134 yusufo U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MDg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDJjOWQxZjI2YzdjZDllODcyYWViZDJiNDYxMjVjNGVlMDlmNWY4MDIuLmQ3NTE2NTRkZThlYjc2 NDQzOTAwOTZjMjk1NmYwMjkwMDVkYTgzNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTItMDctMzAgIFl1c3VmIE96dXlzYWwgIDx5dXN1Zm9AZ29vZ2xl LmNvbT4KKworICAgICAgICBbY2hyb21pdW1dVXBzdHJlYW0gV2ViVmlld0ltcGw6U3RhcnRQYWdl U2NhbGVBbmltYXRpb24gY2hhbmdlcyBmb3IgQ2hyb21lIGZvciBBbmRyb2lkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjY5OAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuZm9yY2UgdGhlIG1heGltdW0g YW5kIG1pbmltdW0gc2Nyb2xsIHBvc2l0aW9ucyBhZnRlciB0aGUgc2NhbGUgaGFzIGNoYW5nZWQu CisKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJW aWV3SW1wbDo6c3RhcnRQYWdlU2NhbGVBbmltYXRpb24pOgorICAgICAgICAqIHNyYy9XZWJWaWV3 SW1wbC5oOgorICAgICAgICAoV2ViVmlld0ltcGwpOgorCiAyMDEyLTA3LTMwICBTaGVyaWZmIEJv dCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBy b2xsaW5nIG91dCByMTI0MDI1LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuY3BwCmluZGV4IDdjNmRhNjBkOTNhYmY2ZjEzMGIwYjIxNzk3ZTBhMzMzNjI4MzcwNzguLmZl NzkxZjAxMWFjYTNmZmRmY2Q5NmZlMjYyMWI0OTQxNTI2MTk4MDcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTc2OCwxMCArNzY4LDIxIEBAIHZvaWQg V2ViVmlld0ltcGw6OnJlbmRlcmluZ1N0YXRzKFdlYlJlbmRlcmluZ1N0YXRzJiBzdGF0cykgY29u c3QKICAgICAgICAgbV9sYXllclRyZWVWaWV3LnJlbmRlcmluZ1N0YXRzKHN0YXRzKTsKIH0KIAot dm9pZCBXZWJWaWV3SW1wbDo6c3RhcnRQYWdlU2NhbGVBbmltYXRpb24oY29uc3QgSW50UG9pbnQm IHNjcm9sbCwgYm9vbCB1c2VBbmNob3IsIGZsb2F0IG5ld1NjYWxlLCBkb3VibGUgZHVyYXRpb25J blNlY29uZHMpCit2b2lkIFdlYlZpZXdJbXBsOjpzdGFydFBhZ2VTY2FsZUFuaW1hdGlvbihjb25z dCBJbnRQb2ludCYgdGFyZ2V0UG9zaXRpb24sIGJvb2wgdXNlQW5jaG9yLCBmbG9hdCBuZXdTY2Fs ZSwgZG91YmxlIGR1cmF0aW9uSW5TZWNvbmRzKQogewotICAgIGlmICghbV9sYXllclRyZWVWaWV3 LmlzTnVsbCgpKQotICAgICAgICBtX2xheWVyVHJlZVZpZXcuc3RhcnRQYWdlU2NhbGVBbmltYXRp b24oc2Nyb2xsLCB1c2VBbmNob3IsIG5ld1NjYWxlLCBkdXJhdGlvbkluU2Vjb25kcyk7CisgICAg aWYgKG1fbGF5ZXJUcmVlVmlldy5pc051bGwoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgSW50 UG9pbnQgY2xhbXBlZFBvaW50ID0gdGFyZ2V0UG9zaXRpb247CisgICAgaWYgKCF1c2VBbmNob3Ip CisgICAgICBjbGFtcGVkUG9pbnQgPSBjbGFtcE9mZnNldEF0U2NhbGUodGFyZ2V0UG9zaXRpb24s IG5ld1NjYWxlKTsKKworICAgIGlmICghZHVyYXRpb25JblNlY29uZHMgJiYgIXVzZUFuY2hvcikg eworICAgICAgICBzZXRQYWdlU2NhbGVGYWN0b3IobmV3U2NhbGUsIGNsYW1wZWRQb2ludCk7Cisg ICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBtX2xheWVyVHJlZVZpZXcuc3RhcnRQYWdlU2Nh bGVBbmltYXRpb24odGFyZ2V0UG9zaXRpb24sIHVzZUFuY2hvciwgbmV3U2NhbGUsIGR1cmF0aW9u SW5TZWNvbmRzKTsKIH0KICNlbmRpZgogCg== 155678 2012-07-31 17:01:55 -0700 2012-07-31 19:56:11 -0700 Patch bug-92698-20120731170138.patch text/plain 2136 yusufo U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MDg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDJjOWQxZjI2YzdjZDllODcyYWViZDJiNDYxMjVjNGVlMDlmNWY4MDIuLmQ3NTE2NTRkZThlYjc2 NDQzOTAwOTZjMjk1NmYwMjkwMDVkYTgzNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTItMDctMzAgIFl1c3VmIE96dXlzYWwgIDx5dXN1Zm9AZ29vZ2xl LmNvbT4KKworICAgICAgICBbY2hyb21pdW1dVXBzdHJlYW0gV2ViVmlld0ltcGw6U3RhcnRQYWdl U2NhbGVBbmltYXRpb24gY2hhbmdlcyBmb3IgQ2hyb21lIGZvciBBbmRyb2lkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjY5OAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuZm9yY2UgdGhlIG1heGltdW0g YW5kIG1pbmltdW0gc2Nyb2xsIHBvc2l0aW9ucyBhZnRlciB0aGUgc2NhbGUgaGFzIGNoYW5nZWQu CisKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJW aWV3SW1wbDo6c3RhcnRQYWdlU2NhbGVBbmltYXRpb24pOgorICAgICAgICAqIHNyYy9XZWJWaWV3 SW1wbC5oOgorICAgICAgICAoV2ViVmlld0ltcGwpOgorCiAyMDEyLTA3LTMwICBTaGVyaWZmIEJv dCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBy b2xsaW5nIG91dCByMTI0MDI1LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuY3BwCmluZGV4IDdjNmRhNjBkOTNhYmY2ZjEzMGIwYjIxNzk3ZTBhMzMzNjI4MzcwNzguLjE4 YzkyMmQ1ZjE1NWE3MTcyZjI1Mjc1M2VhZTYyM2Y1MjE2MzA3ZWIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTc2OCwxMCArNzY4LDIxIEBAIHZvaWQg V2ViVmlld0ltcGw6OnJlbmRlcmluZ1N0YXRzKFdlYlJlbmRlcmluZ1N0YXRzJiBzdGF0cykgY29u c3QKICAgICAgICAgbV9sYXllclRyZWVWaWV3LnJlbmRlcmluZ1N0YXRzKHN0YXRzKTsKIH0KIAot dm9pZCBXZWJWaWV3SW1wbDo6c3RhcnRQYWdlU2NhbGVBbmltYXRpb24oY29uc3QgSW50UG9pbnQm IHNjcm9sbCwgYm9vbCB1c2VBbmNob3IsIGZsb2F0IG5ld1NjYWxlLCBkb3VibGUgZHVyYXRpb25J blNlY29uZHMpCit2b2lkIFdlYlZpZXdJbXBsOjpzdGFydFBhZ2VTY2FsZUFuaW1hdGlvbihjb25z dCBJbnRQb2ludCYgdGFyZ2V0UG9zaXRpb24sIGJvb2wgdXNlQW5jaG9yLCBmbG9hdCBuZXdTY2Fs ZSwgZG91YmxlIGR1cmF0aW9uSW5TZWNvbmRzKQogewotICAgIGlmICghbV9sYXllclRyZWVWaWV3 LmlzTnVsbCgpKQotICAgICAgICBtX2xheWVyVHJlZVZpZXcuc3RhcnRQYWdlU2NhbGVBbmltYXRp b24oc2Nyb2xsLCB1c2VBbmNob3IsIG5ld1NjYWxlLCBkdXJhdGlvbkluU2Vjb25kcyk7CisgICAg aWYgKG1fbGF5ZXJUcmVlVmlldy5pc051bGwoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgSW50 UG9pbnQgY2xhbXBlZFBvaW50ID0gdGFyZ2V0UG9zaXRpb247CisgICAgaWYgKCF1c2VBbmNob3Ip CisgICAgICAgIGNsYW1wZWRQb2ludCA9IGNsYW1wT2Zmc2V0QXRTY2FsZSh0YXJnZXRQb3NpdGlv biwgbmV3U2NhbGUpOworCisgICAgaWYgKCFkdXJhdGlvbkluU2Vjb25kcyAmJiAhdXNlQW5jaG9y KSB7CisgICAgICAgIHNldFBhZ2VTY2FsZUZhY3RvcihuZXdTY2FsZSwgY2xhbXBlZFBvaW50KTsK KyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIG1fbGF5ZXJUcmVlVmlldy5zdGFydFBhZ2VT Y2FsZUFuaW1hdGlvbih0YXJnZXRQb3NpdGlvbiwgdXNlQW5jaG9yLCBuZXdTY2FsZSwgZHVyYXRp b25JblNlY29uZHMpOwogfQogI2VuZGlmCiAK