49550 2010-11-15 10:47:37 -0800 Refactoring: use PlatformBridge to set scroll position in Android scroll view. 2010-11-23 14:55:10 -0800 1 1 1 Unclassified WebKit History 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 0 swang webkit-unassigned andreip benm commit-queue steveblock webkit.review.bot oldest_to_newest 309352 0 swang 2010-11-15 10:47:37 -0800 Fix android specific history bug This issue is related to how android implements view position restoration. The fix is to only send main view's restoration to android specific code. 309370 1 73917 swang 2010-11-15 11:30:28 -0800 Created attachment 73917 Fix android specific history bug. Make sure only main frame view's position is restored. 309480 2 swang 2010-11-15 15:43:59 -0800 who should review my change? 309669 3 andreip 2010-11-16 03:51:33 -0800 > No new tests. (OOPS!) Please remove this and explain why you don't add a test. > // Sometimes the parent scrollView is not set for some iFrame when it's first loaded >// in case of history going back. Just curious: can you please provide more info about the circumstances when the parent is not set? > android::WebViewCore *webViewCore = android::WebViewCore::getWebViewCore(this); There should not be Android namespace code in WebCore, this is a layering violation. You should use the PlatformBridge instead. I know you haven't introduced this yourself in this patch but it'd be good to think how to address the layering violations in this file. 309819 4 74011 swang 2010-11-16 10:51:52 -0800 Created attachment 74011 Fix android specific history bug. Thanks Andrei for review. I update the patch; and will think about how to remove the android namespace. 310333 5 swang 2010-11-17 09:24:22 -0800 hi, Andrei/Ben/Steve, Could you review this again? Thanks Simon 312297 6 74011 steveblock 2010-11-22 04:58:33 -0800 Comment on attachment 74011 Fix android specific history bug. View in context: https://bugs.webkit.org/attachment.cgi?id=74011&action=review > WebCore/platform/android/ScrollViewAndroid.cpp:75 > + // engadget.com site, you go to some article then hit back. I think the right place for these kind of details are in the bug, not in comments, and it would be good to understand the underlying problem, rather than just listing a test case. > WebCore/platform/android/ScrollViewAndroid.cpp:77 > + android::WebViewCore *webViewCore = android::WebViewCore::getWebViewCore(this); Layering violation, as Andrei says. 312529 7 74598 swang 2010-11-22 14:33:48 -0800 Created attachment 74598 Use platform bridge to set scroll position. this fixes layering violation. Use platform bridge to set scroll position. this fixes layering violation. since PlatformBridge.cpp is in webkit and is not upstreamed, so this patch doesn't include that file. Also it seems the platformBridge.h and scrollviewAndroid.cpp are very outdated. 312728 8 74598 steveblock 2010-11-23 02:14:46 -0800 Comment on attachment 74598 Use platform bridge to set scroll position. this fixes layering violation. View in context: https://bugs.webkit.org/attachment.cgi?id=74598&action=review > WebCore/ChangeLog:5 > + Use platform bridge to set scroll position. You should update the bug title to match this updated description. > WebCore/ChangeLog:9 > + test introduced. The patch no longer has anything to do with browsing history. In any case, LayoutTests are to test platform-independent functionality. This is a change to the Android implementation, so 'Refactoring only, tested by existing tests' suffices. > WebCore/platform/android/PlatformBridge.h:109 > + static void setScrollPosition(ScrollView*, int, int); you should name the two int params, as it's not clear from their types what they are. 312926 9 74680 swang 2010-11-23 10:51:42 -0800 Created attachment 74680 Use platform bridge to set scroll position. this fixes layering violation. Refactoring to prevent layering violation. 312929 10 74680 steveblock 2010-11-23 10:56:37 -0800 Comment on attachment 74680 Use platform bridge to set scroll position. this fixes layering violation. View in context: https://bugs.webkit.org/attachment.cgi?id=74680&action=review > WebCore/ChangeLog:11 > + (WebCore::ScrollView::platformSetScrollPosition): PlatformBridge.h seems to be missing? You should probably re-run prepare-ChangeLog. > WebCore/platform/android/PlatformBridge.h:109 > + static void setScrollPosition(ScrollView* scrollView, int x, int y); Don't need to name 'scrollView' as it's obvious from its type. 312934 11 74683 swang 2010-11-23 11:03:49 -0800 Created attachment 74683 Use platform bridge to set scroll position. this fixes layering violation. Refactoring only. 312935 12 74683 steveblock 2010-11-23 11:06:17 -0800 Comment on attachment 74683 Use platform bridge to set scroll position. this fixes layering violation. View in context: https://bugs.webkit.org/attachment.cgi?id=74683&action=review Do you want cq too? You can set cq? to request this. > WebCore/ChangeLog:5 > + Use platform bridge to set scroll position. Need a link to the bug URL 312941 13 74684 swang 2010-11-23 11:34:24 -0800 Created attachment 74684 Use platform bridge to set scroll position. this fixes layering violation. Refactoring only. Thanks Steve for reviewing. 312946 14 webkit.review.bot 2010-11-23 11:37:29 -0800 Attachment 74684 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--diff-files', u'WebCore/ChangeLog', u'WebCore/platform/android/PlatformBridge.h', u'WebCore/platform/android/ScrollViewAndroid.cpp']" exit_code: 1 WebCore/ChangeLog:6: Line contains tab character. [whitespace/tab] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 312947 15 74685 swang 2010-11-23 11:38:44 -0800 Created attachment 74685 Use platform bridge to set scroll position. this fixes layering violation. Refactoring only. 312990 16 74685 steveblock 2010-11-23 13:20:38 -0800 Comment on attachment 74685 Use platform bridge to set scroll position. this fixes layering violation. r=me 312992 17 swang 2010-11-23 13:28:34 -0800 thanks a lot Steve for all the review and help. 313025 18 74685 commit-queue 2010-11-23 14:55:03 -0800 Comment on attachment 74685 Use platform bridge to set scroll position. this fixes layering violation. Clearing flags on attachment: 74685 Committed r72631: <http://trac.webkit.org/changeset/72631> 313026 19 commit-queue 2010-11-23 14:55:10 -0800 All reviewed patches have been landed. Closing bug. 73917 2010-11-15 11:30:28 -0800 2010-11-16 10:51:52 -0800 Fix android specific history bug. scroll_android.txt text/plain 1567 swang SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MjAxNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTAtMTEtMTUgIFNoaW1lbmcgKFNpbW9uKSBXYW5nICA8c3dhbmdA Z29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBGaXggYW5kcm9pZCBzcGVjaWZpYyBoaXN0b3J5IGJ1Zy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5NTUwCisKKyAgICAgICAgTm8gbmV3IHRl c3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBwbGF0Zm9ybS9hbmRyb2lkL1Njcm9sbFZpZXdBbmRy b2lkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6OnBsYXRmb3JtU2V0U2Nyb2xs UG9zaXRpb24pOgorCiAyMDEwLTExLTE0ICBBYmhpc2hlayBBcnlhICA8aW5mZXJub0BjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpJbmRleDogV2Vi Q29yZS9wbGF0Zm9ybS9hbmRyb2lkL1Njcm9sbFZpZXdBbmRyb2lkLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL3BsYXRmb3JtL2FuZHJvaWQvU2Nyb2xsVmlld0FuZHJvaWQuY3BwCShyZXZpc2lv biA3MjAxNCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vYW5kcm9pZC9TY3JvbGxWaWV3QW5kcm9pZC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTcwLDcgKzcwLDEyIEBAIHZvaWQgU2Nyb2xsVmlldzo6cGxh dGZvcm1TZXRTY3JvbGxQb3NpdGkKIHsKICAgICBpZiAocGFyZW50KCkpIC8vIGRvbid0IGF0dGVt cHQgdG8gc2Nyb2xsIHN1YmZyYW1lczsgdGhleSdyZSBmdWxseSB2aXNpYmxlCiAgICAgICAgIHJl dHVybjsKLSAgICBhbmRyb2lkOjpXZWJWaWV3Q29yZTo6Z2V0V2ViVmlld0NvcmUodGhpcyktPnNj cm9sbFRvKHB0LngoKSwgcHQueSgpKTsKKyAgICAvLyBTb21ldGltZXMgdGhlIHBhcmVudCBzY3Jv bGxWaWV3IGlzIG5vdCBzZXQgZm9yIHNvbWUgaUZyYW1lIHdoZW4gaXQncyBmaXJzdCBsb2FkZWQK KyAgICAvLyBpbiBjYXNlIG9mIGhpc3RvcnkgZ29pbmcgYmFjay4KKyAgICAvLyBDaGVjayB0byBt YWtlIHN1cmUgdGhlIHZpZXcgaXMgdGhlIG1haW4gRnJhbWVWaWV3LgorICAgIGFuZHJvaWQ6Oldl YlZpZXdDb3JlICp3ZWJWaWV3Q29yZSA9IGFuZHJvaWQ6OldlYlZpZXdDb3JlOjpnZXRXZWJWaWV3 Q29yZSh0aGlzKTsKKyAgICBpZiAod2ViVmlld0NvcmUtPm1haW5GcmFtZSgpLT52aWV3KCkgPT0g dGhpcykKKyAgICAgICAgd2ViVmlld0NvcmUtPnNjcm9sbFRvKHB0LngoKSwgcHQueSgpKTsKIH0K IAogdm9pZCBTY3JvbGxWaWV3OjpwbGF0Zm9ybVNjcm9sbGJhck1vZGVzKFNjcm9sbGJhck1vZGUm IGgsIFNjcm9sbGJhck1vZGUmIHYpIGNvbnN0Cg== 74011 2010-11-16 10:51:52 -0800 2010-11-22 14:33:48 -0800 Fix android specific history bug. scroll_android.txt text/plain 1736 swang SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MjAxNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMTEtMTUgIFNoaW1lbmcgKFNpbW9uKSBXYW5nICA8c3dhbmdA Z29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBGaXggYW5kcm9pZCBzcGVjaWZpYyBoaXN0b3J5IGJ1Zy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5NTUwCisKKyAgICAgICAgQ3VycmVudGx5 IG5vIEFuZHJvaWQgdGVzdHMgcmVsYXRlZCB0byBicm93c2luZyBoaXN0b3J5LCBzbyBubyBuZXcK KyAgICAgICAgdGVzdCBpbnRyb2R1Y2VkLgorCisgICAgICAgICogcGxhdGZvcm0vYW5kcm9pZC9T Y3JvbGxWaWV3QW5kcm9pZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3OjpwbGF0 Zm9ybVNldFNjcm9sbFBvc2l0aW9uKToKKwogMjAxMC0xMS0xNCAgQWJoaXNoZWsgQXJ5YSAgPGlu ZmVybm9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtv di4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vYW5kcm9pZC9TY3JvbGxWaWV3QW5kcm9pZC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL1Njcm9sbFZpZXdBbmRyb2lk LmNwcAkocmV2aXNpb24gNzIwMTQpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2FuZHJvaWQvU2Nyb2xs Vmlld0FuZHJvaWQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MCw3ICs3MCwxMyBAQCB2b2lkIFNj cm9sbFZpZXc6OnBsYXRmb3JtU2V0U2Nyb2xsUG9zaXRpCiB7CiAgICAgaWYgKHBhcmVudCgpKSAv LyBkb24ndCBhdHRlbXB0IHRvIHNjcm9sbCBzdWJmcmFtZXM7IHRoZXkncmUgZnVsbHkgdmlzaWJs ZQogICAgICAgICByZXR1cm47Ci0gICAgYW5kcm9pZDo6V2ViVmlld0NvcmU6OmdldFdlYlZpZXdD b3JlKHRoaXMpLT5zY3JvbGxUbyhwdC54KCksIHB0LnkoKSk7CisgICAgLy8gU29tZXRpbWVzIHRo ZSBwYXJlbnQgc2Nyb2xsVmlldyBpcyBub3Qgc2V0IGZvciBzb21lIGlGcmFtZSB3aGVuIGl0J3Mg Zmlyc3QgbG9hZGVkCisgICAgLy8gaW4gY2FzZSBvZiBoaXN0b3J5IGdvaW5nIGJhY2suICBUaGlz IGlzIGVuY291bnRlcmVkIHdoZW4gdmlld2luZworICAgIC8vIGVuZ2FkZ2V0LmNvbSBzaXRlLCB5 b3UgZ28gdG8gc29tZSBhcnRpY2xlIHRoZW4gaGl0IGJhY2suCisgICAgLy8gQ2hlY2sgdG8gbWFr ZSBzdXJlIHRoZSB2aWV3IGlzIHRoZSBtYWluIEZyYW1lVmlldy4KKyAgICBhbmRyb2lkOjpXZWJW aWV3Q29yZSAqd2ViVmlld0NvcmUgPSBhbmRyb2lkOjpXZWJWaWV3Q29yZTo6Z2V0V2ViVmlld0Nv cmUodGhpcyk7CisgICAgaWYgKHdlYlZpZXdDb3JlLT5tYWluRnJhbWUoKS0+dmlldygpID09IHRo aXMpCisgICAgICAgIHdlYlZpZXdDb3JlLT5zY3JvbGxUbyhwdC54KCksIHB0LnkoKSk7CiB9CiAK IHZvaWQgU2Nyb2xsVmlldzo6cGxhdGZvcm1TY3JvbGxiYXJNb2RlcyhTY3JvbGxiYXJNb2RlJiBo LCBTY3JvbGxiYXJNb2RlJiB2KSBjb25zdAo= 74598 2010-11-22 14:33:48 -0800 2010-11-23 10:51:42 -0800 Use platform bridge to set scroll position. this fixes layering violation. platformbridge.txt text/plain 2036 swang SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MjAxNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMTEtMjIgIFNoaW1lbmcgKFNpbW9uKSBXYW5nICA8c3dhbmdA Z29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBVc2UgcGxhdGZvcm0gYnJpZGdlIHRvIHNldCBzY3JvbGwgcG9zaXRpb24uCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00OTU1MAorCisgICAgICAg IEN1cnJlbnRseSBubyBBbmRyb2lkIHRlc3RzIHJlbGF0ZWQgdG8gYnJvd3NpbmcgaGlzdG9yeSwg c28gbm8gbmV3CisgICAgICAgIHRlc3QgaW50cm9kdWNlZC4KKworICAgICAgICAqIHBsYXRmb3Jt L2FuZHJvaWQvU2Nyb2xsVmlld0FuZHJvaWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs Vmlldzo6cGxhdGZvcm1TZXRTY3JvbGxQb3NpdGlvbik6CisKIDIwMTAtMTEtMTQgIEFiaGlzaGVr IEFyeWEgIDxpbmZlcm5vQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaW1p dHJpIEdsYXprb3YuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2FuZHJvaWQvUGxhdGZvcm1Ccmlk Z2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2FuZHJvaWQvUGxhdGZvcm1Ccmlk Z2UuaAkocmV2aXNpb24gNzIwMTQpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2FuZHJvaWQvUGxhdGZv cm1CcmlkZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtODEsNiArODEsNyBAQCBjbGFzcyBOUE9iamVj dDsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitjbGFzcyBTY3JvbGxWaWV3OwogY2xhc3MgV2lk Z2V0OwogCiAvLyBBbiBpbnRlcmZhY2UgdG8gdGhlIGVtYmVkZGluZyBsYXllciwgd2hpY2ggaGFz IHRoZSBhYmlsaXR5IHRvIGFuc3dlcgpAQCAtMTA0LDYgKzEwNSw5IEBAIHB1YmxpYzoKICAgICBz dGF0aWMgYm9vbCBjb29raWVzRW5hYmxlZCgpOwogICAgIC8vIFBsdWdpbgogICAgIHN0YXRpYyBO UE9iamVjdCogcGx1Z2luU2NyaXB0YWJsZU9iamVjdChXaWRnZXQqKTsKKworICAgIHN0YXRpYyB2 b2lkIHNldFNjcm9sbFBvc2l0aW9uKFNjcm9sbFZpZXcqLCBpbnQsIGludCk7CisKICAgICAvLyBM YW5ndWFnZQogICAgIHN0YXRpYyBTdHJpbmcgY29tcHV0ZURlZmF1bHRMYW5ndWFnZSgpOwogICAg IC8vIE1lbW9yeSBkZXRhaWxzIGZvciBWOCBHQwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9hbmRy b2lkL1Njcm9sbFZpZXdBbmRyb2lkLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3Jt L2FuZHJvaWQvU2Nyb2xsVmlld0FuZHJvaWQuY3BwCShyZXZpc2lvbiA3MjAxNCkKKysrIFdlYkNv cmUvcGxhdGZvcm0vYW5kcm9pZC9TY3JvbGxWaWV3QW5kcm9pZC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTcwLDcgKzcwLDcgQEAgdm9pZCBTY3JvbGxWaWV3OjpwbGF0Zm9ybVNldFNjcm9sbFBvc2l0 aQogewogICAgIGlmIChwYXJlbnQoKSkgLy8gZG9uJ3QgYXR0ZW1wdCB0byBzY3JvbGwgc3ViZnJh bWVzOyB0aGV5J3JlIGZ1bGx5IHZpc2libGUKICAgICAgICAgcmV0dXJuOwotICAgIGFuZHJvaWQ6 OldlYlZpZXdDb3JlOjpnZXRXZWJWaWV3Q29yZSh0aGlzKS0+c2Nyb2xsVG8ocHQueCgpLCBwdC55 KCkpOworICAgIFBsYXRmb3JtQnJpZGdlOjpzZXRTY3JvbGxQb3NpdGlvbih0aGlzLCBwdC54KCks IHB0LnkoKSk7CiB9CiAKIHZvaWQgU2Nyb2xsVmlldzo6cGxhdGZvcm1TY3JvbGxiYXJNb2RlcyhT Y3JvbGxiYXJNb2RlJiBoLCBTY3JvbGxiYXJNb2RlJiB2KSBjb25zdAo= 74680 2010-11-23 10:51:42 -0800 2010-11-23 11:03:49 -0800 Use platform bridge to set scroll position. this fixes layering violation. platformbridge.txt text/plain 2004 swang SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MjAxNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTAtMTEtMjIgIFNoaW1lbmcgKFNpbW9uKSBXYW5nICA8c3dhbmdA Z29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBVc2UgcGxhdGZvcm0gYnJpZGdlIHRvIHNldCBzY3JvbGwgcG9zaXRpb24uCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00OTU1MAorCisgICAgICAg IFJlZmFjdG9yaW5nIG9ubHkuICBUZXN0ZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9hbmRyb2lkL1Njcm9sbFZpZXdBbmRyb2lkLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlNjcm9sbFZpZXc6OnBsYXRmb3JtU2V0U2Nyb2xsUG9zaXRpb24pOgorCiAyMDEwLTExLTE0 ICBBYmhpc2hlayBBcnlhICA8aW5mZXJub0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGltaXRyaSBHbGF6a292LgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL1Bs YXRmb3JtQnJpZGdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL1Bs YXRmb3JtQnJpZGdlLmgJKHJldmlzaW9uIDcyMDE0KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9hbmRy b2lkL1BsYXRmb3JtQnJpZGdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTgxLDYgKzgxLDcgQEAgY2xh c3MgTlBPYmplY3Q7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY2xhc3MgU2Nyb2xsVmlldzsK IGNsYXNzIFdpZGdldDsKIAogLy8gQW4gaW50ZXJmYWNlIHRvIHRoZSBlbWJlZGRpbmcgbGF5ZXIs IHdoaWNoIGhhcyB0aGUgYWJpbGl0eSB0byBhbnN3ZXIKQEAgLTEwNCw2ICsxMDUsOSBAQCBwdWJs aWM6CiAgICAgc3RhdGljIGJvb2wgY29va2llc0VuYWJsZWQoKTsKICAgICAvLyBQbHVnaW4KICAg ICBzdGF0aWMgTlBPYmplY3QqIHBsdWdpblNjcmlwdGFibGVPYmplY3QoV2lkZ2V0Kik7CisKKyAg ICBzdGF0aWMgdm9pZCBzZXRTY3JvbGxQb3NpdGlvbihTY3JvbGxWaWV3KiBzY3JvbGxWaWV3LCBp bnQgeCwgaW50IHkpOworCiAgICAgLy8gTGFuZ3VhZ2UKICAgICBzdGF0aWMgU3RyaW5nIGNvbXB1 dGVEZWZhdWx0TGFuZ3VhZ2UoKTsKICAgICAvLyBNZW1vcnkgZGV0YWlscyBmb3IgVjggR0MKSW5k ZXg6IFdlYkNvcmUvcGxhdGZvcm0vYW5kcm9pZC9TY3JvbGxWaWV3QW5kcm9pZC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL1Njcm9sbFZpZXdBbmRyb2lkLmNwcAko cmV2aXNpb24gNzIwMTQpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2FuZHJvaWQvU2Nyb2xsVmlld0Fu ZHJvaWQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MCw3ICs3MCw3IEBAIHZvaWQgU2Nyb2xsVmll dzo6cGxhdGZvcm1TZXRTY3JvbGxQb3NpdGkKIHsKICAgICBpZiAocGFyZW50KCkpIC8vIGRvbid0 IGF0dGVtcHQgdG8gc2Nyb2xsIHN1YmZyYW1lczsgdGhleSdyZSBmdWxseSB2aXNpYmxlCiAgICAg ICAgIHJldHVybjsKLSAgICBhbmRyb2lkOjpXZWJWaWV3Q29yZTo6Z2V0V2ViVmlld0NvcmUodGhp cyktPnNjcm9sbFRvKHB0LngoKSwgcHQueSgpKTsKKyAgICBQbGF0Zm9ybUJyaWRnZTo6c2V0U2Ny b2xsUG9zaXRpb24odGhpcywgcHQueCgpLCBwdC55KCkpOwogfQogCiB2b2lkIFNjcm9sbFZpZXc6 OnBsYXRmb3JtU2Nyb2xsYmFyTW9kZXMoU2Nyb2xsYmFyTW9kZSYgaCwgU2Nyb2xsYmFyTW9kZSYg dikgY29uc3QK 74683 2010-11-23 11:03:49 -0800 2010-11-23 11:34:24 -0800 Use platform bridge to set scroll position. this fixes layering violation. platformbridge.txt text/plain 1989 swang SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MjYxNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTAtMTEtMjMgIFNoaW1lbmcgKFNpbW9uKSBXYW5nICA8c3dhbmdA Z29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBVc2UgcGxhdGZvcm0gYnJpZGdlIHRvIHNldCBzY3JvbGwgcG9zaXRpb24uCisKKyAgICAg ICAgUmVmYWN0b3Jpbmcgb25seS4gIEV4aXN0aW5nIHRlc3RzIHNoYWxsIHN1ZmZpY2UuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9hbmRyb2lkL1BsYXRmb3JtQnJpZGdlLmg6CisgICAgICAgICogcGxh dGZvcm0vYW5kcm9pZC9TY3JvbGxWaWV3QW5kcm9pZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpT Y3JvbGxWaWV3OjpwbGF0Zm9ybVNldFNjcm9sbFBvc2l0aW9uKToKKwogMjAxMC0xMS0yMyAgQWxl eGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IFBhdmVsIEZlbGRtYW4uCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2FuZHJvaWQvUGxhdGZv cm1CcmlkZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2FuZHJvaWQvUGxhdGZv cm1CcmlkZ2UuaAkocmV2aXNpb24gNzI2MTYpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2FuZHJvaWQv UGxhdGZvcm1CcmlkZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtODEsNiArODEsNyBAQCBjbGFzcyBO UE9iamVjdDsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitjbGFzcyBTY3JvbGxWaWV3OwogY2xh c3MgV2lkZ2V0OwogCiAvLyBBbiBpbnRlcmZhY2UgdG8gdGhlIGVtYmVkZGluZyBsYXllciwgd2hp Y2ggaGFzIHRoZSBhYmlsaXR5IHRvIGFuc3dlcgpAQCAtMTA0LDYgKzEwNSw5IEBAIHB1YmxpYzoK ICAgICBzdGF0aWMgYm9vbCBjb29raWVzRW5hYmxlZCgpOwogICAgIC8vIFBsdWdpbgogICAgIHN0 YXRpYyBOUE9iamVjdCogcGx1Z2luU2NyaXB0YWJsZU9iamVjdChXaWRnZXQqKTsKKworICAgIHN0 YXRpYyB2b2lkIHNldFNjcm9sbFBvc2l0aW9uKFNjcm9sbFZpZXcqLCBpbnQgeCwgaW50IHkpOwor CiAgICAgLy8gTGFuZ3VhZ2UKICAgICBzdGF0aWMgU3RyaW5nIGNvbXB1dGVEZWZhdWx0TGFuZ3Vh Z2UoKTsKICAgICAvLyBNZW1vcnkgZGV0YWlscyBmb3IgVjggR0MKSW5kZXg6IFdlYkNvcmUvcGxh dGZvcm0vYW5kcm9pZC9TY3JvbGxWaWV3QW5kcm9pZC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9wbGF0Zm9ybS9hbmRyb2lkL1Njcm9sbFZpZXdBbmRyb2lkLmNwcAkocmV2aXNpb24gNzI2MTYp CisrKyBXZWJDb3JlL3BsYXRmb3JtL2FuZHJvaWQvU2Nyb2xsVmlld0FuZHJvaWQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC03MCw3ICs3MCw3IEBAIHZvaWQgU2Nyb2xsVmlldzo6cGxhdGZvcm1TZXRT Y3JvbGxQb3NpdGkKIHsKICAgICBpZiAocGFyZW50KCkpIC8vIGRvbid0IGF0dGVtcHQgdG8gc2Ny b2xsIHN1YmZyYW1lczsgdGhleSdyZSBmdWxseSB2aXNpYmxlCiAgICAgICAgIHJldHVybjsKLSAg ICBhbmRyb2lkOjpXZWJWaWV3Q29yZTo6Z2V0V2ViVmlld0NvcmUodGhpcyktPnNjcm9sbFRvKHB0 LngoKSwgcHQueSgpKTsKKyAgICBQbGF0Zm9ybUJyaWRnZTo6c2V0U2Nyb2xsUG9zaXRpb24odGhp cywgcHQueCgpLCBwdC55KCkpOwogfQogCiB2b2lkIFNjcm9sbFZpZXc6OnBsYXRmb3JtU2Nyb2xs YmFyTW9kZXMoU2Nyb2xsYmFyTW9kZSYgaCwgU2Nyb2xsYmFyTW9kZSYgdikgY29uc3QK 74684 2010-11-23 11:34:24 -0800 2010-11-23 11:38:44 -0800 Use platform bridge to set scroll position. this fixes layering violation. platformbridge.txt text/plain 2037 swang SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MjYxNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMTEtMjMgIFNoaW1lbmcgKFNpbW9uKSBXYW5nICA8c3dhbmdA Z29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBVc2UgcGxhdGZvcm0gYnJpZGdlIHRvIHNldCBzY3JvbGwgcG9zaXRpb24uCisJaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5NTUwCisKKyAgICAgICAgUmVmYWN0 b3Jpbmcgb25seS4gIEV4aXN0aW5nIHRlc3RzIHNoYWxsIHN1ZmZpY2UuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9hbmRyb2lkL1BsYXRmb3JtQnJpZGdlLmg6CisgICAgICAgICogcGxhdGZvcm0vYW5k cm9pZC9TY3JvbGxWaWV3QW5kcm9pZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3 OjpwbGF0Zm9ybVNldFNjcm9sbFBvc2l0aW9uKToKKwogMjAxMC0xMS0yMyAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFBhdmVs IEZlbGRtYW4uCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2FuZHJvaWQvUGxhdGZvcm1CcmlkZ2Uu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2FuZHJvaWQvUGxhdGZvcm1CcmlkZ2Uu aAkocmV2aXNpb24gNzI2MTYpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2FuZHJvaWQvUGxhdGZvcm1C cmlkZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtODEsNiArODEsNyBAQCBjbGFzcyBOUE9iamVjdDsK IAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitjbGFzcyBTY3JvbGxWaWV3OwogY2xhc3MgV2lkZ2V0 OwogCiAvLyBBbiBpbnRlcmZhY2UgdG8gdGhlIGVtYmVkZGluZyBsYXllciwgd2hpY2ggaGFzIHRo ZSBhYmlsaXR5IHRvIGFuc3dlcgpAQCAtMTA0LDYgKzEwNSw5IEBAIHB1YmxpYzoKICAgICBzdGF0 aWMgYm9vbCBjb29raWVzRW5hYmxlZCgpOwogICAgIC8vIFBsdWdpbgogICAgIHN0YXRpYyBOUE9i amVjdCogcGx1Z2luU2NyaXB0YWJsZU9iamVjdChXaWRnZXQqKTsKKworICAgIHN0YXRpYyB2b2lk IHNldFNjcm9sbFBvc2l0aW9uKFNjcm9sbFZpZXcqLCBpbnQgeCwgaW50IHkpOworCiAgICAgLy8g TGFuZ3VhZ2UKICAgICBzdGF0aWMgU3RyaW5nIGNvbXB1dGVEZWZhdWx0TGFuZ3VhZ2UoKTsKICAg ICAvLyBNZW1vcnkgZGV0YWlscyBmb3IgVjggR0MKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vYW5k cm9pZC9TY3JvbGxWaWV3QW5kcm9pZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9y bS9hbmRyb2lkL1Njcm9sbFZpZXdBbmRyb2lkLmNwcAkocmV2aXNpb24gNzI2MTYpCisrKyBXZWJD b3JlL3BsYXRmb3JtL2FuZHJvaWQvU2Nyb2xsVmlld0FuZHJvaWQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC03MCw3ICs3MCw3IEBAIHZvaWQgU2Nyb2xsVmlldzo6cGxhdGZvcm1TZXRTY3JvbGxQb3Np dGkKIHsKICAgICBpZiAocGFyZW50KCkpIC8vIGRvbid0IGF0dGVtcHQgdG8gc2Nyb2xsIHN1YmZy YW1lczsgdGhleSdyZSBmdWxseSB2aXNpYmxlCiAgICAgICAgIHJldHVybjsKLSAgICBhbmRyb2lk OjpXZWJWaWV3Q29yZTo6Z2V0V2ViVmlld0NvcmUodGhpcyktPnNjcm9sbFRvKHB0LngoKSwgcHQu eSgpKTsKKyAgICBQbGF0Zm9ybUJyaWRnZTo6c2V0U2Nyb2xsUG9zaXRpb24odGhpcywgcHQueCgp LCBwdC55KCkpOwogfQogCiB2b2lkIFNjcm9sbFZpZXc6OnBsYXRmb3JtU2Nyb2xsYmFyTW9kZXMo U2Nyb2xsYmFyTW9kZSYgaCwgU2Nyb2xsYmFyTW9kZSYgdikgY29uc3QK 74685 2010-11-23 11:38:44 -0800 2010-11-23 14:55:03 -0800 Use platform bridge to set scroll position. this fixes layering violation. platformbridge.txt text/plain 2044 swang SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MjYxNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMTEtMjMgIFNoaW1lbmcgKFNpbW9uKSBXYW5nICA8c3dhbmdA Z29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBVc2UgcGxhdGZvcm0gYnJpZGdlIHRvIHNldCBzY3JvbGwgcG9zaXRpb24uCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00OTU1MAorCisgICAgICAg IFJlZmFjdG9yaW5nIG9ubHkuICBFeGlzdGluZyB0ZXN0cyBzaGFsbCBzdWZmaWNlLgorCisgICAg ICAgICogcGxhdGZvcm0vYW5kcm9pZC9QbGF0Zm9ybUJyaWRnZS5oOgorICAgICAgICAqIHBsYXRm b3JtL2FuZHJvaWQvU2Nyb2xsVmlld0FuZHJvaWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Ny b2xsVmlldzo6cGxhdGZvcm1TZXRTY3JvbGxQb3NpdGlvbik6CisKIDIwMTAtMTEtMjMgIEFsZXhh bmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBQYXZlbCBGZWxkbWFuLgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL1BsYXRmb3Jt QnJpZGdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL1BsYXRmb3Jt QnJpZGdlLmgJKHJldmlzaW9uIDcyNjE2KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL1Bs YXRmb3JtQnJpZGdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTgxLDYgKzgxLDcgQEAgY2xhc3MgTlBP YmplY3Q7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY2xhc3MgU2Nyb2xsVmlldzsKIGNsYXNz IFdpZGdldDsKIAogLy8gQW4gaW50ZXJmYWNlIHRvIHRoZSBlbWJlZGRpbmcgbGF5ZXIsIHdoaWNo IGhhcyB0aGUgYWJpbGl0eSB0byBhbnN3ZXIKQEAgLTEwNCw2ICsxMDUsOSBAQCBwdWJsaWM6CiAg ICAgc3RhdGljIGJvb2wgY29va2llc0VuYWJsZWQoKTsKICAgICAvLyBQbHVnaW4KICAgICBzdGF0 aWMgTlBPYmplY3QqIHBsdWdpblNjcmlwdGFibGVPYmplY3QoV2lkZ2V0Kik7CisKKyAgICBzdGF0 aWMgdm9pZCBzZXRTY3JvbGxQb3NpdGlvbihTY3JvbGxWaWV3KiwgaW50IHgsIGludCB5KTsKKwog ICAgIC8vIExhbmd1YWdlCiAgICAgc3RhdGljIFN0cmluZyBjb21wdXRlRGVmYXVsdExhbmd1YWdl KCk7CiAgICAgLy8gTWVtb3J5IGRldGFpbHMgZm9yIFY4IEdDCkluZGV4OiBXZWJDb3JlL3BsYXRm b3JtL2FuZHJvaWQvU2Nyb2xsVmlld0FuZHJvaWQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv cGxhdGZvcm0vYW5kcm9pZC9TY3JvbGxWaWV3QW5kcm9pZC5jcHAJKHJldmlzaW9uIDcyNjE2KQor KysgV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL1Njcm9sbFZpZXdBbmRyb2lkLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNzAsNyArNzAsNyBAQCB2b2lkIFNjcm9sbFZpZXc6OnBsYXRmb3JtU2V0U2Ny b2xsUG9zaXRpCiB7CiAgICAgaWYgKHBhcmVudCgpKSAvLyBkb24ndCBhdHRlbXB0IHRvIHNjcm9s bCBzdWJmcmFtZXM7IHRoZXkncmUgZnVsbHkgdmlzaWJsZQogICAgICAgICByZXR1cm47Ci0gICAg YW5kcm9pZDo6V2ViVmlld0NvcmU6OmdldFdlYlZpZXdDb3JlKHRoaXMpLT5zY3JvbGxUbyhwdC54 KCksIHB0LnkoKSk7CisgICAgUGxhdGZvcm1CcmlkZ2U6OnNldFNjcm9sbFBvc2l0aW9uKHRoaXMs IHB0LngoKSwgcHQueSgpKTsKIH0KIAogdm9pZCBTY3JvbGxWaWV3OjpwbGF0Zm9ybVNjcm9sbGJh ck1vZGVzKFNjcm9sbGJhck1vZGUmIGgsIFNjcm9sbGJhck1vZGUmIHYpIGNvbnN0Cg==