72511 2011-11-16 08:44:00 -0800 Make use-fixed-layout work reliable 2011-11-17 03:58:00 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kenneth kenneth hausmann pnormand zalan zeno oldest_to_newest 503924 0 kenneth 2011-11-16 08:44:00 -0800 SSIA 503931 1 115388 kenneth 2011-11-16 08:50:45 -0800 Created attachment 115388 Patch 503942 2 115390 kenneth 2011-11-16 08:57:08 -0800 Created attachment 115390 Patch (bug fix) 504047 3 115390 tonikitoo 2011-11-16 10:49:19 -0800 Comment on attachment 115390 Patch (bug fix) View in context: https://bugs.webkit.org/attachment.cgi?id=115390&action=review > Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:1144 > + m_frame->coreFrame()->createView(webPage->size(), backgroundColor, false, IntSize(), isMainFrame && webPage->useFixedLayout()); maybe add a /* XXX */ comment to make explicit what this boolean is about? > Source/WebKit2/WebProcess/WebPage/WebPage.h:266 > + bool useFixedLayout() const { return m_useFixedLayout; }; would usesFixedLayout or shouldUseFixedLayout read better? 504067 4 zalan 2011-11-16 11:05:58 -0800 - if (!mainFrame() || !mainFrame()->document() || mainFrame()-> document()->viewportArguments() == m_viewportArguments) + if (!mainFrame() || !mainFrame()->document()) return; I was wondering whether there won't be any performance penalty of getting multiple (false) viewport updates (setDocument, body inserted), but they all come before any layout happens, so i guess it's safe. We should still revisit it at some point to check whether there's a less intrusive way of doing it. + bool useFixedLayout() const { return m_useFixedLayout; }; redundant semicolon at the end. looks good. 504687 5 115390 hausmann 2011-11-17 02:50:14 -0800 Comment on attachment 115390 Patch (bug fix) View in context: https://bugs.webkit.org/attachment.cgi?id=115390&action=review r=me, but needs typo and comment fixes before landing :) > Source/WebKit2/ChangeLog:13 > + as that wouldn't work in cases, such as when the web process has > + crashes. "has crashes" -> "has crashed" or simply "crashes" without has :) >> Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:1144 >> + m_frame->coreFrame()->createView(webPage->size(), backgroundColor, false, IntSize(), isMainFrame && webPage->useFixedLayout()); > > maybe add a /* XXX */ comment to make explicit what this boolean is about? I agree with Antonio, it would be nice to fix that when landing. >> Source/WebKit2/WebProcess/WebPage/WebPage.h:266 >> + bool useFixedLayout() const { return m_useFixedLayout; }; > > would usesFixedLayout or shouldUseFixedLayout read better? useFixedLayout() is the same name that's also used for example in ScrollView.h. I guess for the moment it's better to be consistent here. 504710 6 115390 kenneth 2011-11-17 03:27:00 -0800 Comment on attachment 115390 Patch (bug fix) Landed in r100594 504717 7 pnormand 2011-11-17 03:49:56 -0800 (In reply to comment #6) > (From update of attachment 115390 [details]) > Landed in r100594 Broke GTK: ../../Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: In member function ‘virtual void WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage()’: ../../Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:1148: error: ‘isMainFrame’ was not declared in this scope make[1]: *** [Source/WebKit2/WebProcess/WebCoreSupport/libwebkit2gtk_3_0_la-WebFrameLoaderClient.lo] Error 1 504723 8 kenneth 2011-11-17 03:58:00 -0800 Build fix committed in r100595 115388 2011-11-16 08:50:45 -0800 2011-11-16 08:57:08 -0800 Patch 0001-Make-use-fixed-layout-work-reliable.patch text/plain 9188 kenneth RnJvbSAxNDMxNWU4MzIxZmU5ZGZhNzc4MjU2MDQ1ZmRhNmY2YWY5YWQ3NTIxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiA8a2VubmV0aEB3 ZWJraXQub3JnPgpEYXRlOiBXZWQsIDE2IE5vdiAyMDExIDE3OjQ1OjE5ICswMTAwClN1YmplY3Q6 IFtQQVRDSF0gTWFrZSB1c2UtZml4ZWQtbGF5b3V0IHdvcmsgcmVsaWFibGUKIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MjUxMQoKUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCgpTb3VyY2UvV2ViQ29yZToKCkFsd2F5cyBzZW5kIGEgdmlld3BvcnQgdXBkYXRlIHBl ciBwYWdlIGxvYWQgYXMgd2UgZGVwZW5kIG9uIHRoYXQsCnRvIHJlc2V0IGFsbCB2aWV3cG9ydCBo YW5kbGluZyBiZWZvcmUgZG9pbmcgbGF5b3V0LgoKKiBwYWdlL1BhZ2UuY3BwOgooV2ViQ29yZTo6 UGFnZTo6dXBkYXRlVmlld3BvcnRBcmd1bWVudHMpOgoKU291cmNlL1dlYktpdDI6CgpUaGUgY29k ZSBoYW5kbGluZyB1c2UtZml4ZWQtbGF5b3V0IHdhc24ndCAxMDAlIHJlbGlhYmxlLiBUaGUgY29k ZQp3YXMgY2hhbmdlZCB0byBtYWtlIHN1cmUgdGhlIHZhbHVlIGlzIGFsd2F5cyBjb3JyZWN0LgoK SXQgYWxzbyBkb2Vzbid0IHNldCB0aGUgdmFsdWUgYnkgbG9va2luZyBhdCB0aGUgcHJldmlvdXMg RnJhbWVWaWV3LAphcyB0aGF0IHdvdWxkbid0IHdvcmsgaW4gY2FzZXMsIHN1Y2ggYXMgd2hlbiB0 aGUgd2ViIHByb2Nlc3MgaGFzCmNyYXNoZXMuCgoqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQv V2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwOgooV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6 dHJhbnNpdGlvblRvQ29tbWl0dGVkRm9yTmV3UGFnZSk6CiogV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwOgooV2ViS2l0OjpXZWJQYWdlOjpXZWJQYWdlKToKKFdlYktpdDo6V2ViUGFnZTo6 c2V0UmVzaXplc1RvQ29udGVudHNVc2luZ0xheW91dFNpemUpOgooV2ViS2l0OjpXZWJQYWdlOjpz ZXRVc2VGaXhlZExheW91dCk6CiogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKFdlYktp dDo6V2ViUGFnZTo6dXNlRml4ZWRMYXlvdXQpOgoKICAgIFN0b3JlIHRoZSBzdGF0ZSBhcyBtX3Vz ZUZpeGVkTGF5b3V0IHNvIHRoYXQgaXQgY2FuIGJlIHVzZWQKICAgIGZyb20gdGhlIFdlYkZyYW1l TG9hZGVyQ2xpZW50LgotLS0KIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAg ICAgICAgICAgICAgIHwgICAxMyArKysrKysrKysrCiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2Uu Y3BwICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDIgKy0KIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAyNiArKysrKysrKysrKysrKysrKysr KwogLi4uL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcCAgICAgICAgfCAg IDI2ICsrKy0tLS0tLS0tLS0tLS0tLS0KIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcCAgICAgIHwgICAyMSArKysrKysrKystLS0tLS0tCiBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oICAgICAgICB8ICAgIDIgKwogNiBmaWxlcyBj aGFuZ2VkLCA1OCBpbnNlcnRpb25zKCspLCAzMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NzRiMWE1My4uOWJjYjFlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDExLTExLTE2 ICBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KKworICAg ICAgICBNYWtlIHVzZS1maXhlZC1sYXlvdXQgd29yayByZWxpYWJsZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzI1MTEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbHdheXMgc2VuZCBhIHZpZXdwb3J0IHVw ZGF0ZSBwZXIgcGFnZSBsb2FkIGFzIHdlIGRlcGVuZCBvbiB0aGF0LAorICAgICAgICB0byByZXNl dCBhbGwgdmlld3BvcnQgaGFuZGxpbmcgYmVmb3JlIGRvaW5nIGxheW91dC4KKworICAgICAgICAq IHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjp1cGRhdGVWaWV3cG9ydEFy Z3VtZW50cyk6CisKIDIwMTEtMTEtMTQgIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5A bm9raWEuY29tPgogCiAgICAgICAgIFtRdF0gUmVwbGFjZSB1c2Ugb2YgUUFwcGxpY2F0aW9uIHdp dGggUUd1aUFwcGxpY2F0aW9uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKaW5kZXggODY5NTU5MS4uZDBkZDFj MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL1BhZ2UuY3BwCkBAIC0zOTksNyArMzk5LDcgQEAgdm9pZCBQYWdlOjpzZXRO ZWVkc1JlY2FsY1N0eWxlSW5BbGxGcmFtZXMoKQogCiB2b2lkIFBhZ2U6OnVwZGF0ZVZpZXdwb3J0 QXJndW1lbnRzKCkKIHsKLSAgICBpZiAoIW1haW5GcmFtZSgpIHx8ICFtYWluRnJhbWUoKS0+ZG9j dW1lbnQoKSB8fCBtYWluRnJhbWUoKS0+ZG9jdW1lbnQoKS0+dmlld3BvcnRBcmd1bWVudHMoKSA9 PSBtX3ZpZXdwb3J0QXJndW1lbnRzKQorICAgIGlmICghbWFpbkZyYW1lKCkgfHwgIW1haW5GcmFt ZSgpLT5kb2N1bWVudCgpKQogICAgICAgICByZXR1cm47CiAKICAgICBtX3ZpZXdwb3J0QXJndW1l bnRzID0gbWFpbkZyYW1lKCktPmRvY3VtZW50KCktPnZpZXdwb3J0QXJndW1lbnRzKCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKaW5kZXggNDUxYzZmYi4uMjQzMzhiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisy MDExLTExLTE2ICBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9y Zz4KKworICAgICAgICBNYWtlIHVzZS1maXhlZC1sYXlvdXQgd29yayByZWxpYWJsZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzI1MTEKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY29kZSBoYW5kbGlu ZyB1c2UtZml4ZWQtbGF5b3V0IHdhc24ndCAxMDAlIHJlbGlhYmxlLiBUaGUgY29kZQorICAgICAg ICB3YXMgY2hhbmdlZCB0byBtYWtlIHN1cmUgdGhlIHZhbHVlIGlzIGFsd2F5cyBjb3JyZWN0Lgor CisgICAgICAgIEl0IGFsc28gZG9lc24ndCBzZXQgdGhlIHZhbHVlIGJ5IGxvb2tpbmcgYXQgdGhl IHByZXZpb3VzIEZyYW1lVmlldywKKyAgICAgICAgYXMgdGhhdCB3b3VsZG4ndCB3b3JrIGluIGNh c2VzLCBzdWNoIGFzIHdoZW4gdGhlIHdlYiBwcm9jZXNzIGhhcworICAgICAgICBjcmFzaGVzLgor CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu dC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9u VG9Db21taXR0ZWRGb3JOZXdQYWdlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OldlYlBhZ2UpOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlOjpzZXRSZXNpemVzVG9Db250ZW50c1VzaW5nTGF5b3V0U2l6ZSk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNldFVzZUZpeGVkTGF5b3V0KToKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp1 c2VGaXhlZExheW91dCk6CisKKyAgICAgICAgICAgIFN0b3JlIHRoZSBzdGF0ZSBhcyBtX3VzZUZp eGVkTGF5b3V0IHNvIHRoYXQgaXQgY2FuIGJlIHVzZWQKKyAgICAgICAgICAgIGZyb20gdGhlIFdl YkZyYW1lTG9hZGVyQ2xpZW50LgorCiAyMDExLTExLTE0ICBDYWlvIE1hcmNlbG8gZGUgT2xpdmVp cmEgRmlsaG8gIDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgW1F0XSBS ZW1vdmUgcmVmZXJlbmNlIHRvIFFXZWJOYXZpZ2F0aW9uQ29udHJvbGxlcgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNs aWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZy YW1lTG9hZGVyQ2xpZW50LmNwcAppbmRleCBlZDcxZTM4Li4zNTE4YTY5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xp ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl YkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtMTEzMiwzNSArMTEzMiwxNyBAQCB2b2lkIFdlYkZy YW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0ZWRGcm9tQ2FjaGVkRnJhbWUoQ2Fj aGVkRnJhbWUqKQogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6dHJhbnNpdGlvblRvQ29tbWl0 dGVkRm9yTmV3UGFnZSgpCiB7CiAgICAgV2ViUGFnZSogd2ViUGFnZSA9IG1fZnJhbWUtPnBhZ2Uo KTsKLSAgICBDb2xvciBiYWNrZ3JvdW5kQ29sb3IgPSB3ZWJQYWdlLT5kcmF3c1RyYW5zcGFyZW50 QmFja2dyb3VuZCgpID8gQ29sb3I6OnRyYW5zcGFyZW50IDogQ29sb3I6OndoaXRlOwotCiAgICAg Ym9vbCBpc01haW5GcmFtZSA9IHdlYlBhZ2UtPm1haW5XZWJGcmFtZSgpID09IG1fZnJhbWU7CiAK LSNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKLSAgICBJbnRTaXplIGN1cnJlbnRWaXNpYmxl Q29udGVudFNpemU7Ci0gICAgSW50U2l6ZSBmaXhlZExheW91dFNpemU7Ci0KLSAgICBpZiAoRnJh bWVWaWV3KiB2aWV3ID0gbV9mcmFtZS0+Y29yZUZyYW1lKCktPnZpZXcoKSkgewotICAgICAgICBj dXJyZW50VmlzaWJsZUNvbnRlbnRTaXplID0gdmlldy0+dmlzaWJsZUNvbnRlbnRSZWN0KCkuc2l6 ZSgpOwotICAgICAgICBmaXhlZExheW91dFNpemUgPSB2aWV3LT5maXhlZExheW91dFNpemUoKTsK LSAgICB9Ci0KLSAgICBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+Y3JlYXRlVmlldyh3ZWJQYWdlLT5z aXplKCksIGJhY2tncm91bmRDb2xvciwgZmFsc2UsIGZpeGVkTGF5b3V0U2l6ZSwgIWZpeGVkTGF5 b3V0U2l6ZS5pc0VtcHR5KCkpOwotCi0gICAgaWYgKGlzTWFpbkZyYW1lICYmICFmaXhlZExheW91 dFNpemUuaXNFbXB0eSgpKSB7Ci0gICAgICAgIG1fZnJhbWUtPmNvcmVGcmFtZSgpLT52aWV3KCkt PnNldERlbGVnYXRlc1Njcm9sbGluZyh0cnVlKTsKLSAgICAgICAgbV9mcmFtZS0+Y29yZUZyYW1l KCktPnZpZXcoKS0+c2V0UGFpbnRzRW50aXJlQ29udGVudHModHJ1ZSk7Ci0gICAgICAgIC8vIFRo ZSBIaXN0b3J5Q29udHJvbGxlciB3aWxsIHVwZGF0ZSB0aGUgc2Nyb2xsIHBvc2l0aW9uIGxhdGVy IGlmIG5lZWRlZC4KLSAgICAgICAgbV9mcmFtZS0+Y29yZUZyYW1lKCktPnZpZXcoKS0+c2V0Rml4 ZWRWaXNpYmxlQ29udGVudFJlY3QoSW50UmVjdChJbnRQb2ludDo6emVybygpLCBjdXJyZW50Vmlz aWJsZUNvbnRlbnRTaXplKSk7Ci0gICAgfQorICAgIENvbG9yIGJhY2tncm91bmRDb2xvciA9IHdl YlBhZ2UtPmRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKCkgPyBDb2xvcjo6dHJhbnNwYXJlbnQg OiBDb2xvcjo6d2hpdGU7CiAKLSNlbHNlCisjaWYgIVVTRShUSUxFRF9CQUNLSU5HX1NUT1JFKQog ICAgIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlID0gbV9mcmFtZS0+Y29yZUZyYW1l KCktPmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpLT5yZXNwb25zZSgpOwogICAgIG1fZnJhbWVI YXNDdXN0b21SZXByZXNlbnRhdGlvbiA9IGlzTWFpbkZyYW1lICYmIFdlYlByb2Nlc3M6OnNoYXJl ZCgpLnNob3VsZFVzZUN1c3RvbVJlcHJlc2VudGF0aW9uRm9yUmVzcG9uc2UocmVzcG9uc2UpOwot Ci0gICAgbV9mcmFtZS0+Y29yZUZyYW1lKCktPmNyZWF0ZVZpZXcod2ViUGFnZS0+c2l6ZSgpLCBi YWNrZ3JvdW5kQ29sb3IsIGZhbHNlLCBJbnRTaXplKCksIGZhbHNlKTsKICNlbmRpZgogCisgICAg bV9mcmFtZS0+Y29yZUZyYW1lKCktPmNyZWF0ZVZpZXcod2ViUGFnZS0+c2l6ZSgpLCBiYWNrZ3Jv dW5kQ29sb3IsIGZhbHNlLCBJbnRTaXplKCksIGlzTWFpbkZyYW1lICYmIHdlYlBhZ2UtPnVzZUZp eGVkTGF5b3V0KCkpOworCiAgICAgbV9mcmFtZS0+Y29yZUZyYW1lKCktPnZpZXcoKS0+c2V0VHJh bnNwYXJlbnQoIXdlYlBhZ2UtPmRyYXdzQmFja2dyb3VuZCgpKTsKIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDQ5YjVmYzQuLmI2NDlk NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAK QEAgLTE3Miw2ICsxNzIsNyBAQCBQYXNzUmVmUHRyPFdlYlBhZ2U+IFdlYlBhZ2U6OmNyZWF0ZSh1 aW50NjRfdCBwYWdlSUQsIGNvbnN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZQogCiBXZWJQYWdlOjpX ZWJQYWdlKHVpbnQ2NF90IHBhZ2VJRCwgY29uc3QgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyYg cGFyYW1ldGVycykKICAgICA6IG1fdmlld1NpemUocGFyYW1ldGVycy52aWV3U2l6ZSkKKyAgICAs IG1fdXNlRml4ZWRMYXlvdXQoZmFsc2UpCiAgICAgLCBtX2RyYXdzQmFja2dyb3VuZCh0cnVlKQog ICAgICwgbV9kcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZChmYWxzZSkKICAgICAsIG1faXNJblJl ZG8oZmFsc2UpCkBAIC03MDQsMTggKzcwNSwxOCBAQCB2b2lkIFdlYlBhZ2U6OnNldFJlc2l6ZXNU b0NvbnRlbnRzVXNpbmdMYXlvdXRTaXplKGNvbnN0IEludFNpemUmIHRhcmdldExheW91dFNpegog ewogICAgIEZyYW1lVmlldyogdmlldyA9IG1fcGFnZS0+bWFpbkZyYW1lKCktPnZpZXcoKTsKIAot ICAgIGlmICh2aWV3LT5maXhlZExheW91dFNpemUoKSA9PSB0YXJnZXRMYXlvdXRTaXplKQotICAg ICAgICByZXR1cm47CisgICAgbV91c2VGaXhlZExheW91dCA9ICF0YXJnZXRMYXlvdXRTaXplLmlz RW1wdHkoKTsKIAotICAgIGJvb2wgZml4ZWRMYXlvdXQgPSAhdGFyZ2V0TGF5b3V0U2l6ZS5pc0Vt cHR5KCk7CisgICAgLy8gU2V0IHZpZXcgYXR0cmlidXRlcyBiYXNlZCBvbiB3aGV0aGVyIGZpeGVk IGxheW91dCBpcyB1c2VkLgorICAgIHZpZXctPnNldERlbGVnYXRlc1Njcm9sbGluZyhtX3VzZUZp eGVkTGF5b3V0KTsKKyAgICB2aWV3LT5zZXRVc2VGaXhlZExheW91dChtX3VzZUZpeGVkTGF5b3V0 KTsKKyAgICB2aWV3LT5zZXRQYWludHNFbnRpcmVDb250ZW50cyhtX3VzZUZpeGVkTGF5b3V0KTsK IAotICAgIGlmIChmaXhlZExheW91dCkKLSAgICAgICAgdmlldy0+c2V0Rml4ZWRMYXlvdXRTaXpl KHRhcmdldExheW91dFNpemUpOworICAgIGlmICh2aWV3LT5maXhlZExheW91dFNpemUoKSA9PSB0 YXJnZXRMYXlvdXRTaXplKQorICAgICAgICByZXR1cm47CiAKLSAgICAvLyBTZXQgdmlldyBhdHRy aWJ1dGVzIGJhc2VkIG9uIHdoZXRoZXIgZml4ZWQgbGF5b3V0IGlzIHVzZWQuCi0gICAgdmlldy0+ c2V0RGVsZWdhdGVzU2Nyb2xsaW5nKGZpeGVkTGF5b3V0KTsKLSAgICB2aWV3LT5zZXRVc2VGaXhl ZExheW91dChmaXhlZExheW91dCk7Ci0gICAgdmlldy0+c2V0UGFpbnRzRW50aXJlQ29udGVudHMo Zml4ZWRMYXlvdXQpOworICAgIC8vIEFsd2F5cyByZXNldCBldmVuIHdoZW4gZW1wdHkuCisgICAg dmlldy0+c2V0Rml4ZWRMYXlvdXRTaXplKHRhcmdldExheW91dFNpemUpOwogCiAgICAgLy8gU2No ZWR1bGUgYSBsYXlvdXQgdG8gdXNlIHRoZSBuZXcgdGFyZ2V0IHNpemUuCiAgICAgaWYgKCF2aWV3 LT5sYXlvdXRQZW5kaW5nKCkpIHsKQEAgLTg4OSw2ICs4OTAsOCBAQCBmbG9hdCBXZWJQYWdlOjpk ZXZpY2VTY2FsZUZhY3RvcigpIGNvbnN0CiAKIHZvaWQgV2ViUGFnZTo6c2V0VXNlRml4ZWRMYXlv dXQoYm9vbCBmaXhlZCkKIHsKKyAgICBtX3VzZUZpeGVkTGF5b3V0ID0gdHJ1ZTsKKwogICAgIEZy YW1lKiBmcmFtZSA9IG1fbWFpbkZyYW1lLT5jb3JlRnJhbWUoKTsKICAgICBpZiAoIWZyYW1lKQog ICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuaAppbmRleCA1YTNiZmFhLi5mM2M1YmM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTI2Myw2ICsyNjMsNyBAQCBwdWJsaWM6CiAgICAgZG91 YmxlIHBhZ2VTY2FsZUZhY3RvcigpIGNvbnN0OwogCiAgICAgdm9pZCBzZXRVc2VGaXhlZExheW91 dChib29sKTsKKyAgICBib29sIHVzZUZpeGVkTGF5b3V0KCkgY29uc3QgeyByZXR1cm4gbV91c2VG aXhlZExheW91dDsgfTsKICAgICB2b2lkIHNldEZpeGVkTGF5b3V0U2l6ZShjb25zdCBXZWJDb3Jl OjpJbnRTaXplJik7CiAKICAgICBib29sIGRyYXdzQmFja2dyb3VuZCgpIGNvbnN0IHsgcmV0dXJu IG1fZHJhd3NCYWNrZ3JvdW5kOyB9CkBAIC02MDQsNiArNjA1LDcgQEAgcHJpdmF0ZToKIAogICAg IFdlYkNvcmU6OkludFNpemUgbV92aWV3U2l6ZTsKICAgICBPd25QdHI8RHJhd2luZ0FyZWE+IG1f ZHJhd2luZ0FyZWE7CisgICAgYm9vbCBtX3VzZUZpeGVkTGF5b3V0OwogCiAgICAgYm9vbCBtX2Ry YXdzQmFja2dyb3VuZDsKICAgICBib29sIG1fZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQ7Ci0t IAoxLjcuNC4xCgo= 115390 2011-11-16 08:57:08 -0800 2011-11-17 03:27:00 -0800 Patch (bug fix) 0001-Make-use-fixed-layout-work-reliable.patch text/plain 0 kenneth