66134 2011-08-12 05:03:20 -0700 Do not cache m_resizesToContentsLayoutSize on WebKit2's WebPage 2011-10-14 08:34:38 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ahf kenneth benjamin kenneth ossy webkit.review.bot oldest_to_newest 450394 0 ahf 2011-08-12 05:03:20 -0700 Do not cache m_resizesToContentsLayoutSize on WebKit2's WebPage, as used by the Qt port. Instead use FrameView's corresponding functions. Caching fixed layout size information on both WebCore::FrameView and WebKit::WebPage can lead to syncing problems on WebKit2. resizesToContents is currently only being used in the Qt port. 450398 1 103763 ahf 2011-08-12 05:28:35 -0700 Created attachment 103763 Patch 450399 2 103763 gyuyoung.kim 2011-08-12 05:38:37 -0700 Comment on attachment 103763 Patch Attachment 103763 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/9358617 450400 3 103763 gustavo.noronha 2011-08-12 05:38:41 -0700 Comment on attachment 103763 Patch Attachment 103763 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/9357626 451475 4 103763 morrita 2011-08-15 21:03:07 -0700 Comment on attachment 103763 Patch Please fix the build error anyway. 452610 5 103763 kenneth 2011-08-17 14:44:23 -0700 Comment on attachment 103763 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103763&action=review > Source/WebCore/page/Frame.cpp:911 > - frameView->setUseFixedLayout(useFixedLayout); > + frameView->setUseFixedLayout(!fixedLayoutSize.isEmpty()); So how do you turn it on the first time? I mean the view is created before we get the layout size (viewport meta tag) > Source/WebKit2/ChangeLog:1 > +2011-08-12 Alexander Færøy <alexander.faeroy@nokia.com> Something is up with your name! > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:668 > + // FIXME: ??? frame->view()->forceLayout(); What do you mean with that? You set needslayout below 483933 6 111000 kenneth 2011-10-14 05:36:57 -0700 Created attachment 111000 Patch 483946 7 111000 hausmann 2011-10-14 06:00:36 -0700 Comment on attachment 111000 Patch r=me 483963 8 111000 webkit.review.bot 2011-10-14 07:08:51 -0700 Comment on attachment 111000 Patch Clearing flags on attachment: 111000 Committed r97462: <http://trac.webkit.org/changeset/97462> 483964 9 webkit.review.bot 2011-10-14 07:08:56 -0700 All reviewed patches have been landed. Closing bug. 483968 10 ossy 2011-10-14 07:25:27 -0700 You guys broke the SL build: /Volumes/Data/WebKit-BuildSlave/snowleopard-intel-release/build/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: In member function 'virtual void WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage()': /Volumes/Data/WebKit-BuildSlave/snowleopard-intel-release/build/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:1116: warning: unused variable 'view' Reopen to fix it. 483994 11 ossy 2011-10-14 08:34:38 -0700 Fix landed: http://trac.webkit.org/changeset/97465 103763 2011-08-12 05:28:35 -0700 2011-10-14 05:36:57 -0700 Patch bug-66134-20110812143803.patch text/plain 10756 ahf U3VidmVyc2lvbiBSZXZpc2lvbjogOTI4NDEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0YzI3ZDE5Mzk0YWM3YjQw ZmRjYmZiNDgzZDE4MTJjNDMxZGNjY2RhLi5hOTYzYzczNTYyNzdjMjBkNGFjZjk0YmRjNzMwMDE4 NDQ5NzI3YzBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDgtMTIgIEFsZXhh bmRlciBGw6Zyw7h5ICA8YWxleGFuZGVyLmZhZXJveUBub2tpYS5jb20+CisKKyAgICAgICAgRG8g bm90IGNhY2hlIG1fcmVzaXplc1RvQ29udGVudHNMYXlvdXRTaXplIG9uIFdlYktpdDIncyBXZWJQ YWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NjEz NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJhc2Vk IG9uIHBhdGNoIGJ5IFphbGFuIEJ1anRhcy4KKworICAgICAgICBObyBuZXcgdGVzdHMgYWRkZWQg ZHVlIHRvIGxhY2sgb2YgdGVzdGluZyBtZWNoYW5pY3MuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1l LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjpjcmVhdGVWaWV3KToKKyAgICAgICAgKiBw YWdlL0ZyYW1lLmg6CisKIDIwMTEtMDgtMTEgIEFsZXhpcyBNZW5hcmQgIDxhbGV4aXMubWVuYXJk QG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXggZm9yIFF0Lgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0ZyYW1lLmNwcAppbmRleCBmM2FhZTMwMGIzNTJmZWZmNWJkNzEyMzRmOTQxNGFhNTI0 YzkyMzA4Li4xZDE0M2Q5Nzg5NzhkZjk1ZTk4NGIzZDQ5ZjI1YzE5YmNhMzU5ZGRlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL0ZyYW1lLmNwcApAQCAtODkwLDcgKzg5MCw3IEBAIFBhc3NSZWZQdHI8UmFuZ2U+IEZyYW1l OjpyYW5nZUZvclBvaW50KGNvbnN0IEludFBvaW50JiBmcmFtZVBvaW50KQogCiB2b2lkIEZyYW1l OjpjcmVhdGVWaWV3KGNvbnN0IEludFNpemUmIHZpZXdwb3J0U2l6ZSwKICAgICAgICAgICAgICAg ICAgICAgICAgY29uc3QgQ29sb3ImIGJhY2tncm91bmRDb2xvciwgYm9vbCB0cmFuc3BhcmVudCwK LSAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgSW50U2l6ZSYgZml4ZWRMYXlvdXRTaXplLCBi b29sIHVzZUZpeGVkTGF5b3V0LAorICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBJbnRTaXpl JiBmaXhlZExheW91dFNpemUsCiAgICAgICAgICAgICAgICAgICAgICAgIFNjcm9sbGJhck1vZGUg aG9yaXpvbnRhbFNjcm9sbGJhck1vZGUsIGJvb2wgaG9yaXpvbnRhbExvY2ssCiAgICAgICAgICAg ICAgICAgICAgICAgIFNjcm9sbGJhck1vZGUgdmVydGljYWxTY3JvbGxiYXJNb2RlLCBib29sIHZl cnRpY2FsTG9jaykKIHsKQEAgLTkwOCw3ICs5MDgsNyBAQCB2b2lkIEZyYW1lOjpjcmVhdGVWaWV3 KGNvbnN0IEludFNpemUmIHZpZXdwb3J0U2l6ZSwKICAgICBpZiAoaXNNYWluRnJhbWUpIHsKICAg ICAgICAgZnJhbWVWaWV3ID0gRnJhbWVWaWV3OjpjcmVhdGUodGhpcywgdmlld3BvcnRTaXplKTsK ICAgICAgICAgZnJhbWVWaWV3LT5zZXRGaXhlZExheW91dFNpemUoZml4ZWRMYXlvdXRTaXplKTsK LSAgICAgICAgZnJhbWVWaWV3LT5zZXRVc2VGaXhlZExheW91dCh1c2VGaXhlZExheW91dCk7Cisg ICAgICAgIGZyYW1lVmlldy0+c2V0VXNlRml4ZWRMYXlvdXQoIWZpeGVkTGF5b3V0U2l6ZS5pc0Vt cHR5KCkpOwogICAgIH0gZWxzZQogICAgICAgICBmcmFtZVZpZXcgPSBGcmFtZVZpZXc6OmNyZWF0 ZSh0aGlzKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5oIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5oCmluZGV4IDY0ODZjMDZmMGExZGYwNTNlNDI1NTk0ODFm YjYyMTQxMGIyMTcyN2UuLjQ4MDkzMWU0NDU5ZjdkZmU2MDhiNjVjMTAwNzEyMGNiMDcxMjNhNzIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0ZyYW1lLmgKQEAgLTg3LDcgKzg3LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog CiAgICAgICAgIHZvaWQgaW5pdCgpOwogICAgICAgICB2b2lkIHNldFZpZXcoUGFzc1JlZlB0cjxG cmFtZVZpZXc+KTsKLSAgICAgICAgdm9pZCBjcmVhdGVWaWV3KGNvbnN0IEludFNpemUmLCBjb25z dCBDb2xvciYsIGJvb2wsIGNvbnN0IEludFNpemUmLCBib29sLAorICAgICAgICB2b2lkIGNyZWF0 ZVZpZXcoY29uc3QgSW50U2l6ZSYsIGNvbnN0IENvbG9yJiwgYm9vbCwgY29uc3QgSW50U2l6ZSYs CiAgICAgICAgICAgICBTY3JvbGxiYXJNb2RlID0gU2Nyb2xsYmFyQXV0bywgYm9vbCBob3Jpem9u dGFsTG9jayA9IGZhbHNlLAogICAgICAgICAgICAgU2Nyb2xsYmFyTW9kZSA9IFNjcm9sbGJhckF1 dG8sIGJvb2wgdmVydGljYWxMb2NrID0gZmFsc2UpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L3F0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDEzOGUz Zjg0ZjllNmQ4MzZiYjZmY2YyYTc2NWE4N2M2MGMxMjJlOTEuLmZkN2MxOWU5ZDllNDVlOGFmMWYy NzlhNjBmODA0NTFmOGZjYTBmZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MTEtMDgtMTIgIEFsZXhhbmRlciBGw6Zyw7h5ICA8YWxleGFuZGVyLmZhZXJveUBub2tpYS5jb20+ CisKKyAgICAgICAgRG8gbm90IGNhY2hlIG1fcmVzaXplc1RvQ29udGVudHNMYXlvdXRTaXplIG9u IFdlYktpdDIncyBXZWJQYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD02NjEzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0Ojp0cmFuc2l0aW9uVG9Db21taXR0ZWRG b3JOZXdQYWdlKToKKwogMjAxMS0wOC0wOSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJv dEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjkyNjgzLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNs aWVudFF0LmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJD bGllbnRRdC5jcHAKaW5kZXggNThkNzZjZjRiOWY3MWQ1Y2YxMzMyOWRjZDJmNjA2MjgwOGVhNmIw MC4uM2E1MjI0ZDY1Y2U2N2E0NWY5MGFhNGZlNmQxY2JjZjRlMTFlNzVkMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQu Y3BwCkBAIC0yODAsNyArMjgwLDYgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudFF0Ojp0cmFuc2l0 aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKCkKICAgICBtX2ZyYW1lLT5jcmVhdGVWaWV3KG1fd2Vi RnJhbWUtPnBhZ2UoKS0+dmlld3BvcnRTaXplKCksCiAgICAgICAgICAgICAgICAgICAgICAgICBi YWNrZ3JvdW5kQ29sb3IsICFiYWNrZ3JvdW5kQ29sb3IuYWxwaGEoKSwKICAgICAgICAgICAgICAg ICAgICAgICAgIHByZWZlcnJlZExheW91dFNpemUuaXNWYWxpZCgpID8gSW50U2l6ZShwcmVmZXJy ZWRMYXlvdXRTaXplKSA6IEludFNpemUoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgIHByZWZl cnJlZExheW91dFNpemUuaXNWYWxpZCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgaFNjcm9s bGJhciwgaExvY2ssCiAgICAgICAgICAgICAgICAgICAgICAgICB2U2Nyb2xsYmFyLCB2TG9jayk7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZwppbmRleCA4NThmMzUzMzg2ZGE2ZWI5NzMxZjljMDI4YWU3MTdiZGMzNDBlNDI2 Li4xOTcwMDM5OGRmMjE1OWFhYzMyYTZlZGY5Yzk0OThmYmU0YzJmMzZmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTggQEAKKzIwMTEtMDgtMTIgIEFsZXhhbmRlciBGw6Zyw7h5ICA8YWxleGFuZGVy LmZhZXJveUBub2tpYS5jb20+CisKKyAgICAgICAgRG8gbm90IGNhY2hlIG1fcmVzaXplc1RvQ29u dGVudHNMYXlvdXRTaXplIG9uIFdlYktpdDIncyBXZWJQYWdlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NjEzNAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9X ZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lTG9hZGVy Q2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKToKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNl dFNpemUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzZXRSZXNpemVzVG9Db250ZW50c1Vz aW5nTGF5b3V0U2l6ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnJlc2l6ZVRvQ29udGVu dHNJZk5lZWRlZCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKwog MjAxMS0wOC0xMCAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MDA0CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xp ZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJh bWVMb2FkZXJDbGllbnQuY3BwCmluZGV4IDNiYzhhZDI0N2VkNDBkMmUwNmIyYWRmMjg4OTFmZjVm ZmUzNjM2YmQuLjVhYTMzMWVlNGE5NmE5NGFjN2YwMDZlNDBiNTAxNWUxYWZmZjM3MTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVM b2FkZXJDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1 cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCkBAIC0xMTMyLDE0ICsxMTMyLDIyIEBAIHZv aWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZvck5ld1BhZ2Uo KQogewogICAgIFdlYlBhZ2UqIHdlYlBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCk7CiAgICAgQ29sb3Ig YmFja2dyb3VuZENvbG9yID0gd2ViUGFnZS0+ZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQoKSA/ IENvbG9yOjp0cmFuc3BhcmVudCA6IENvbG9yOjp3aGl0ZTsKKyAgICBGcmFtZVZpZXcqIHZpZXcg PSBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+dmlldygpOwogCiAgICAgYm9vbCBpc01haW5GcmFtZSA9 IHdlYlBhZ2UtPm1haW5GcmFtZSgpID09IG1fZnJhbWU7CiAKICNpZiBFTkFCTEUoVElMRURfQkFD S0lOR19TVE9SRSkKLSAgICBJbnRTaXplIGN1cnJlbnRWaXNpYmxlQ29udGVudFNpemUgPSBtX2Zy YW1lLT5jb3JlRnJhbWUoKS0+dmlldygpID8gbV9mcmFtZS0+Y29yZUZyYW1lKCktPnZpZXcoKS0+ dmlzaWJsZUNvbnRlbnRSZWN0KCkuc2l6ZSgpIDogSW50U2l6ZSgpOwotICAgIG1fZnJhbWUtPmNv cmVGcmFtZSgpLT5jcmVhdGVWaWV3KHdlYlBhZ2UtPnNpemUoKSwgYmFja2dyb3VuZENvbG9yLCBm YWxzZSwgd2ViUGFnZS0+cmVzaXplc1RvQ29udGVudHNMYXlvdXRTaXplKCksIGlzTWFpbkZyYW1l ICYmIHdlYlBhZ2UtPnJlc2l6ZXNUb0NvbnRlbnRzRW5hYmxlZCgpKTsKKyAgICBJbnRTaXplIGN1 cnJlbnRWaXNpYmxlQ29udGVudFNpemU7CisgICAgSW50U2l6ZSBmaXhlZExheW91dFNpemU7CiAK LSAgICBpZiAoaXNNYWluRnJhbWUgJiYgd2ViUGFnZS0+cmVzaXplc1RvQ29udGVudHNFbmFibGVk KCkpIHsKKyAgICBpZiAodmlldykgeworICAgICAgICBjdXJyZW50VmlzaWJsZUNvbnRlbnRTaXpl ID0gdmlldy0+dmlzaWJsZUNvbnRlbnRSZWN0KCkuc2l6ZSgpOworICAgICAgICBmaXhlZExheW91 dFNpemUgPSB2aWV3LT5maXhlZExheW91dFNpemUoKTsKKyAgICB9CisKKyAgICBtX2ZyYW1lLT5j b3JlRnJhbWUoKS0+Y3JlYXRlVmlldyh3ZWJQYWdlLT5zaXplKCksIGJhY2tncm91bmRDb2xvciwg ZmFsc2UsIGZpeGVkTGF5b3V0U2l6ZSk7CisKKyAgICBpZiAoaXNNYWluRnJhbWUgJiYgIWZpeGVk TGF5b3V0U2l6ZS5pc0VtcHR5KCkpIHsKICAgICAgICAgbV9mcmFtZS0+Y29yZUZyYW1lKCktPnZp ZXcoKS0+c2V0RGVsZWdhdGVzU2Nyb2xsaW5nKHRydWUpOwogICAgICAgICBtX2ZyYW1lLT5jb3Jl RnJhbWUoKS0+dmlldygpLT5zZXRQYWludHNFbnRpcmVDb250ZW50cyh0cnVlKTsKICAgICAgICAg Ly8gVGhlIEhpc3RvcnlDb250cm9sbGVyIHdpbGwgdXBkYXRlIHRoZSBzY3JvbGwgcG9zaXRpb24g bGF0ZXIgaWYgbmVlZGVkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCmluZGV4IDc5MDgzZTA2ZjhiM2MwM2FkNzkwZWE2MjJlMTM3ZDA1YmVmNWRmNmEu LmFkYzI2OTYyMzAxODRiNDI0NTEzZDZmYjg0ZTlmYjkxOTM0N2Q2NmYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTYxOCwxOSArNjE4LDE5 IEBAIHZvaWQgV2ViUGFnZTo6bGF5b3V0SWZOZWVkZWQoKQogCiB2b2lkIFdlYlBhZ2U6OnNldFNp emUoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgdmlld1NpemUpCiB7CisgICAgRnJhbWVWaWV3KiB2 aWV3ID0gbV9wYWdlLT5tYWluRnJhbWUoKS0+dmlldygpOworCiAjaWYgRU5BQkxFKFRJTEVEX0JB Q0tJTkdfU1RPUkUpCiAgICAgLy8gSWYgd2UgYXJlIHJlc2l6aW5nIHRvIGNvbnRlbnQgaWdub3Jl IGV4dGVybmFsIGF0dGVtcHRzLgotICAgIGlmICghbV9yZXNpemVzVG9Db250ZW50c0xheW91dFNp emUuaXNFbXB0eSgpKQorICAgIGlmICh2aWV3LT51c2VGaXhlZExheW91dCgpKQogICAgICAgICBy ZXR1cm47CiAjZW5kaWYKIAogICAgIGlmIChtX3ZpZXdTaXplID09IHZpZXdTaXplKQogICAgICAg ICByZXR1cm47CiAKLSAgICBGcmFtZSogZnJhbWUgPSBtX3BhZ2UtPm1haW5GcmFtZSgpOwotICAg IAotICAgIGZyYW1lLT52aWV3KCktPnJlc2l6ZSh2aWV3U2l6ZSk7Ci0gICAgZnJhbWUtPnZpZXco KS0+c2V0TmVlZHNMYXlvdXQoKTsKKyAgICB2aWV3LT5yZXNpemUodmlld1NpemUpOworICAgIHZp ZXctPnNldE5lZWRzTGF5b3V0KCk7CiAgICAgbV9kcmF3aW5nQXJlYS0+c2V0TmVlZHNEaXNwbGF5 KEludFJlY3QoSW50UG9pbnQoMCwgMCksIHZpZXdTaXplKSk7CiAgICAgCiAgICAgbV92aWV3U2l6 ZSA9IHZpZXdTaXplOwpAQCAtNjQ2LDM5ICs2NDYsNDQgQEAgdm9pZCBXZWJQYWdlOjpzZXRGaXhl ZFZpc2libGVDb250ZW50UmVjdChjb25zdCBJbnRSZWN0JiByZWN0KQogCiB2b2lkIFdlYlBhZ2U6 OnNldFJlc2l6ZXNUb0NvbnRlbnRzVXNpbmdMYXlvdXRTaXplKGNvbnN0IEludFNpemUmIHRhcmdl dExheW91dFNpemUpCiB7Ci0gICAgaWYgKG1fcmVzaXplc1RvQ29udGVudHNMYXlvdXRTaXplID09 IHRhcmdldExheW91dFNpemUpCisgICAgRnJhbWVWaWV3KiB2aWV3ID0gbV9wYWdlLT5tYWluRnJh bWUoKS0+dmlldygpOworCisgICAgaWYgKHZpZXctPmZpeGVkTGF5b3V0U2l6ZSgpID09IHRhcmdl dExheW91dFNpemUpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1fcmVzaXplc1RvQ29udGVudHNM YXlvdXRTaXplID0gdGFyZ2V0TGF5b3V0U2l6ZTsKKyAgICBib29sIGZpeGVkTGF5b3V0ID0gIXRh cmdldExheW91dFNpemUuaXNFbXB0eSgpOwogCi0gICAgRnJhbWUqIGZyYW1lID0gbV9wYWdlLT5t YWluRnJhbWUoKTsKLSAgICBpZiAobV9yZXNpemVzVG9Db250ZW50c0xheW91dFNpemUuaXNFbXB0 eSgpKSB7Ci0gICAgICAgIGZyYW1lLT52aWV3KCktPnNldERlbGVnYXRlc1Njcm9sbGluZyhmYWxz ZSk7Ci0gICAgICAgIGZyYW1lLT52aWV3KCktPnNldFVzZUZpeGVkTGF5b3V0KGZhbHNlKTsKLSAg ICAgICAgZnJhbWUtPnZpZXcoKS0+c2V0UGFpbnRzRW50aXJlQ29udGVudHMoZmFsc2UpOwotICAg IH0gZWxzZSB7Ci0gICAgICAgIGZyYW1lLT52aWV3KCktPnNldERlbGVnYXRlc1Njcm9sbGluZyh0 cnVlKTsKLSAgICAgICAgZnJhbWUtPnZpZXcoKS0+c2V0VXNlRml4ZWRMYXlvdXQodHJ1ZSk7Ci0g ICAgICAgIGZyYW1lLT52aWV3KCktPnNldFBhaW50c0VudGlyZUNvbnRlbnRzKHRydWUpOwotICAg ICAgICBmcmFtZS0+dmlldygpLT5zZXRGaXhlZExheW91dFNpemUobV9yZXNpemVzVG9Db250ZW50 c0xheW91dFNpemUpOwotICAgIH0KLSAgICBmcmFtZS0+dmlldygpLT5mb3JjZUxheW91dCgpOwor ICAgIGlmIChmaXhlZExheW91dCkKKyAgICAgICAgdmlldy0+c2V0Rml4ZWRMYXlvdXRTaXplKHRh cmdldExheW91dFNpemUpOworCisgICAgLy8gU2V0IHZpZXcgYXR0cmlidXRlcyBiYXNlZCBvbiB3 aGV0aGVyIGZpeGVkIGxheW91dCBpcyB1c2VkLgorICAgIHZpZXctPnNldERlbGVnYXRlc1Njcm9s bGluZyhmaXhlZExheW91dCk7CisgICAgdmlldy0+c2V0VXNlRml4ZWRMYXlvdXQoZml4ZWRMYXlv dXQpOworICAgIHZpZXctPnNldFBhaW50c0VudGlyZUNvbnRlbnRzKGZpeGVkTGF5b3V0KTsKKwor ICAgIC8vIFNjaGVkdWxlIGEgbGF5b3V0IHRvIHVzZSB0aGUgbmV3IHRhcmdldCBzaXplLgorICAg IGlmICh2aWV3LT5sYXlvdXRQZW5kaW5nKCkpCisgICAgICAgIHJldHVybjsKKworICAgIC8vIEZJ WE1FOiA/Pz8gZnJhbWUtPnZpZXcoKS0+Zm9yY2VMYXlvdXQoKTsKKyAgICB2aWV3LT5zZXROZWVk c0xheW91dCgpOworICAgIHZpZXctPnNjaGVkdWxlUmVsYXlvdXQoKTsKIH0KIAogdm9pZCBXZWJQ YWdlOjpyZXNpemVUb0NvbnRlbnRzSWZOZWVkZWQoKQogewotICAgIGlmIChtX3Jlc2l6ZXNUb0Nv bnRlbnRzTGF5b3V0U2l6ZS5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybjsKKyAgICBGcmFtZVZp ZXcqIHZpZXcgPSBtX3BhZ2UtPm1haW5GcmFtZSgpLT52aWV3KCk7CiAKLSAgICBGcmFtZSogZnJh bWUgPSBtX3BhZ2UtPm1haW5GcmFtZSgpOworICAgIGlmICghdmlldy0+dXNlRml4ZWRMYXlvdXQo KSkKKyAgICAgICAgcmV0dXJuOwogCi0gICAgSW50U2l6ZSBjb250ZW50U2l6ZSA9IGZyYW1lLT52 aWV3KCktPmNvbnRlbnRzU2l6ZSgpOworICAgIEludFNpemUgY29udGVudFNpemUgPSB2aWV3LT5j b250ZW50c1NpemUoKTsKICAgICBpZiAoY29udGVudFNpemUgPT0gbV92aWV3U2l6ZSkKICAgICAg ICAgcmV0dXJuOwogCiAgICAgbV92aWV3U2l6ZSA9IGNvbnRlbnRTaXplOwotICAgIGZyYW1lLT52 aWV3KCktPnJlc2l6ZShtX3ZpZXdTaXplKTsKLSAgICBmcmFtZS0+dmlldygpLT5zZXROZWVkc0xh eW91dCgpOworICAgIHZpZXctPnJlc2l6ZShtX3ZpZXdTaXplKTsKKyAgICB2aWV3LT5zZXROZWVk c0xheW91dCgpOwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5oCmluZGV4IDk1ZjRkYzdjYTI5OTI2NGFlN2IxYmMyNmQyZGY2MDcxZThjMDMx OTcuLmYyNTdiN2ZlMWIyMmNhNGRlYTM5ZTgxMjcxYTQ3OWQ0NjcyMTkyNmEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKKysrIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAtMjkxLDkgKzI5MSw2IEBA IHB1YmxpYzoKICNpZiBFTkFCTEUoVElMRURfQkFDS0lOR19TVE9SRSkKICAgICB2b2lkIHBhZ2VE aWRSZXF1ZXN0U2Nyb2xsKGNvbnN0IFdlYkNvcmU6OkludFBvaW50Jik7CiAgICAgdm9pZCBzZXRG aXhlZFZpc2libGVDb250ZW50UmVjdChjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7Ci0KLSAgICBi b29sIHJlc2l6ZXNUb0NvbnRlbnRzRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuICFtX3Jlc2l6ZXNU b0NvbnRlbnRzTGF5b3V0U2l6ZS5pc0VtcHR5KCk7IH0KLSAgICBXZWJDb3JlOjpJbnRTaXplIHJl c2l6ZXNUb0NvbnRlbnRzTGF5b3V0U2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fcmVzaXplc1RvQ29u dGVudHNMYXlvdXRTaXplOyB9CiAgICAgdm9pZCBzZXRSZXNpemVzVG9Db250ZW50c1VzaW5nTGF5 b3V0U2l6ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJiB0YXJnZXRMYXlvdXRTaXplKTsKICAgICB2 b2lkIHJlc2l6ZVRvQ29udGVudHNJZk5lZWRlZCgpOwogI2VuZGlmCg== 111000 2011-10-14 05:36:57 -0700 2011-10-14 07:08:51 -0700 Patch 0001-Do-not-cache-m_resizesToContentsLayoutSize-on-WebKit.patch text/plain 7527 kenneth RnJvbSA5NGVlZjQ2NzhkOWY3MmMzMTgzZDY4ODI4NGI1MTg4ZGY0YTQ0NTFkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiA8a2VubmV0aEB3 ZWJraXQub3JnPgpEYXRlOiBGcmksIDE0IE9jdCAyMDExIDE0OjM1OjEzICswMjAwClN1YmplY3Q6 IFtQQVRDSF0gRG8gbm90IGNhY2hlIG1fcmVzaXplc1RvQ29udGVudHNMYXlvdXRTaXplIG9uIFdl YktpdDIncyBXZWJQYWdlCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NjYxMzQKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKRG8gdGhlIHJlc2l6ZSB0byBjb250 ZW50cyBvbiB0aGUgd2ViIHByb2Nlc3Mgc2lkZS4KCkJhc2VkIG9uIHBhdGNoIGJ5IFphbGFuIEJ1 anRhcy4KCiogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5j cHA6CihXZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0ZWRG b3JOZXdQYWdlKToKKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CihXZWJLaXQ6Oldl YlBhZ2U6OnNldFNpemUpOgooV2ViS2l0OjpXZWJQYWdlOjpzZXRSZXNpemVzVG9Db250ZW50c1Vz aW5nTGF5b3V0U2l6ZSk6CihXZWJLaXQ6OldlYlBhZ2U6OnJlc2l6ZVRvQ29udGVudHNJZk5lZWRl ZCk6CiogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKLS0tCiBTb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTkgKysrKysrKwogLi4uL1dl YkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcCAgICAgICAgfCAgIDE0ICsrKyst CiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgICAgICB8ICAg NTEgKysrKysrKysrKy0tLS0tLS0tLQogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuaCAgICAgICAgfCAgICAzIC0KIDQgZmlsZXMgY2hhbmdlZCwgNTcgaW5zZXJ0aW9u cygrKSwgMzAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDEwNDI0M2MuLjRkMGE0MWEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMS0xMC0xNCAgS2VubmV0aCBSb2hkZSBDaHJp c3RpYW5zZW4gIDxrZW5uZXRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRG8gbm90IGNhY2hlIG1f cmVzaXplc1RvQ29udGVudHNMYXlvdXRTaXplIG9uIFdlYktpdDIncyBXZWJQYWdlCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NjEzNAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERvIHRoZSByZXNpemUgdG8g Y29udGVudHMgb24gdGhlIHdlYiBwcm9jZXNzIHNpZGUuCisKKyAgICAgICAgQmFzZWQgb24gcGF0 Y2ggYnkgWmFsYW4gQnVqdGFzLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9y dC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lTG9h ZGVyQ2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKToKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6 OnNldFNpemUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzZXRSZXNpemVzVG9Db250ZW50 c1VzaW5nTGF5b3V0U2l6ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnJlc2l6ZVRvQ29u dGVudHNJZk5lZWRlZCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoK KwogMjAxMS0xMC0xNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+ CiAKICAgICAgICAgW0dUS10gQnVpbGQgaXMgYnJva2VuIHdpdGggbmV3IGxkCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVy Q2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2Vi RnJhbWVMb2FkZXJDbGllbnQuY3BwCmluZGV4IGZkOGI2YjMuLjUyZDY2ZWYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJD bGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQv V2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCkBAIC0xMTEzLDE0ICsxMTEzLDIyIEBAIHZvaWQgV2Vi RnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZvck5ld1BhZ2UoKQogewog ICAgIFdlYlBhZ2UqIHdlYlBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCk7CiAgICAgQ29sb3IgYmFja2dy b3VuZENvbG9yID0gd2ViUGFnZS0+ZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQoKSA/IENvbG9y Ojp0cmFuc3BhcmVudCA6IENvbG9yOjp3aGl0ZTsKKyAgICBGcmFtZVZpZXcqIHZpZXcgPSBtX2Zy YW1lLT5jb3JlRnJhbWUoKS0+dmlldygpOwogCiAgICAgYm9vbCBpc01haW5GcmFtZSA9IHdlYlBh Z2UtPm1haW5XZWJGcmFtZSgpID09IG1fZnJhbWU7CiAKICNpZiBFTkFCTEUoVElMRURfQkFDS0lO R19TVE9SRSkKLSAgICBJbnRTaXplIGN1cnJlbnRWaXNpYmxlQ29udGVudFNpemUgPSBtX2ZyYW1l LT5jb3JlRnJhbWUoKS0+dmlldygpID8gbV9mcmFtZS0+Y29yZUZyYW1lKCktPnZpZXcoKS0+dmlz aWJsZUNvbnRlbnRSZWN0KCkuc2l6ZSgpIDogSW50U2l6ZSgpOwotICAgIG1fZnJhbWUtPmNvcmVG cmFtZSgpLT5jcmVhdGVWaWV3KHdlYlBhZ2UtPnNpemUoKSwgYmFja2dyb3VuZENvbG9yLCBmYWxz ZSwgd2ViUGFnZS0+cmVzaXplc1RvQ29udGVudHNMYXlvdXRTaXplKCksIGlzTWFpbkZyYW1lICYm IHdlYlBhZ2UtPnJlc2l6ZXNUb0NvbnRlbnRzRW5hYmxlZCgpKTsKKyAgICBJbnRTaXplIGN1cnJl bnRWaXNpYmxlQ29udGVudFNpemU7CisgICAgSW50U2l6ZSBmaXhlZExheW91dFNpemU7CiAKLSAg ICBpZiAoaXNNYWluRnJhbWUgJiYgd2ViUGFnZS0+cmVzaXplc1RvQ29udGVudHNFbmFibGVkKCkp IHsKKyAgICBpZiAodmlldykgeworICAgICAgICBjdXJyZW50VmlzaWJsZUNvbnRlbnRTaXplID0g dmlldy0+dmlzaWJsZUNvbnRlbnRSZWN0KCkuc2l6ZSgpOworICAgICAgICBmaXhlZExheW91dFNp emUgPSB2aWV3LT5maXhlZExheW91dFNpemUoKTsKKyAgICB9CisKKyAgICBtX2ZyYW1lLT5jb3Jl RnJhbWUoKS0+Y3JlYXRlVmlldyh3ZWJQYWdlLT5zaXplKCksIGJhY2tncm91bmRDb2xvciwgZmFs c2UsIGZpeGVkTGF5b3V0U2l6ZSwgIWZpeGVkTGF5b3V0U2l6ZS5pc0VtcHR5KCkpOworCisgICAg aWYgKGlzTWFpbkZyYW1lICYmICFmaXhlZExheW91dFNpemUuaXNFbXB0eSgpKSB7CiAgICAgICAg IG1fZnJhbWUtPmNvcmVGcmFtZSgpLT52aWV3KCktPnNldERlbGVnYXRlc1Njcm9sbGluZyh0cnVl KTsKICAgICAgICAgbV9mcmFtZS0+Y29yZUZyYW1lKCktPnZpZXcoKS0+c2V0UGFpbnRzRW50aXJl Q29udGVudHModHJ1ZSk7CiAgICAgICAgIC8vIFRoZSBIaXN0b3J5Q29udHJvbGxlciB3aWxsIHVw ZGF0ZSB0aGUgc2Nyb2xsIHBvc2l0aW9uIGxhdGVyIGlmIG5lZWRlZC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCAzNWU0YzhhLi4xNWMwZDM0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBA IC02NjUsMTkgKzY2NSwxOSBAQCB2b2lkIFdlYlBhZ2U6OmxheW91dElmTmVlZGVkKCkKIAogdm9p ZCBXZWJQYWdlOjpzZXRTaXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHZpZXdTaXplKQogewor ICAgIEZyYW1lVmlldyogdmlldyA9IG1fcGFnZS0+bWFpbkZyYW1lKCktPnZpZXcoKTsKKwogI2lm IEVOQUJMRShUSUxFRF9CQUNLSU5HX1NUT1JFKQogICAgIC8vIElmIHdlIGFyZSByZXNpemluZyB0 byBjb250ZW50IGlnbm9yZSBleHRlcm5hbCBhdHRlbXB0cy4KLSAgICBpZiAoIW1fcmVzaXplc1Rv Q29udGVudHNMYXlvdXRTaXplLmlzRW1wdHkoKSkKKyAgICBpZiAodmlldy0+dXNlRml4ZWRMYXlv dXQoKSkKICAgICAgICAgcmV0dXJuOwogI2VuZGlmCiAKICAgICBpZiAobV92aWV3U2l6ZSA9PSB2 aWV3U2l6ZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgRnJhbWUqIGZyYW1lID0gbV9wYWdlLT5t YWluRnJhbWUoKTsKLSAgICAKLSAgICBmcmFtZS0+dmlldygpLT5yZXNpemUodmlld1NpemUpOwot ICAgIGZyYW1lLT52aWV3KCktPnNldE5lZWRzTGF5b3V0KCk7CisgICAgdmlldy0+cmVzaXplKHZp ZXdTaXplKTsKKyAgICB2aWV3LT5zZXROZWVkc0xheW91dCgpOwogICAgIG1fZHJhd2luZ0FyZWEt PnNldE5lZWRzRGlzcGxheShJbnRSZWN0KEludFBvaW50KDAsIDApLCB2aWV3U2l6ZSkpOwogICAg IAogICAgIG1fdmlld1NpemUgPSB2aWV3U2l6ZTsKQEAgLTY5MywzOSArNjkzLDQyIEBAIHZvaWQg V2ViUGFnZTo6c2V0Rml4ZWRWaXNpYmxlQ29udGVudFJlY3QoY29uc3QgSW50UmVjdCYgcmVjdCkK IAogdm9pZCBXZWJQYWdlOjpzZXRSZXNpemVzVG9Db250ZW50c1VzaW5nTGF5b3V0U2l6ZShjb25z dCBJbnRTaXplJiB0YXJnZXRMYXlvdXRTaXplKQogewotICAgIGlmIChtX3Jlc2l6ZXNUb0NvbnRl bnRzTGF5b3V0U2l6ZSA9PSB0YXJnZXRMYXlvdXRTaXplKQorICAgIEZyYW1lVmlldyogdmlldyA9 IG1fcGFnZS0+bWFpbkZyYW1lKCktPnZpZXcoKTsKKworICAgIGlmICh2aWV3LT5maXhlZExheW91 dFNpemUoKSA9PSB0YXJnZXRMYXlvdXRTaXplKQogICAgICAgICByZXR1cm47CiAKLSAgICBtX3Jl c2l6ZXNUb0NvbnRlbnRzTGF5b3V0U2l6ZSA9IHRhcmdldExheW91dFNpemU7CisgICAgYm9vbCBm aXhlZExheW91dCA9ICF0YXJnZXRMYXlvdXRTaXplLmlzRW1wdHkoKTsKIAotICAgIEZyYW1lKiBm cmFtZSA9IG1fcGFnZS0+bWFpbkZyYW1lKCk7Ci0gICAgaWYgKG1fcmVzaXplc1RvQ29udGVudHNM YXlvdXRTaXplLmlzRW1wdHkoKSkgewotICAgICAgICBmcmFtZS0+dmlldygpLT5zZXREZWxlZ2F0 ZXNTY3JvbGxpbmcoZmFsc2UpOwotICAgICAgICBmcmFtZS0+dmlldygpLT5zZXRVc2VGaXhlZExh eW91dChmYWxzZSk7Ci0gICAgICAgIGZyYW1lLT52aWV3KCktPnNldFBhaW50c0VudGlyZUNvbnRl bnRzKGZhbHNlKTsKLSAgICB9IGVsc2UgewotICAgICAgICBmcmFtZS0+dmlldygpLT5zZXREZWxl Z2F0ZXNTY3JvbGxpbmcodHJ1ZSk7Ci0gICAgICAgIGZyYW1lLT52aWV3KCktPnNldFVzZUZpeGVk TGF5b3V0KHRydWUpOwotICAgICAgICBmcmFtZS0+dmlldygpLT5zZXRQYWludHNFbnRpcmVDb250 ZW50cyh0cnVlKTsKLSAgICAgICAgZnJhbWUtPnZpZXcoKS0+c2V0Rml4ZWRMYXlvdXRTaXplKG1f cmVzaXplc1RvQ29udGVudHNMYXlvdXRTaXplKTsKKyAgICBpZiAoZml4ZWRMYXlvdXQpCisgICAg ICAgIHZpZXctPnNldEZpeGVkTGF5b3V0U2l6ZSh0YXJnZXRMYXlvdXRTaXplKTsKKworICAgIC8v IFNldCB2aWV3IGF0dHJpYnV0ZXMgYmFzZWQgb24gd2hldGhlciBmaXhlZCBsYXlvdXQgaXMgdXNl ZC4KKyAgICB2aWV3LT5zZXREZWxlZ2F0ZXNTY3JvbGxpbmcoZml4ZWRMYXlvdXQpOworICAgIHZp ZXctPnNldFVzZUZpeGVkTGF5b3V0KGZpeGVkTGF5b3V0KTsKKyAgICB2aWV3LT5zZXRQYWludHNF bnRpcmVDb250ZW50cyhmaXhlZExheW91dCk7CisKKyAgICAvLyBTY2hlZHVsZSBhIGxheW91dCB0 byB1c2UgdGhlIG5ldyB0YXJnZXQgc2l6ZS4KKyAgICBpZiAoIXZpZXctPmxheW91dFBlbmRpbmco KSkgeworICAgICAgICB2aWV3LT5zZXROZWVkc0xheW91dCgpOworICAgICAgICB2aWV3LT5zY2hl ZHVsZVJlbGF5b3V0KCk7CiAgICAgfQotICAgIGZyYW1lLT52aWV3KCktPmZvcmNlTGF5b3V0KCk7 CiB9CiAKIHZvaWQgV2ViUGFnZTo6cmVzaXplVG9Db250ZW50c0lmTmVlZGVkKCkKIHsKLSAgICBp ZiAobV9yZXNpemVzVG9Db250ZW50c0xheW91dFNpemUuaXNFbXB0eSgpKQotICAgICAgICByZXR1 cm47CisgICAgRnJhbWVWaWV3KiB2aWV3ID0gbV9wYWdlLT5tYWluRnJhbWUoKS0+dmlldygpOwog Ci0gICAgRnJhbWUqIGZyYW1lID0gbV9wYWdlLT5tYWluRnJhbWUoKTsKKyAgICBpZiAoIXZpZXct PnVzZUZpeGVkTGF5b3V0KCkpCisgICAgICAgIHJldHVybjsKIAotICAgIEludFNpemUgY29udGVu dFNpemUgPSBmcmFtZS0+dmlldygpLT5jb250ZW50c1NpemUoKTsKKyAgICBJbnRTaXplIGNvbnRl bnRTaXplID0gdmlldy0+Y29udGVudHNTaXplKCk7CiAgICAgaWYgKGNvbnRlbnRTaXplID09IG1f dmlld1NpemUpCiAgICAgICAgIHJldHVybjsKIAogICAgIG1fdmlld1NpemUgPSBjb250ZW50U2l6 ZTsKLSAgICBmcmFtZS0+dmlldygpLT5yZXNpemUobV92aWV3U2l6ZSk7Ci0gICAgZnJhbWUtPnZp ZXcoKS0+c2V0TmVlZHNMYXlvdXQoKTsKKyAgICB2aWV3LT5yZXNpemUobV92aWV3U2l6ZSk7Cisg ICAgdmlldy0+c2V0TmVlZHNMYXlvdXQoKTsKIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCA4YTdmODM1Li4zMjcwNDc3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTMwOCw5ICsz MDgsNiBAQCBwdWJsaWM6CiAjaWYgRU5BQkxFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCiAgICAgdm9p ZCBwYWdlRGlkUmVxdWVzdFNjcm9sbChjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYpOwogICAgIHZv aWQgc2V0Rml4ZWRWaXNpYmxlQ29udGVudFJlY3QoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpOwot Ci0gICAgYm9vbCByZXNpemVzVG9Db250ZW50c0VuYWJsZWQoKSBjb25zdCB7IHJldHVybiAhbV9y ZXNpemVzVG9Db250ZW50c0xheW91dFNpemUuaXNFbXB0eSgpOyB9Ci0gICAgV2ViQ29yZTo6SW50 U2l6ZSByZXNpemVzVG9Db250ZW50c0xheW91dFNpemUoKSBjb25zdCB7IHJldHVybiBtX3Jlc2l6 ZXNUb0NvbnRlbnRzTGF5b3V0U2l6ZTsgfQogICAgIHZvaWQgc2V0UmVzaXplc1RvQ29udGVudHNV c2luZ0xheW91dFNpemUoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgdGFyZ2V0TGF5b3V0U2l6ZSk7 CiAgICAgdm9pZCByZXNpemVUb0NvbnRlbnRzSWZOZWVkZWQoKTsKICNlbmRpZgotLSAKMS43LjQu MQoK