77339 2012-01-30 07:45:19 -0800 [Qt] Painting on wheel scroll 2012-01-31 09:09:33 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 allan.jensen allan.jensen abecsi menard webkit.review.bot zoltan oldest_to_newest 545095 0 allan.jensen 2012-01-30 07:45:19 -0800 When using the Minibrowser in default touch mode and scroll down a long page using the mouse wheel, you will at some point reach an unpainted part of the screen. Panning the screen using touch-mock will trigger the repaint. The issue seems to be that wheel-scroll does not send new expose events to the web-process. This has been a regression since painting became better optimized. 545096 1 124550 allan.jensen 2012-01-30 07:49:53 -0800 Created attachment 124550 Patch 545114 2 124550 kenneth 2012-01-30 08:26:44 -0800 Comment on attachment 124550 Patch wouldnt it be better to call the viewportTrajectoryVectorChanged ? 545130 3 abecsi 2012-01-30 08:43:55 -0800 I think this is the same issue as https://bugs.webkit.org/show_bug.cgi?id=77338. 545141 4 allan.jensen 2012-01-30 09:00:17 -0800 (In reply to comment #2) > (From update of attachment 124550 [details]) > wouldnt it be better to call the viewportTrajectoryVectorChanged ? TrajectoryVectorChanged only tells which direction we are going to move in, not what we have actually moved. The normal animated process is: On animate start: TrajectoryVectorChanged On animate end: VisibleContentRectAndScaleChanged (called from _q_resume) This is just a non animated version doing the same as animate end. It could be achieved by calling suspend and resume in a quick succession, but that seems silly. 545176 5 abecsi 2012-01-30 09:51:25 -0800 (In reply to comment #3) Having a second look, it is a separate issue, and we need a call to updateVisibleContentRectAndScale on wheel scrolling as well. Sorry for the noise. 545905 6 124550 menard 2012-01-31 03:22:24 -0800 Comment on attachment 124550 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=124550&action=review > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:314 > +void QQuickWebViewPrivate::_q_visibleContentRectAndScaleChanged() Would it be better to make updateVisibleContentRectAndScale a slot? 545955 7 allan.jensen 2012-01-31 05:03:09 -0800 (In reply to comment #6) > (From update of attachment 124550 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=124550&action=review > > > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:314 > > +void QQuickWebViewPrivate::_q_visibleContentRectAndScaleChanged() > > Would it be better to make updateVisibleContentRectAndScale a slot? Well it is in QQuickWebViewPrivate, and all the other slots there have the _q_something form. 545961 8 124550 menard 2012-01-31 05:12:29 -0800 Comment on attachment 124550 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=124550&action=review >>> Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:314 >>> +void QQuickWebViewPrivate::_q_visibleContentRectAndScaleChanged() >> >> Would it be better to make updateVisibleContentRectAndScale a slot? > > Well it is in QQuickWebViewPrivate, and all the other slots there have the _q_something form. and? what is wrong with renaming it? 545962 9 allan.jensen 2012-01-31 05:17:20 -0800 (In reply to comment #8) > (From update of attachment 124550 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=124550&action=review > > >>> Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:314 > >>> +void QQuickWebViewPrivate::_q_visibleContentRectAndScaleChanged() > >> > >> Would it be better to make updateVisibleContentRectAndScale a slot? > > > > Well it is in QQuickWebViewPrivate, and all the other slots there have the _q_something form. > > and? what is wrong with renaming it? Well nothing, but it is called from a other functions, and it seemed like a poor name for a function. I don't know the motivation behind the slot naming scheme, I was just trying to follow it, and it seemed most slots where thin wrappers. 545989 10 124550 hausmann 2012-01-31 06:15:19 -0800 Comment on attachment 124550 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=124550&action=review >>>>> Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:314 >>>>> +void QQuickWebViewPrivate::_q_visibleContentRectAndScaleChanged() >>>> >>>> Would it be better to make updateVisibleContentRectAndScale a slot? >>> >>> Well it is in QQuickWebViewPrivate, and all the other slots there have the _q_something form. >> >> and? what is wrong with renaming it? > > Well nothing, but it is called from a other functions, and it seemed like a poor name for a function. I don't know the motivation behind the slot naming scheme, I was just trying to follow it, and it seemed most slots where thin wrappers. The reason for the _q_ in the name is that those slots are technically visible from the outside - Q_PRIVATE_SLOT only affects how a slot is implemented, not its visibility to the outside. Therefore we introduced the naming convention in Qt to say slots that start with _q_ are "internal" in the ABI/API sense and do not come with any compatibility guarantee. 546000 11 124719 allan.jensen 2012-01-31 06:45:55 -0800 Created attachment 124719 Patch 546003 12 webkit.review.bot 2012-01-31 06:49:48 -0800 Attachment 124719 did not pass style-queue: Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9 Updating OpenSource First, rewinding head to replay your work on top of it... Applying: Fix compilation errors on build-webkit --debug --no-workers on mac. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging LayoutTests/ChangeLog CONFLICT (content): Merge conflict in LayoutTests/ChangeLog Auto-merging LayoutTests/platform/qt/Skipped CONFLICT (content): Merge conflict in LayoutTests/platform/qt/Skipped Auto-merging Source/WebCore/ChangeLog CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog Failed to merge in the changes. Patch failed at 0001 Fix compilation errors on build-webkit --debug --no-workers on mac. When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 164. If any of these errors are false positives, please file a bug against check-webkit-style. 546136 13 124719 webkit.review.bot 2012-01-31 09:09:28 -0800 Comment on attachment 124719 Patch Clearing flags on attachment: 124719 Committed r106362: <http://trac.webkit.org/changeset/106362> 546137 14 webkit.review.bot 2012-01-31 09:09:33 -0800 All reviewed patches have been landed. Closing bug. 124550 2012-01-30 07:49:53 -0800 2012-01-31 06:45:42 -0800 Patch bug-77339-20120130164903.patch text/plain 6381 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2MjQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNTY4NDAwZDkzMzllZmFl ZjM5ZTk0ZjM0ZDg1YmQ4YTNhYzMzZDY0Yi4uZjE4MTI4MjIxZjZkZGMyM2U5OWI4MjgzYzRlZjNk YTYzNThjNDlkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTAxLTMwICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIEVu c3VyZSB0aWxlcyBhcmUgcmVwYWludGVkIHdoZW4gc2Nyb2xsaW5nIHVzaW5nIG1vdXNlIHdoZWVs LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzczMzkK KworICAgICAgICBBIG5ldyBzbG90IHZpc2libGVDb250ZW50UmVjdEFuZFNjYWxlQ2hhbmdlZCBo YXMgYmVlbiBhZGRlZAorICAgICAgICB0aGF0IGlzIGVtaXRlZCBieSBub24tYW5pbWF0ZWQgc2Ny b2xsaW5nIGNvZGUgaW4gdGhlCisgICAgICAgIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHA6CisgICAgICAgIChRUXVpY2tXZWJWaWV3UHJp dmF0ZTo6aW5pdGlhbGl6ZURlc2t0b3ApOgorICAgICAgICAoUVF1aWNrV2ViVmlld1ByaXZhdGU6 OmluaXRpYWxpemVUb3VjaCk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6X3Ffdmlz aWJsZUNvbnRlbnRSZWN0QW5kU2NhbGVDaGFuZ2VkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L3F0L3FxdWlja3dlYnZpZXdfcC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNr d2Vidmlld19wX3AuaDoKKyAgICAgICAgKFFRdWlja1dlYlZpZXdQcml2YXRlKToKKyAgICAgICAg KiBVSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmNwcDoKKyAgICAgICAg KFdlYktpdDo6UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjp3aGVlbEV2ZW50KToKKyAgICAg ICAgKiBVSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmg6CisgICAgICAg IChRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUpOgorCiAyMDEyLTAxLTMwICBDYXJsb3MgR2Fy Y2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBG aXggbWFrZSBkaXN0Y2hlY2suCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xcXVpY2t3ZWJ2aWV3LmNwcAppbmRleCBlYTg1NDQyYWE2NGY4MDZmMGZkNDZhYzJjNGFkNTBh YTY4ZmU5Njc2Li42YmRkZmYzMGIwNzBjMjA4ODIwOGY1OWY3YTM0MmU3ZDYwM2VlMzhhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAK QEAgLTEzNiw2ICsxMzYsNyBAQCB2b2lkIFFRdWlja1dlYlZpZXdQcml2YXRlOjppbml0aWFsaXpl RGVza3RvcChRUXVpY2tXZWJWaWV3KiB2aWV3cG9ydCkKICAgICAgICAgUU9iamVjdDo6ZGlzY29u bmVjdChpbnRlcmFjdGlvbkVuZ2luZS5kYXRhKCksIFNJR05BTChjb250ZW50U3VzcGVuZFJlcXVl c3RlZCgpKSwgdmlld3BvcnQsIFNMT1QoX3Ffc3VzcGVuZCgpKSk7CiAgICAgICAgIFFPYmplY3Q6 OmRpc2Nvbm5lY3QoaW50ZXJhY3Rpb25FbmdpbmUuZGF0YSgpLCBTSUdOQUwoY29udGVudFJlc3Vt ZVJlcXVlc3RlZCgpKSwgdmlld3BvcnQsIFNMT1QoX3FfcmVzdW1lKCkpKTsKICAgICAgICAgUU9i amVjdDo6ZGlzY29ubmVjdChpbnRlcmFjdGlvbkVuZ2luZS5kYXRhKCksIFNJR05BTCh2aWV3cG9y dFRyYWplY3RvcnlWZWN0b3JDaGFuZ2VkKGNvbnN0IFFQb2ludEYmKSksIHZpZXdwb3J0LCBTTE9U KF9xX3ZpZXdwb3J0VHJhamVjdG9yeVZlY3RvckNoYW5nZWQoY29uc3QgUVBvaW50RiYpKSk7Cisg ICAgICAgIFFPYmplY3Q6OmRpc2Nvbm5lY3QoaW50ZXJhY3Rpb25FbmdpbmUuZGF0YSgpLCBTSUdO QUwodmlzaWJsZUNvbnRlbnRSZWN0QW5kU2NhbGVDaGFuZ2VkKCkpLCB2aWV3cG9ydCwgU0xPVChf cV92aXNpYmxlQ29udGVudFJlY3RBbmRTY2FsZUNoYW5nZWQoKSkpOwogICAgIH0KICAgICBpbnRl cmFjdGlvbkVuZ2luZS5yZXNldCgwKTsKICAgICBwYWdlVmlldy0+ZC0+ZXZlbnRIYW5kbGVyLT5z ZXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lKDApOwpAQCAtMTUxLDYgKzE1Miw3IEBAIHZvaWQg UVF1aWNrV2ViVmlld1ByaXZhdGU6OmluaXRpYWxpemVUb3VjaChRUXVpY2tXZWJWaWV3KiB2aWV3 cG9ydCkKICAgICBRT2JqZWN0Ojpjb25uZWN0KGludGVyYWN0aW9uRW5naW5lLmRhdGEoKSwgU0lH TkFMKGNvbnRlbnRTdXNwZW5kUmVxdWVzdGVkKCkpLCB2aWV3cG9ydCwgU0xPVChfcV9zdXNwZW5k KCkpKTsKICAgICBRT2JqZWN0Ojpjb25uZWN0KGludGVyYWN0aW9uRW5naW5lLmRhdGEoKSwgU0lH TkFMKGNvbnRlbnRSZXN1bWVSZXF1ZXN0ZWQoKSksIHZpZXdwb3J0LCBTTE9UKF9xX3Jlc3VtZSgp KSk7CiAgICAgUU9iamVjdDo6Y29ubmVjdChpbnRlcmFjdGlvbkVuZ2luZS5kYXRhKCksIFNJR05B TCh2aWV3cG9ydFRyYWplY3RvcnlWZWN0b3JDaGFuZ2VkKGNvbnN0IFFQb2ludEYmKSksIHZpZXdw b3J0LCBTTE9UKF9xX3ZpZXdwb3J0VHJhamVjdG9yeVZlY3RvckNoYW5nZWQoY29uc3QgUVBvaW50 RiYpKSk7CisgICAgUU9iamVjdDo6Y29ubmVjdChpbnRlcmFjdGlvbkVuZ2luZS5kYXRhKCksIFNJ R05BTCh2aXNpYmxlQ29udGVudFJlY3RBbmRTY2FsZUNoYW5nZWQoKSksIHZpZXdwb3J0LCBTTE9U KF9xX3Zpc2libGVDb250ZW50UmVjdEFuZFNjYWxlQ2hhbmdlZCgpKSk7CiAgICAgdXBkYXRlVG91 Y2hWaWV3cG9ydFNpemUoKTsKIH0KIApAQCAtMzA5LDYgKzMxMSwxMSBAQCB2b2lkIFFRdWlja1dl YlZpZXdQcml2YXRlOjpfcV92aWV3cG9ydFRyYWplY3RvcnlWZWN0b3JDaGFuZ2VkKGNvbnN0IFFQ b2ludEYmIHRyYQogICAgIGRyYXdpbmdBcmVhLT5zZXRWaXNpYmxlQ29udGVudFJlY3RUcmFqZWN0 b3J5VmVjdG9yKHRyYWplY3RvcnlWZWN0b3IpOwogfQogCit2b2lkIFFRdWlja1dlYlZpZXdQcml2 YXRlOjpfcV92aXNpYmxlQ29udGVudFJlY3RBbmRTY2FsZUNoYW5nZWQoKQoreworICAgIHVwZGF0 ZVZpc2libGVDb250ZW50UmVjdEFuZFNjYWxlKCk7Cit9CisKIHZvaWQgUVF1aWNrV2ViVmlld1By aXZhdGU6Ol9xX29uVmlzaWJsZUNoYW5nZWQoKQogewogICAgIHdlYlBhZ2VQcm94eS0+dmlld1N0 YXRlRGlkQ2hhbmdlKFdlYlBhZ2VQcm94eTo6Vmlld0lzVmlzaWJsZSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcC5oIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3AuaAppbmRleCA0NWE4ZGYy YTdkZDYzZGNiNWE0Mzk4ZWI3ZTNjMDlkYzEyNTYzOTIxLi4wNWZmOGFkYTVlYTE0NjE2NTk3N2U2 ZWU2Y2MzYzlhZjI3YTI2NTRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3FxdWlja3dlYnZpZXdfcC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvcXQvcXF1aWNrd2Vidmlld19wLmgKQEAgLTE2NSw2ICsxNjUsNyBAQCBwcml2YXRlOgogICAg IFFfUFJJVkFURV9TTE9UKGRfZnVuYygpLCB2b2lkIF9xX3N1c3BlbmQoKSk7CiAgICAgUV9QUklW QVRFX1NMT1QoZF9mdW5jKCksIHZvaWQgX3FfcmVzdW1lKCkpOwogICAgIFFfUFJJVkFURV9TTE9U KGRfZnVuYygpLCB2b2lkIF9xX3ZpZXdwb3J0VHJhamVjdG9yeVZlY3RvckNoYW5nZWQoY29uc3Qg UVBvaW50RiYpKTsKKyAgICBRX1BSSVZBVEVfU0xPVChkX2Z1bmMoKSwgdm9pZCBfcV92aXNpYmxl Q29udGVudFJlY3RBbmRTY2FsZUNoYW5nZWQoKSk7CiAgICAgUV9QUklWQVRFX1NMT1QoZF9mdW5j KCksIHZvaWQgX3Ffb25PcGVuUGFuZWxGaWxlc1NlbGVjdGVkKCkpOwogICAgIFFfUFJJVkFURV9T TE9UKGRfZnVuYygpLCB2b2lkIF9xX29uT3BlblBhbmVsRmluaXNoZWQoaW50IHJlc3VsdCkpOwog ICAgIFFfUFJJVkFURV9TTE9UKGRfZnVuYygpLCB2b2lkIF9xX29uVmlzaWJsZUNoYW5nZWQoKSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZp ZXdfcF9wLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdf cF9wLmgKaW5kZXggZGM4MjMwMWYyZjc1MWNiNDU0MjNmYmFiNGMwZTVmNDgyZmQzYjQwNC4uYjA4 ZGFhNWFmNjYzNTlhNWEwM2M1YzNlYmU2MTVkNzMyM2YxMGUzOSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3BfcC5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wX3AuaApAQCAtODYsNiAr ODYsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBfcV9zdXNwZW5kKCk7CiAgICAgdm9pZCBfcV9yZXN1 bWUoKTsKICAgICB2b2lkIF9xX3ZpZXdwb3J0VHJhamVjdG9yeVZlY3RvckNoYW5nZWQoY29uc3Qg UVBvaW50RiYpOworICAgIHZvaWQgX3FfdmlzaWJsZUNvbnRlbnRSZWN0QW5kU2NhbGVDaGFuZ2Vk KCk7CiAgICAgdm9pZCBfcV9vbk9wZW5QYW5lbEZpbGVzU2VsZWN0ZWQoKTsKICAgICB2b2lkIF9x X29uT3BlblBhbmVsRmluaXNoZWQoaW50IHJlc3VsdCk7CiAgICAgdm9pZCBfcV9vblZpc2libGVD aGFuZ2VkKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3 cG9ydEludGVyYWN0aW9uRW5naW5lLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9R dFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwCmluZGV4IDg3Y2I5ZGI2ZDBkMzJiZjc2ZWNj ZjM5ODgwYmE0OGM1MjY4MzFlM2IuLmQyZWIxNTY2ZDA4MjcxZTVmOTMwZWI0YzhmYjFmMzE2Nzgz YmRhODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0 SW50ZXJhY3Rpb25FbmdpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9R dFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwCkBAIC0zMDUsNiArMzA1LDggQEAgdm9pZCBR dFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OndoZWVsRXZlbnQoUVdoZWVsRXZlbnQqIGV2KQog CiAgICAgUVJlY3RGIGVuZFBvc1JhbmdlID0gY29tcHV0ZVBvc1JhbmdlRm9ySXRlbUF0U2NhbGUo bV9jb250ZW50LT5jb250ZW50U2NhbGUoKSk7CiAgICAgbV9jb250ZW50LT5zZXRQb3MoLWJvdW5k UG9zaXRpb24oZW5kUG9zUmFuZ2UudG9wTGVmdCgpLCBuZXdQb3MsIGVuZFBvc1JhbmdlLmJvdHRv bVJpZ2h0KCkpKTsKKworICAgIGVtaXQgdmlzaWJsZUNvbnRlbnRSZWN0QW5kU2NhbGVDaGFuZ2Vk KCk7CiB9CiAKIHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpwYWdlUG9zaXRpb25S ZXF1ZXN0KGNvbnN0IFFQb2ludCYgcGFnZVBvc2l0aW9uKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oCmluZGV4 IDE3OTBjNzJlZDhiNTM2MjI2NmE0YjY4NmNjYzhjMThhYmQ3ODJjN2QuLmE0YjY5OTAzMDZjOWEz ODc0NTA1MDgxNWZkNDNlMzE4ODJhZjk0NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmgKQEAgLTEwNiw2 ICsxMDYsNyBAQCBRX1NJR05BTFM6CiAgICAgdm9pZCBjb250ZW50UmVzdW1lUmVxdWVzdGVkKCk7 CiAKICAgICB2b2lkIHZpZXdwb3J0VHJhamVjdG9yeVZlY3RvckNoYW5nZWQoY29uc3QgUVBvaW50 RiYpOworICAgIHZvaWQgdmlzaWJsZUNvbnRlbnRSZWN0QW5kU2NhbGVDaGFuZ2VkKCk7CiAKIHBy aXZhdGUgUV9TTE9UUzoKICAgICAvLyBSZXNwb25kIHRvIGNoYW5nZXMgb2YgY29udGVudCB0aGF0 IGFyZSBub3QgZHJpdmVuIGJ5IHVzLCBsaWtlIHRoZSBwYWdlIHJlc2l6aW5nIGl0c2VsZi4K 124719 2012-01-31 06:45:55 -0800 2012-01-31 09:09:28 -0800 Patch bug-77339-20120131154508.patch text/plain 7102 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2MzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOTIwMTY3Y2RiNWI5NDli NGZmZTViNmY1MzM5NTI0MjRiMGE1MWE0Zi4uM2Y1MjNlYjg4N2JkMzQxYjAyNmE1MjZmYmVmNDY0 MjRkMWNhMDYzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTAxLTMwICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIEVu c3VyZSB0aWxlcyBhcmUgcmVwYWludGVkIHdoZW4gc2Nyb2xsaW5nIHVzaW5nIG1vdXNlIHdoZWVs LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzczMzkK KworICAgICAgICBBIG5ldyBzbG90IHZpc2libGVDb250ZW50UmVjdEFuZFNjYWxlQ2hhbmdlZCBo YXMgYmVlbiBhZGRlZAorICAgICAgICB0aGF0IGlzIGVtaXRlZCBieSBub24tYW5pbWF0ZWQgc2Ny b2xsaW5nIGNvZGUgaW4gdGhlCisgICAgICAgIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHA6CisgICAgICAgIChRUXVpY2tXZWJWaWV3UHJp dmF0ZTo6aW5pdGlhbGl6ZURlc2t0b3ApOgorICAgICAgICAoUVF1aWNrV2ViVmlld1ByaXZhdGU6 OmluaXRpYWxpemVUb3VjaCk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6X3FfcmVz dW1lKToKKyAgICAgICAgKFFRdWlja1dlYlZpZXdQcml2YXRlOjpfcV91cGRhdGVWaXNpYmxlQ29u dGVudFJlY3RBbmRTY2FsZSk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6dXBkYXRl VG91Y2hWaWV3cG9ydFNpemUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vi dmlld19wLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3BfcC5o OgorICAgICAgICAoUVF1aWNrV2ViVmlld1ByaXZhdGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9x dC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpRdFZp ZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OndoZWVsRXZlbnQpOgorICAgICAgICAqIFVJUHJvY2Vz cy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaDoKKyAgICAgICAgKFF0Vmlld3BvcnRJ bnRlcmFjdGlvbkVuZ2luZSk6CisKIDIwMTItMDEtMzAgIEpvY2VseW4gVHVyY290dGUgIDxqb2Nl bHluLnR1cmNvdHRlQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdIERpc2Nvbm5lY3QgdGhlIExh eWVyVHJlZUhvc3QgZnJvbSBsYXllcnMgd2hlbiB0aGV5IGdldCByZW1vdmVkIGZyb20gdGhlaXIg cGFyZW50LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVp Y2t3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vi dmlldy5jcHAKaW5kZXggOTM1ZGU5MjcyODY2Yzk2YWQ4ZjUzYWU5ZDZiNGY5YjFkZDdkZTk0Mi4u M2M1NTM5NjE3YjkzM2UwZTk3YTg4NzU3NWUxYmY3NWMxOTJjMTJiMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCkBAIC0xMzcsNiAr MTM3LDcgQEAgdm9pZCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6aW5pdGlhbGl6ZURlc2t0b3AoUVF1 aWNrV2ViVmlldyogdmlld3BvcnQpCiAgICAgICAgIFFPYmplY3Q6OmRpc2Nvbm5lY3QoaW50ZXJh Y3Rpb25FbmdpbmUuZGF0YSgpLCBTSUdOQUwoY29udGVudFN1c3BlbmRSZXF1ZXN0ZWQoKSksIHZp ZXdwb3J0LCBTTE9UKF9xX3N1c3BlbmQoKSkpOwogICAgICAgICBRT2JqZWN0OjpkaXNjb25uZWN0 KGludGVyYWN0aW9uRW5naW5lLmRhdGEoKSwgU0lHTkFMKGNvbnRlbnRSZXN1bWVSZXF1ZXN0ZWQo KSksIHZpZXdwb3J0LCBTTE9UKF9xX3Jlc3VtZSgpKSk7CiAgICAgICAgIFFPYmplY3Q6OmRpc2Nv bm5lY3QoaW50ZXJhY3Rpb25FbmdpbmUuZGF0YSgpLCBTSUdOQUwodmlld3BvcnRUcmFqZWN0b3J5 VmVjdG9yQ2hhbmdlZChjb25zdCBRUG9pbnRGJikpLCB2aWV3cG9ydCwgU0xPVChfcV92aWV3cG9y dFRyYWplY3RvcnlWZWN0b3JDaGFuZ2VkKGNvbnN0IFFQb2ludEYmKSkpOworICAgICAgICBRT2Jq ZWN0OjpkaXNjb25uZWN0KGludGVyYWN0aW9uRW5naW5lLmRhdGEoKSwgU0lHTkFMKHZpc2libGVD b250ZW50UmVjdEFuZFNjYWxlQ2hhbmdlZCgpKSwgdmlld3BvcnQsIFNMT1QoX3FfdXBkYXRlVmlz aWJsZUNvbnRlbnRSZWN0QW5kU2NhbGUoKSkpOwogICAgIH0KICAgICBpbnRlcmFjdGlvbkVuZ2lu ZS5yZXNldCgwKTsKICAgICBwYWdlVmlldy0+ZC0+ZXZlbnRIYW5kbGVyLT5zZXRWaWV3cG9ydElu dGVyYWN0aW9uRW5naW5lKDApOwpAQCAtMTUyLDYgKzE1Myw3IEBAIHZvaWQgUVF1aWNrV2ViVmll d1ByaXZhdGU6OmluaXRpYWxpemVUb3VjaChRUXVpY2tXZWJWaWV3KiB2aWV3cG9ydCkKICAgICBR T2JqZWN0Ojpjb25uZWN0KGludGVyYWN0aW9uRW5naW5lLmRhdGEoKSwgU0lHTkFMKGNvbnRlbnRT dXNwZW5kUmVxdWVzdGVkKCkpLCB2aWV3cG9ydCwgU0xPVChfcV9zdXNwZW5kKCkpKTsKICAgICBR T2JqZWN0Ojpjb25uZWN0KGludGVyYWN0aW9uRW5naW5lLmRhdGEoKSwgU0lHTkFMKGNvbnRlbnRS ZXN1bWVSZXF1ZXN0ZWQoKSksIHZpZXdwb3J0LCBTTE9UKF9xX3Jlc3VtZSgpKSk7CiAgICAgUU9i amVjdDo6Y29ubmVjdChpbnRlcmFjdGlvbkVuZ2luZS5kYXRhKCksIFNJR05BTCh2aWV3cG9ydFRy YWplY3RvcnlWZWN0b3JDaGFuZ2VkKGNvbnN0IFFQb2ludEYmKSksIHZpZXdwb3J0LCBTTE9UKF9x X3ZpZXdwb3J0VHJhamVjdG9yeVZlY3RvckNoYW5nZWQoY29uc3QgUVBvaW50RiYpKSk7CisgICAg UU9iamVjdDo6Y29ubmVjdChpbnRlcmFjdGlvbkVuZ2luZS5kYXRhKCksIFNJR05BTCh2aXNpYmxl Q29udGVudFJlY3RBbmRTY2FsZUNoYW5nZWQoKSksIHZpZXdwb3J0LCBTTE9UKF9xX3VwZGF0ZVZp c2libGVDb250ZW50UmVjdEFuZFNjYWxlKCkpKTsKICAgICB1cGRhdGVUb3VjaFZpZXdwb3J0U2l6 ZSgpOwogfQogCkBAIC0yMTQsNyArMjE2LDcgQEAgdm9pZCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6 X3FfcmVzdW1lKCkKICAgICAgICAgcG9zdFRyYW5zaXRpb25TdGF0ZS0+YXBwbHkoKTsKICAgICB9 CiAKLSAgICB1cGRhdGVWaXNpYmxlQ29udGVudFJlY3RBbmRTY2FsZSgpOworICAgIF9xX3VwZGF0 ZVZpc2libGVDb250ZW50UmVjdEFuZFNjYWxlKCk7CiB9CiAKIHZvaWQgUVF1aWNrV2ViVmlld1By aXZhdGU6OmRpZENoYW5nZUNvbnRlbnRzU2l6ZShjb25zdCBRU2l6ZSYgbmV3U2l6ZSkKQEAgLTI5 OCw3ICszMDAsNyBAQCB2b2lkIFFRdWlja1dlYlZpZXdQcml2YXRlOjpoYW5kbGVEb3dubG9hZFJl cXVlc3QoRG93bmxvYWRQcm94eSogZG93bmxvYWQpCiAgICAgY29udGV4dC0+ZG93bmxvYWRNYW5h Z2VyKCktPmFkZERvd25sb2FkKGRvd25sb2FkLCBkb3dubG9hZEl0ZW0pOwogfQogCi12b2lkIFFR dWlja1dlYlZpZXdQcml2YXRlOjp1cGRhdGVWaXNpYmxlQ29udGVudFJlY3RBbmRTY2FsZSgpCit2 b2lkIFFRdWlja1dlYlZpZXdQcml2YXRlOjpfcV91cGRhdGVWaXNpYmxlQ29udGVudFJlY3RBbmRT Y2FsZSgpCiB7CiAgICAgRHJhd2luZ0FyZWFQcm94eSogZHJhd2luZ0FyZWEgPSB3ZWJQYWdlUHJv eHktPmRyYXdpbmdBcmVhKCk7CiAgICAgaWYgKCFkcmF3aW5nQXJlYSkKQEAgLTM2NSw3ICszNjcs NyBAQCB2b2lkIFFRdWlja1dlYlZpZXdQcml2YXRlOjp1cGRhdGVUb3VjaFZpZXdwb3J0U2l6ZSgp CiAgICAgd2ViUGFnZVByb3h5LT5zZXRWaWV3cG9ydFNpemUodmlld3BvcnRTaXplKTsKIAogICAg IGludGVyYWN0aW9uRW5naW5lLT5hcHBseUNvbnN0cmFpbnRzKGNvbXB1dGVWaWV3cG9ydENvbnN0 cmFpbnRzKCkpOwotICAgIHVwZGF0ZVZpc2libGVDb250ZW50UmVjdEFuZFNjYWxlKCk7CisgICAg X3FfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0QW5kU2NhbGUoKTsKIH0KIAogdm9pZCBRUXVpY2tX ZWJWaWV3UHJpdmF0ZTo6UG9zdFRyYW5zaXRpb25TdGF0ZTo6YXBwbHkoKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3AuaCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wLmgKaW5kZXggY2FjMzhj N2RlNzJkZDE4MTEyYTlhNGI0M2QwYjNhOTRkYTNmODVhYy4uN2E3MTNkMTMzYjQ2NDIxMzY4MzRh YzA5OTc4MjE5NWZmODc5NTI3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3FxdWlja3dlYnZpZXdfcC5oCkBAIC0xNjUsNiArMTY1LDcgQEAgcHJpdmF0ZToKICAg ICBRX1BSSVZBVEVfU0xPVChkX2Z1bmMoKSwgdm9pZCBfcV9zdXNwZW5kKCkpOwogICAgIFFfUFJJ VkFURV9TTE9UKGRfZnVuYygpLCB2b2lkIF9xX3Jlc3VtZSgpKTsKICAgICBRX1BSSVZBVEVfU0xP VChkX2Z1bmMoKSwgdm9pZCBfcV92aWV3cG9ydFRyYWplY3RvcnlWZWN0b3JDaGFuZ2VkKGNvbnN0 IFFQb2ludEYmKSk7CisgICAgUV9QUklWQVRFX1NMT1QoZF9mdW5jKCksIHZvaWQgX3FfdXBkYXRl VmlzaWJsZUNvbnRlbnRSZWN0QW5kU2NhbGUoKSk7CiAgICAgUV9QUklWQVRFX1NMT1QoZF9mdW5j KCksIHZvaWQgX3Ffb25PcGVuUGFuZWxGaWxlc1NlbGVjdGVkKCkpOwogICAgIFFfUFJJVkFURV9T TE9UKGRfZnVuYygpLCB2b2lkIF9xX29uT3BlblBhbmVsRmluaXNoZWQoaW50IHJlc3VsdCkpOwog ICAgIFFfUFJJVkFURV9TTE9UKGRfZnVuYygpLCB2b2lkIF9xX29uVmlzaWJsZUNoYW5nZWQoKSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZp ZXdfcF9wLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdf cF9wLmgKaW5kZXggOWYyODE3MDFhNWRjN2I4Y2EyNjRmY2YzY2ZlZjVmOTkyZjkxOWIxMS4uMTdh NWNmODJhYTdlM2UyZWYxNjQ0MjhhMzhkZmIzNjZiYWRlM2FlYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3BfcC5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wX3AuaApAQCAtODMsNyAr ODMsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCB1cGRhdGVUb3VjaFZpZXdwb3J0U2l6ZSgpOwogICAg IFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6Q29uc3RyYWludHMgY29tcHV0ZVZpZXdwb3J0 Q29uc3RyYWludHMoKTsKIAotICAgIHZvaWQgdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0QW5kU2Nh bGUoKTsKKyAgICB2b2lkIF9xX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdEFuZFNjYWxlKCk7CiAK ICAgICB2b2lkIF9xX3N1c3BlbmQoKTsKICAgICB2b2lkIF9xX3Jlc3VtZSgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2lu ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9u RW5naW5lLmNwcAppbmRleCA4N2NiOWRiNmQwZDMyYmY3NmVjY2YzOTg4MGJhNDhjNTI2ODMxZTNi Li5kMmViMTU2NmQwODI3MWU1ZjkzMGViNGM4ZmIxZjMxNjc4M2JkYTgzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9u RW5naW5lLmNwcApAQCAtMzA1LDYgKzMwNSw4IEBAIHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9u RW5naW5lOjp3aGVlbEV2ZW50KFFXaGVlbEV2ZW50KiBldikKIAogICAgIFFSZWN0RiBlbmRQb3NS YW5nZSA9IGNvbXB1dGVQb3NSYW5nZUZvckl0ZW1BdFNjYWxlKG1fY29udGVudC0+Y29udGVudFNj YWxlKCkpOwogICAgIG1fY29udGVudC0+c2V0UG9zKC1ib3VuZFBvc2l0aW9uKGVuZFBvc1Jhbmdl LnRvcExlZnQoKSwgbmV3UG9zLCBlbmRQb3NSYW5nZS5ib3R0b21SaWdodCgpKSk7CisKKyAgICBl bWl0IHZpc2libGVDb250ZW50UmVjdEFuZFNjYWxlQ2hhbmdlZCgpOwogfQogCiB2b2lkIFF0Vmll d3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6cGFnZVBvc2l0aW9uUmVxdWVzdChjb25zdCBRUG9pbnQm IHBhZ2VQb3NpdGlvbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9R dFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9x dC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaAppbmRleCAxNzkwYzcyZWQ4YjUzNjIyNjZh NGI2ODZjY2M4YzE4YWJkNzgyYzdkLi5hNGI2OTkwMzA2YzlhMzg3NDUwNTA4MTVmZDQzZTMxODgy YWY5NDUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9y dEludGVyYWN0aW9uRW5naW5lLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0 Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oCkBAIC0xMDYsNiArMTA2LDcgQEAgUV9TSUdOQUxT OgogICAgIHZvaWQgY29udGVudFJlc3VtZVJlcXVlc3RlZCgpOwogCiAgICAgdm9pZCB2aWV3cG9y dFRyYWplY3RvcnlWZWN0b3JDaGFuZ2VkKGNvbnN0IFFQb2ludEYmKTsKKyAgICB2b2lkIHZpc2li bGVDb250ZW50UmVjdEFuZFNjYWxlQ2hhbmdlZCgpOwogCiBwcml2YXRlIFFfU0xPVFM6CiAgICAg Ly8gUmVzcG9uZCB0byBjaGFuZ2VzIG9mIGNvbnRlbnQgdGhhdCBhcmUgbm90IGRyaXZlbiBieSB1 cywgbGlrZSB0aGUgcGFnZSByZXNpemluZyBpdHNlbGYuCg==