102790 2012-11-20 03:44:00 -0800 PageViewportControllerClient::didChangeViewportAttributes called twice 2012-11-20 08:23:47 -0800 1 1 1 Unclassified WebKit WebKit2 420+ Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 allan.jensen allan.jensen abecsi cmarcelo menard webkit.review.bot oldest_to_newest 771723 0 allan.jensen 2012-11-20 03:44:00 -0800 Both PageViewportController::updateMinimumScaleToFit and PageViewportController::didChangeViewportAttributes calls didChangeViewportAttributes on the PageViewportControllerClient, and since the former calls the later this means we end up firing didChangeViewportAttributes twice on the client. 771724 1 175181 allan.jensen 2012-11-20 03:46:32 -0800 Created attachment 175181 Patch 771725 2 175182 allan.jensen 2012-11-20 03:47:42 -0800 Created attachment 175182 Patch Accidently uploaded unrelated change 771755 3 175182 kenneth 2012-11-20 04:48:38 -0800 Comment on attachment 175182 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175182&action=review > Source/WebKit2/UIProcess/PageViewportController.cpp:218 > + updateMinimumScaleToFit(false); wouldn't it be nicer if it returned a bool instead? 771760 4 allan.jensen 2012-11-20 04:57:39 -0800 (In reply to comment #3) > (From update of attachment 175182 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=175182&action=review > > > Source/WebKit2/UIProcess/PageViewportController.cpp:218 > > + updateMinimumScaleToFit(false); > > wouldn't it be nicer if it returned a bool instead? Perhaps. I am fine with either way. 771778 5 abecsi 2012-11-20 05:36:19 -0800 (In reply to comment #4) > (In reply to comment #3) > > (From update of attachment 175182 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=175182&action=review > > > > > Source/WebKit2/UIProcess/PageViewportController.cpp:218 > > > + updateMinimumScaleToFit(false); > > > > wouldn't it be nicer if it returned a bool instead? > > Perhaps. I am fine with either way. I also think returning a bool indicating whether it updated the minimum size or not is the preferred pattern instead of a bool argument. 771831 6 175209 allan.jensen 2012-11-20 06:59:10 -0800 Created attachment 175209 Patch 771873 7 175209 kenneth 2012-11-20 07:58:29 -0800 Comment on attachment 175209 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175209&action=review > Source/WebKit2/UIProcess/PageViewportController.cpp:108 > + if (updateMinimumScaleToFit()) Maybe that should ahve IfNeeded() added? 771884 8 allan.jensen 2012-11-20 08:15:34 -0800 (In reply to comment #7) > (From update of attachment 175209 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=175209&action=review > > > Source/WebKit2/UIProcess/PageViewportController.cpp:108 > > + if (updateMinimumScaleToFit()) > > Maybe that should ahve IfNeeded() added? I don't feel that is necessary for a method name starting with update, since update usually means to change something if needed. 771891 9 allan.jensen 2012-11-20 08:23:47 -0800 Committed r135283: <http://trac.webkit.org/changeset/135283> 175181 2012-11-20 03:46:32 -0800 2012-11-20 03:47:39 -0800 Patch bug-102790-20121120124355.patch text/plain 3870 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1MjcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmQ1NTkyYmZkOTFlMWJm YjQ1MDU3OTU4MTRkYmZmMmJjYWJhMDc5Mi4uYmVhZmFiNzM3ZjFlYzcwYjI3MGUwMDE3NGUwM2Qw MjhhNjU0ZDBiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTExLTIwICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudDo6ZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1 dGVzIGNhbGxlZCB0d2ljZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTAyNzkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgRG8gbm90IGNhbGwgUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudDo6ZGlkQ2hh bmdlVmlld3BvcnRBdHRyaWJ1dGVzIGZyb20gdXBkYXRlTWluaW11bVNjYWxlVG9GaXQKKyAgICAg ICAgaWYgdGhlIGNhbGxlciBpcyBnb2luZyB0byBjYWxsIGl0IGFueXdheS4KKworICAgICAgICAq IFVJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 UGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6ZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1dGVzKToKKyAg ICAgICAgKFdlYktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6dXBkYXRlTWluaW11bVNjYWxl VG9GaXQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmg6Cisg ICAgICAgIChQYWdlVmlld3BvcnRDb250cm9sbGVyKToKKwogMjAxMi0xMS0xOSAgS3l1bmdUYWUg S2ltICA8a3RmLmtpbUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBbV0syXSBVbnVzZWQgcGFyYW1l dGVycyBvbiBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5jcHAKaW5kZXggMmU3MjU0YTEy ODk0MGM3NDFhMTQ1NjJiZDc2NjIxNzU1ZjViMWVlOS4uOTBiMjAzNjRlM2RhNjEzM2U4NWE1YWY4 NjJlZTc0YmI2YzNlMjQ4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Bh Z2VWaWV3cG9ydENvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Q YWdlVmlld3BvcnRDb250cm9sbGVyLmNwcApAQCAtMjE1LDcgKzIxNSw3IEBAIHZvaWQgUGFnZVZp ZXdwb3J0Q29udHJvbGxlcjo6ZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1dGVzKGNvbnN0IFdlYkNv cmU6OlZpZXdwb3J0CiAgICAgV2ViQ29yZTo6cmVzdHJpY3RTY2FsZUZhY3RvclRvSW5pdGlhbFNj YWxlSWZOb3RVc2VyU2NhbGFibGUobV9yYXdBdHRyaWJ1dGVzKTsKIAogICAgIG1fYWxsb3dzVXNl clNjYWxpbmcgPSAhIW1fcmF3QXR0cmlidXRlcy51c2VyU2NhbGFibGU7Ci0gICAgdXBkYXRlTWlu aW11bVNjYWxlVG9GaXQoKTsKKyAgICB1cGRhdGVNaW5pbXVtU2NhbGVUb0ZpdChmYWxzZSk7CiAK ICAgICBtX2NsaWVudC0+ZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1dGVzKCk7CiB9CkBAIC0yNTks NyArMjU5LDcgQEAgdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjphcHBseVBvc2l0aW9uQWZ0 ZXJSZW5kZXJpbmdDb250ZW50cyhjb25zdCBGbG9hdFBvaW4KICAgICBzeW5jVmlzaWJsZUNvbnRl bnRzKCk7CiB9CiAKLXZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6dXBkYXRlTWluaW11bVNj YWxlVG9GaXQoKQordm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjp1cGRhdGVNaW5pbXVtU2Nh bGVUb0ZpdChib29sIG5vdGlmeUNsaWVudCkKIHsKICAgICBpZiAobV92aWV3cG9ydFNpemUuaXNF bXB0eSgpKQogICAgICAgICByZXR1cm47CkBAIC0yNzIsNyArMjcyLDggQEAgdm9pZCBQYWdlVmll d3BvcnRDb250cm9sbGVyOjp1cGRhdGVNaW5pbXVtU2NhbGVUb0ZpdCgpCiAgICAgICAgIGlmICgh bV9oYWRVc2VySW50ZXJhY3Rpb24gJiYgIWhhc1N1c3BlbmRlZENvbnRlbnQoKSkKICAgICAgICAg ICAgIGFwcGx5U2NhbGVBZnRlclJlbmRlcmluZ0NvbnRlbnRzKHRvVmlld3BvcnRTY2FsZShtaW5p bXVtU2NhbGUpKTsKIAotICAgICAgICBtX2NsaWVudC0+ZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1 dGVzKCk7CisgICAgICAgIGlmIChub3RpZnlDbGllbnQpCisgICAgICAgICAgICBtX2NsaWVudC0+ ZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1dGVzKCk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5oIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuaAppbmRleCA5NzQ2MzIx NmI5ODc0Y2E1YzM5YTgwNDNkNjg5MzY4YTkzNzAxZjc2Li43NWUyOWIwNWE5Y2RhYjZmN2E4MTc5 YjZmZjJlMDc0Yzc5OWRjMGRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv UGFnZVZpZXdwb3J0Q29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Q YWdlVmlld3BvcnRDb250cm9sbGVyLmgKQEAgLTg0LDcgKzg0LDcgQEAgcHJpdmF0ZToKICAgICB2 b2lkIHN5bmNWaXNpYmxlQ29udGVudHMoY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCAmdHJhamVj dG9yeVZlY3RvciA9IFdlYkNvcmU6OkZsb2F0UG9pbnQ6Onplcm8oKSk7CiAgICAgdm9pZCBhcHBs eVNjYWxlQWZ0ZXJSZW5kZXJpbmdDb250ZW50cyhmbG9hdCBzY2FsZSk7CiAgICAgdm9pZCBhcHBs eVBvc2l0aW9uQWZ0ZXJSZW5kZXJpbmdDb250ZW50cyhjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50 JiBwb3MpOwotICAgIHZvaWQgdXBkYXRlTWluaW11bVNjYWxlVG9GaXQoKTsKKyAgICB2b2lkIHVw ZGF0ZU1pbmltdW1TY2FsZVRvRml0KGJvb2wgbm90aWZ5Q2xpZW50ID0gdHJ1ZSk7CiAgICAgV2Vi Q29yZTo6RmxvYXRTaXplIHZpZXdwb3J0U2l6ZUluQ29udGVudHNDb29yZGluYXRlcygpIGNvbnN0 OwogCiAgICAgV2ViUGFnZVByb3h5KiBjb25zdCBtX3dlYlBhZ2VQcm94eTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50 UXQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENvbnRyb2xs ZXJDbGllbnRRdC5jcHAKaW5kZXggYTU1ZmQ5MTk3ZGEzYmZiZWEwNTExMjUxZWM4OTg1OTRhZGQz YWI5ZS4uYTQyY2M5ZWFlZmJlNDY0YzQ0NjU5NWM0Y2EwNDIyYjAzZDU3ZjFmMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGll bnRRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENv bnRyb2xsZXJDbGllbnRRdC5jcHAKQEAgLTQ5MCw2ICs0OTAsNyBAQCB2b2lkIFBhZ2VWaWV3cG9y dENvbnRyb2xsZXJDbGllbnRRdDo6ZGlkQ2hhbmdlVmlzaWJsZUNvbnRlbnRzKCkKIAogdm9pZCBQ YWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50UXQ6OmRpZENoYW5nZVZpZXdwb3J0QXR0cmlidXRl cygpCiB7CisgICAgbV9zY2FsZVN0YWNrLmNsZWFyKCk7CiAgICAgZW1pdCBtX3ZpZXdwb3J0SXRl bS0+ZXhwZXJpbWVudGFsKCktPnRlc3QoKS0+dmlld3BvcnRDaGFuZ2VkKCk7CiB9CiAK 175182 2012-11-20 03:47:42 -0800 2012-11-20 06:59:07 -0800 Patch bug-102790-20121120124505.patch text/plain 3237 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1MjcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmQ1NTkyYmZkOTFlMWJm YjQ1MDU3OTU4MTRkYmZmMmJjYWJhMDc5Mi4uYmVhZmFiNzM3ZjFlYzcwYjI3MGUwMDE3NGUwM2Qw MjhhNjU0ZDBiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTExLTIwICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudDo6ZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1 dGVzIGNhbGxlZCB0d2ljZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTAyNzkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgRG8gbm90IGNhbGwgUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudDo6ZGlkQ2hh bmdlVmlld3BvcnRBdHRyaWJ1dGVzIGZyb20gdXBkYXRlTWluaW11bVNjYWxlVG9GaXQKKyAgICAg ICAgaWYgdGhlIGNhbGxlciBpcyBnb2luZyB0byBjYWxsIGl0IGFueXdheS4KKworICAgICAgICAq IFVJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 UGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6ZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1dGVzKToKKyAg ICAgICAgKFdlYktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6dXBkYXRlTWluaW11bVNjYWxl VG9GaXQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmg6Cisg ICAgICAgIChQYWdlVmlld3BvcnRDb250cm9sbGVyKToKKwogMjAxMi0xMS0xOSAgS3l1bmdUYWUg S2ltICA8a3RmLmtpbUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBbV0syXSBVbnVzZWQgcGFyYW1l dGVycyBvbiBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5jcHAKaW5kZXggMmU3MjU0YTEy ODk0MGM3NDFhMTQ1NjJiZDc2NjIxNzU1ZjViMWVlOS4uOTBiMjAzNjRlM2RhNjEzM2U4NWE1YWY4 NjJlZTc0YmI2YzNlMjQ4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Bh Z2VWaWV3cG9ydENvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Q YWdlVmlld3BvcnRDb250cm9sbGVyLmNwcApAQCAtMjE1LDcgKzIxNSw3IEBAIHZvaWQgUGFnZVZp ZXdwb3J0Q29udHJvbGxlcjo6ZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1dGVzKGNvbnN0IFdlYkNv cmU6OlZpZXdwb3J0CiAgICAgV2ViQ29yZTo6cmVzdHJpY3RTY2FsZUZhY3RvclRvSW5pdGlhbFNj YWxlSWZOb3RVc2VyU2NhbGFibGUobV9yYXdBdHRyaWJ1dGVzKTsKIAogICAgIG1fYWxsb3dzVXNl clNjYWxpbmcgPSAhIW1fcmF3QXR0cmlidXRlcy51c2VyU2NhbGFibGU7Ci0gICAgdXBkYXRlTWlu aW11bVNjYWxlVG9GaXQoKTsKKyAgICB1cGRhdGVNaW5pbXVtU2NhbGVUb0ZpdChmYWxzZSk7CiAK ICAgICBtX2NsaWVudC0+ZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1dGVzKCk7CiB9CkBAIC0yNTks NyArMjU5LDcgQEAgdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjphcHBseVBvc2l0aW9uQWZ0 ZXJSZW5kZXJpbmdDb250ZW50cyhjb25zdCBGbG9hdFBvaW4KICAgICBzeW5jVmlzaWJsZUNvbnRl bnRzKCk7CiB9CiAKLXZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6dXBkYXRlTWluaW11bVNj YWxlVG9GaXQoKQordm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjp1cGRhdGVNaW5pbXVtU2Nh bGVUb0ZpdChib29sIG5vdGlmeUNsaWVudCkKIHsKICAgICBpZiAobV92aWV3cG9ydFNpemUuaXNF bXB0eSgpKQogICAgICAgICByZXR1cm47CkBAIC0yNzIsNyArMjcyLDggQEAgdm9pZCBQYWdlVmll d3BvcnRDb250cm9sbGVyOjp1cGRhdGVNaW5pbXVtU2NhbGVUb0ZpdCgpCiAgICAgICAgIGlmICgh bV9oYWRVc2VySW50ZXJhY3Rpb24gJiYgIWhhc1N1c3BlbmRlZENvbnRlbnQoKSkKICAgICAgICAg ICAgIGFwcGx5U2NhbGVBZnRlclJlbmRlcmluZ0NvbnRlbnRzKHRvVmlld3BvcnRTY2FsZShtaW5p bXVtU2NhbGUpKTsKIAotICAgICAgICBtX2NsaWVudC0+ZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1 dGVzKCk7CisgICAgICAgIGlmIChub3RpZnlDbGllbnQpCisgICAgICAgICAgICBtX2NsaWVudC0+ ZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1dGVzKCk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5oIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuaAppbmRleCA5NzQ2MzIx NmI5ODc0Y2E1YzM5YTgwNDNkNjg5MzY4YTkzNzAxZjc2Li43NWUyOWIwNWE5Y2RhYjZmN2E4MTc5 YjZmZjJlMDc0Yzc5OWRjMGRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv UGFnZVZpZXdwb3J0Q29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Q YWdlVmlld3BvcnRDb250cm9sbGVyLmgKQEAgLTg0LDcgKzg0LDcgQEAgcHJpdmF0ZToKICAgICB2 b2lkIHN5bmNWaXNpYmxlQ29udGVudHMoY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCAmdHJhamVj dG9yeVZlY3RvciA9IFdlYkNvcmU6OkZsb2F0UG9pbnQ6Onplcm8oKSk7CiAgICAgdm9pZCBhcHBs eVNjYWxlQWZ0ZXJSZW5kZXJpbmdDb250ZW50cyhmbG9hdCBzY2FsZSk7CiAgICAgdm9pZCBhcHBs eVBvc2l0aW9uQWZ0ZXJSZW5kZXJpbmdDb250ZW50cyhjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50 JiBwb3MpOwotICAgIHZvaWQgdXBkYXRlTWluaW11bVNjYWxlVG9GaXQoKTsKKyAgICB2b2lkIHVw ZGF0ZU1pbmltdW1TY2FsZVRvRml0KGJvb2wgbm90aWZ5Q2xpZW50ID0gdHJ1ZSk7CiAgICAgV2Vi Q29yZTo6RmxvYXRTaXplIHZpZXdwb3J0U2l6ZUluQ29udGVudHNDb29yZGluYXRlcygpIGNvbnN0 OwogCiAgICAgV2ViUGFnZVByb3h5KiBjb25zdCBtX3dlYlBhZ2VQcm94eTsK 175209 2012-11-20 06:59:10 -0800 2012-11-20 07:58:29 -0800 Patch bug-102790-20121120155633.patch text/plain 3524 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1MjcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZDZmZmY3ODQyYzZmOTNm Yjk3MDNlYTk0NTAyZGYzYjM5MWUyNzczYy4uOGU5NjJiMDVlYTc0MGU5MjU3MjVkY2M2MmE4MDMw ZjVmYjNjNzEwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDEyLTExLTIwICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgogCisgICAgICAgIFtR dF0gUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudDo6ZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1 dGVzIGNhbGxlZCB0d2ljZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTAyNzkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQ2hhbmdlIHVwZGF0ZU1pbmltdW1TY2FsZVRvRml0IHRvIG5vIGxvbmdlciBjYWxs IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnQ6OmRpZENoYW5nZVZpZXdwb3J0QXR0cmlidXRl cywKKyAgICAgICAgYnV0IGluc3RlYWQgcmV0dXJuIHdoZXRoZXIgaXQgaGFzIGNoYW5nZWQgdGhl IG1pbmltdW1TY2FsZVRvRml0LgorCisgICAgICAgICogVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENv bnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyOjpk aWRDaGFuZ2VDb250ZW50c1NpemUpOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250 cm9sbGVyOjp1cGRhdGVNaW5pbXVtU2NhbGVUb0ZpdCk6CisgICAgICAgICogVUlQcm9jZXNzL1Bh Z2VWaWV3cG9ydENvbnRyb2xsZXIuaDoKKyAgICAgICAgKFBhZ2VWaWV3cG9ydENvbnRyb2xsZXIp OgorCisyMDEyLTExLTIwICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGln aWEuY29tPgorCiAgICAgICAgIFtRdF0gTm8gdGVzdCBvZiBkb3VibGUtY2xpY2sgdG8gem9vbSBv dXQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjgx MAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29u dHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJv bGxlci5jcHAKaW5kZXggMmU3MjU0YTEyODk0MGM3NDFhMTQ1NjJiZDc2NjIxNzU1ZjViMWVlOS4u N2NhMGE5M2IyZmUyMzFiM2U1NDhiMWM1MTY2NzRjNzMyNTE0ZDg2YiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmNwcApAQCAtMTA1 LDcgKzEwNSw4IEBAIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6ZGlkQ29tbWl0TG9hZCgp CiB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OmRpZENoYW5nZUNvbnRlbnRzU2l6ZShjb25z dCBJbnRTaXplJiBuZXdTaXplKQogewogICAgIG1fY29udGVudHNTaXplID0gbmV3U2l6ZTsKLSAg ICB1cGRhdGVNaW5pbXVtU2NhbGVUb0ZpdCgpOworICAgIGlmICh1cGRhdGVNaW5pbXVtU2NhbGVU b0ZpdCgpKQorICAgICAgICBtX2NsaWVudC0+ZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1dGVzKCk7 CiB9CiAKIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6ZGlkUmVuZGVyRnJhbWUoY29uc3Qg SW50U2l6ZSYgY29udGVudHNTaXplLCBjb25zdCBJbnRSZWN0JiBjb3ZlcmVkUmVjdCkKQEAgLTI1 OSwxMCArMjYwLDEwIEBAIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6YXBwbHlQb3NpdGlv bkFmdGVyUmVuZGVyaW5nQ29udGVudHMoY29uc3QgRmxvYXRQb2luCiAgICAgc3luY1Zpc2libGVD b250ZW50cygpOwogfQogCi12b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OnVwZGF0ZU1pbmlt dW1TY2FsZVRvRml0KCkKK2Jvb2wgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6dXBkYXRlTWluaW11 bVNjYWxlVG9GaXQoKQogewogICAgIGlmIChtX3ZpZXdwb3J0U2l6ZS5pc0VtcHR5KCkpCi0gICAg ICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgZmxvYXQgbWluaW11bVNj YWxlID0gV2ViQ29yZTo6Y29tcHV0ZU1pbmltdW1TY2FsZUZhY3RvckZvckNvbnRlbnRDb250YWlu ZWQobV9yYXdBdHRyaWJ1dGVzLCBXZWJDb3JlOjpyb3VuZGVkSW50U2l6ZShtX3ZpZXdwb3J0U2l6 ZSksIFdlYkNvcmU6OnJvdW5kZWRJbnRTaXplKG1fY29udGVudHNTaXplKSwgZGV2aWNlUGl4ZWxS YXRpbygpKTsKIApAQCAtMjcyLDggKzI3Myw5IEBAIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxl cjo6dXBkYXRlTWluaW11bVNjYWxlVG9GaXQoKQogICAgICAgICBpZiAoIW1faGFkVXNlckludGVy YWN0aW9uICYmICFoYXNTdXNwZW5kZWRDb250ZW50KCkpCiAgICAgICAgICAgICBhcHBseVNjYWxl QWZ0ZXJSZW5kZXJpbmdDb250ZW50cyh0b1ZpZXdwb3J0U2NhbGUobWluaW11bVNjYWxlKSk7CiAK LSAgICAgICAgbV9jbGllbnQtPmRpZENoYW5nZVZpZXdwb3J0QXR0cmlidXRlcygpOworICAgICAg ICByZXR1cm4gdHJ1ZTsKICAgICB9CisgICAgcmV0dXJuIGZhbHNlOwogfQogCiB9IC8vIG5hbWVz cGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmll d3BvcnRDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0 Q29udHJvbGxlci5oCmluZGV4IDk3NDYzMjE2Yjk4NzRjYTVjMzlhODA0M2Q2ODkzNjhhOTM3MDFm NzYuLjNiZTNkMjc0NTIzZjQ2NTVlMDAyMjI4ODZlOTU3YmM2MWIzNDA1OGYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmgKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuaApAQCAtODQs NyArODQsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgc3luY1Zpc2libGVDb250ZW50cyhjb25zdCBX ZWJDb3JlOjpGbG9hdFBvaW50ICZ0cmFqZWN0b3J5VmVjdG9yID0gV2ViQ29yZTo6RmxvYXRQb2lu dDo6emVybygpKTsKICAgICB2b2lkIGFwcGx5U2NhbGVBZnRlclJlbmRlcmluZ0NvbnRlbnRzKGZs b2F0IHNjYWxlKTsKICAgICB2b2lkIGFwcGx5UG9zaXRpb25BZnRlclJlbmRlcmluZ0NvbnRlbnRz KGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIHBvcyk7Ci0gICAgdm9pZCB1cGRhdGVNaW5pbXVt U2NhbGVUb0ZpdCgpOworICAgIGJvb2wgdXBkYXRlTWluaW11bVNjYWxlVG9GaXQoKTsKICAgICBX ZWJDb3JlOjpGbG9hdFNpemUgdmlld3BvcnRTaXplSW5Db250ZW50c0Nvb3JkaW5hdGVzKCkgY29u c3Q7CiAKICAgICBXZWJQYWdlUHJveHkqIGNvbnN0IG1fd2ViUGFnZVByb3h5Owo=