46915 2010-09-30 10:02:48 -0700 Windows client needs updating when live iframe element is moved between pages 2010-10-22 17:48:18 -0700 1 1 1 Unclassified WebKit Frames 528+ (Nightly build) PC Windows 7 RESOLVED FIXED InRadar P2 Normal --- 1 jennb jennb aroben commit-queue dimich oldest_to_newest 287610 0 jennb 2010-09-30 10:02:48 -0700 fast/frames/iframe-reparenting-adopt-node.html crashes due to this bug. The Windows crash log can be found here: http://build.webkit.org/results/Windows%20Release%20(Tests)/r68785%20(4613)/CrashLog_0ad0_2010-09-30_09-27-13-421.txt The WebFrame needs to update its pointer to the WebView in WebFrameLoaderClient::didTransferChildFrameToNewDocument(). It is still pointing to the WebView of the former page, which has been deleted in this test. Accessing the invalid pointer results in the crash. This bug is similar to 46300 in the GTK client. 287617 1 aroben 2010-09-30 10:13:22 -0700 I believe bug 44713 is the Mac equivalent. 287618 2 aroben 2010-09-30 10:13:57 -0700 <rdar://problem/8497488> 287633 3 jennb 2010-09-30 10:33:40 -0700 (In reply to comment #1) > I believe bug 44713 is the Mac equivalent. 44713 has a slightly different issue. Mac has the correct WebView for the frame after reparenting, but the resource is only known to the WebView of the former page. Knowledge of the frame's resources need to be transferred over from the old WebView to the frame's current WebView to fix 44713. After this bug is fixed for Windows, we also have to fix 44713 for Windows (and other platforms). 296534 4 71226 jennb 2010-10-19 16:48:45 -0700 Created attachment 71226 patch 298155 5 71226 aroben 2010-10-22 13:54:56 -0700 Comment on attachment 71226 patch View in context: https://bugs.webkit.org/attachment.cgi?id=71226&action=review > WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp:742 > void WebFrameLoaderClient::didTransferChildFrameToNewDocument(Page*) > { > + WebView* webView = m_webFrame->webView(); > + Frame* coreFrame = core(m_webFrame); > + Frame* coreParentFrame = coreFrame->tree()->parent(); > + WebView* parentWebView = kit(coreParentFrame)->webView(); > + > + if (webView != parentWebView) > + m_webFrame->setWebView(parentWebView); > + > + ASSERT(m_webFrame->webView()->page() == coreFrame->page()); > } Does the passed-in Page correspond to the new document? If so you can just do: WebView* newWebView = core(page); (The name of this function is confusing; it's talking about moving a frame between pages, but says "document" instead of "page"!) 298173 6 jennb 2010-10-22 14:24:49 -0700 (In reply to comment #5) > (From update of attachment 71226 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=71226&action=review > > > WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp:742 > > void WebFrameLoaderClient::didTransferChildFrameToNewDocument(Page*) > > { > > + WebView* webView = m_webFrame->webView(); > > + Frame* coreFrame = core(m_webFrame); > > + Frame* coreParentFrame = coreFrame->tree()->parent(); > > + WebView* parentWebView = kit(coreParentFrame)->webView(); > > + > > + if (webView != parentWebView) > > + m_webFrame->setWebView(parentWebView); > > + > > + ASSERT(m_webFrame->webView()->page() == coreFrame->page()); > > } > > Does the passed-in Page correspond to the new document? If so you can just do: > > WebView* newWebView = core(page); > > (The name of this function is confusing; it's talking about moving a frame between pages, but says "document" instead of "page"!) The passed in page is the old page. I will be removing that argument after bug 44713 is fixed as it turns out that argument is not needed for the fix. 298205 7 71226 aroben 2010-10-22 15:03:43 -0700 Comment on attachment 71226 patch View in context: https://bugs.webkit.org/attachment.cgi?id=71226&action=review >>> WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp:742 >>> } >> >> Does the passed-in Page correspond to the new document? If so you can just do: >> >> WebView* newWebView = core(page); >> >> (The name of this function is confusing; it's talking about moving a frame between pages, but says "document" instead of "page"!) > > The passed in page is the old page. I will be removing that argument after bug 44713 is fixed as it turns out that argument is not needed for the fix. This code will crash if coreFrame doesn't have a parent frame, or that parent frame doesn't have a WebFrame associated with it. You should either add some assertions or some null-checks. Other than that this looks fine. 298233 8 71605 jennb 2010-10-22 15:57:34 -0700 Created attachment 71605 updated patch Revised to update the webview without referring to the parent frame as it's possible to find the webview directly from Page. Same result. Simpler code. 298260 9 71605 aroben 2010-10-22 16:47:36 -0700 Comment on attachment 71605 updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=71605&action=review > WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp:737 > void WebFrameLoaderClient::didTransferChildFrameToNewDocument(Page*) > { > + Frame* coreFrame = core(m_webFrame); > + if (m_webFrame->webView()->page() != coreFrame->page()) > + m_webFrame->setWebView(kit(coreFrame->page())); > } > This definitely looks better. It's possible for a Frame not to have a Page, and for a WebFrame not to have a WebView, though. Could we run into that situation here? 298273 10 71613 jennb 2010-10-22 17:11:28 -0700 Created attachment 71613 updated patch again Revised code to work even if Frame has no Page - kit(Page) handles this case - and if WebFrame has no WebView. 298287 11 71613 commit-queue 2010-10-22 17:48:12 -0700 Comment on attachment 71613 updated patch again Clearing flags on attachment: 71613 Committed r70376: <http://trac.webkit.org/changeset/70376> 298288 12 commit-queue 2010-10-22 17:48:18 -0700 All reviewed patches have been landed. Closing bug. 71226 2010-10-19 16:48:45 -0700 2010-10-22 15:57:34 -0700 patch patch46915.txt text/plain 3647 jennb ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmYmFlZmFlLi5iZWU1ZDJkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMTAt MTkgIEplbm4gQnJhaXRod2FpdGUgIDxqZW5uYkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2luZG93cyBjbGllbnQgbmVlZHMg dXBkYXRpbmcgd2hlbiBsaXZlIGlmcmFtZSBlbGVtZW50IGlzIG1vdmVkIGJldHdlZW4gcGFnZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2OTE1CisK KyAgICAgICAgKiBwbGF0Zm9ybS93aW4vU2tpcHBlZDoKKyAgICAgICAgU3RvcCBza2lwcGluZyBm YXN0L2ZyYW1lcy9pZnJhbWUtcmVwYXJlbnRpbmctYWRvcHQtbm9kZS5odG1sCisKIDIwMTAtMTAt MTkgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93 aW4vU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9Ta2lwcGVkCmluZGV4IGQwOGQ3 OGMuLmE1ZjQxOTAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9Ta2lwcGVk CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9Ta2lwcGVkCkBAIC0yOTgsOSArMjk4LDYg QEAgZWRpdGluZy9zZWxlY3Rpb24vY29udGV4dC1tZW51LW9uLXRleHQuaHRtbAogIyBhbmQgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1MDIxCiBtZWRpYS9jb250ZXh0 LW1lbnUtYWN0aW9ucy5odG1sCiAKLSMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTQ0NzEzCi1mYXN0L2ZyYW1lcy9pZnJhbWUtcmVwYXJlbnRpbmctYWRvcHQtbm9kZS5o dG1sCi0KICMgQXNzZXJ0aW9uIGZhaWx1cmUgaW4gcmVwbGF5U2F2ZWRFdmVudHMgaHR0cDovL3dl YmtpdC5vcmcvYi8yMTc5NgogZWRpdGluZy9wYXN0ZWJvYXJkL2Ryb3AtdGV4dC1ldmVudHMuaHRt bAogZWRpdGluZy9zZWxlY3Rpb24vZHJhZy1pbi1pZnJhbWUuaHRtbApkaWZmIC0tZ2l0IGEvV2Vi S2l0L3dpbi9DaGFuZ2VMb2cgYi9XZWJLaXQvd2luL0NoYW5nZUxvZwppbmRleCAyZWFiZTg5Li5j OTkwN2IzIDEwMDY0NAotLS0gYS9XZWJLaXQvd2luL0NoYW5nZUxvZworKysgYi9XZWJLaXQvd2lu L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEwLTEwLTE5ICBKZW5uIEJyYWl0aHdhaXRl ICA8amVubmJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFdpbmRvd3MgY2xpZW50IG5lZWRzIHVwZGF0aW5nIHdoZW4gbGl2ZSBp ZnJhbWUgZWxlbWVudCBpcyBtb3ZlZCBiZXR3ZWVuIHBhZ2VzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjkxNQorCisgICAgICAgICogV2ViQ29yZVN1 cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViRnJhbWVMb2FkZXJD bGllbnQ6OmRpZFRyYW5zZmVyQ2hpbGRGcmFtZVRvTmV3RG9jdW1lbnQpOgorICAgICAgICBVcGRh dGUgV2ViVmlldyBpbiBXZWJGcmFtZSB0byBtYXRjaCB0aGF0IG9mIHRoZSBwYXJlbnQgZnJhbWUu CisgICAgICAgICogV2ViRnJhbWUuY3BwOgorICAgICAgICAoV2ViRnJhbWU6OnNldFdlYlZpZXcp OgorICAgICAgICBBZGRlZC4KKyAgICAgICAgKiBXZWJGcmFtZS5oOgorCiAyMDEwLTEwLTE4ICBQ YXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KZGlmZiAtLWdpdCBhL1dlYktpdC93aW4vV2ViQ29yZVN1 cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwIGIvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9y dC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKaW5kZXggZmZjNDFiMi4uNDg0YzUyMCAxMDA2NDQK LS0tIGEvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAK KysrIGIvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAK QEAgLTczMCw2ICs3MzAsMTUgQEAgUGFzc1JlZlB0cjxGcmFtZT4gV2ViRnJhbWVMb2FkZXJDbGll bnQ6OmNyZWF0ZUZyYW1lKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgU3RyaW4KIAogdm9pZCBXZWJG cmFtZUxvYWRlckNsaWVudDo6ZGlkVHJhbnNmZXJDaGlsZEZyYW1lVG9OZXdEb2N1bWVudChQYWdl KikKIHsKKyAgICBXZWJWaWV3KiB3ZWJWaWV3ID0gbV93ZWJGcmFtZS0+d2ViVmlldygpOworICAg IEZyYW1lKiBjb3JlRnJhbWUgPSBjb3JlKG1fd2ViRnJhbWUpOworICAgIEZyYW1lKiBjb3JlUGFy ZW50RnJhbWUgPSBjb3JlRnJhbWUtPnRyZWUoKS0+cGFyZW50KCk7CisgICAgV2ViVmlldyogcGFy ZW50V2ViVmlldyA9IGtpdChjb3JlUGFyZW50RnJhbWUpLT53ZWJWaWV3KCk7CisKKyAgICBpZiAo d2ViVmlldyAhPSBwYXJlbnRXZWJWaWV3KQorICAgICAgICBtX3dlYkZyYW1lLT5zZXRXZWJWaWV3 KHBhcmVudFdlYlZpZXcpOworCisgICAgQVNTRVJUKG1fd2ViRnJhbWUtPndlYlZpZXcoKS0+cGFn ZSgpID09IGNvcmVGcmFtZS0+cGFnZSgpKTsKIH0KIAogUGFzc1JlZlB0cjxGcmFtZT4gV2ViRnJh bWVMb2FkZXJDbGllbnQ6OmNyZWF0ZUZyYW1lKGNvbnN0IEtVUkwmIFVSTCwgY29uc3QgU3RyaW5n JiBuYW1lLCBIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93bmVyRWxlbWVudCwgY29uc3QgU3RyaW5n JiByZWZlcnJlcikKZGlmZiAtLWdpdCBhL1dlYktpdC93aW4vV2ViRnJhbWUuY3BwIGIvV2ViS2l0 L3dpbi9XZWJGcmFtZS5jcHAKaW5kZXggOGRmZThiYi4uNGM3NzMwMCAxMDA2NDQKLS0tIGEvV2Vi S2l0L3dpbi9XZWJGcmFtZS5jcHAKKysrIGIvV2ViS2l0L3dpbi9XZWJGcmFtZS5jcHAKQEAgLTI1 NzQsNiArMjU3NCwxMSBAQCBXZWJWaWV3KiBXZWJGcmFtZTo6d2ViVmlldygpIGNvbnN0CiAgICAg cmV0dXJuIGQtPndlYlZpZXc7CiB9CiAKK3ZvaWQgV2ViRnJhbWU6OnNldFdlYlZpZXcoV2ViVmll dyogd2ViVmlldykKK3sKKyAgICBkLT53ZWJWaWV3ID0gd2ViVmlldzsKK30KKwogQ09NUHRyPElB Y2Nlc3NpYmxlPiBXZWJGcmFtZTo6YWNjZXNzaWJsZSgpIGNvbnN0CiB7CiAgICAgRnJhbWUqIGNv cmVGcmFtZSA9IGNvcmUodGhpcyk7CmRpZmYgLS1naXQgYS9XZWJLaXQvd2luL1dlYkZyYW1lLmgg Yi9XZWJLaXQvd2luL1dlYkZyYW1lLmgKaW5kZXggMTQ3ZGFhOC4uY2RmM2Q4NCAxMDA2NDQKLS0t IGEvV2ViS2l0L3dpbi9XZWJGcmFtZS5oCisrKyBiL1dlYktpdC93aW4vV2ViRnJhbWUuaApAQCAt MzcxLDYgKzM3MSw3IEBAIHB1YmxpYzoKICAgICBXZWJDb3JlOjpLVVJMIHVybCgpIGNvbnN0Owog CiAgICAgV2ViVmlldyogd2ViVmlldygpIGNvbnN0OworICAgIHZvaWQgc2V0V2ViVmlldyhXZWJW aWV3Kik7CiAKICAgICBDT01QdHI8SUFjY2Vzc2libGU+IGFjY2Vzc2libGUoKSBjb25zdDsKIAo= 71605 2010-10-22 15:57:34 -0700 2010-10-22 17:11:28 -0700 updated patch patch46915-2.txt text/plain 3418 jennb ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhZTJmNzI1Li45YzU1NjY2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMTAt MjIgIEplbm4gQnJhaXRod2FpdGUgIDxqZW5uYkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2luZG93cyBjbGllbnQgbmVlZHMg dXBkYXRpbmcgd2hlbiBsaXZlIGlmcmFtZSBlbGVtZW50IGlzIG1vdmVkIGJldHdlZW4gcGFnZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2OTE1CisK KyAgICAgICAgKiBwbGF0Zm9ybS93aW4vU2tpcHBlZDoKKyAgICAgICAgU3RvcCBza2lwcGluZyBm YXN0L2ZyYW1lcy9pZnJhbWUtcmVwYXJlbnRpbmctYWRvcHQtbm9kZS5odG1sCisKIDIwMTAtMTAt MjIgIEFiaGlzaGVrIEFyeWEgIDxpbmZlcm5vQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBEYXZlIEh5YXR0LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2lu L1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vU2tpcHBlZAppbmRleCBkOTJmZTY2 Li5jODBjZjQwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vU2tpcHBlZAor KysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vU2tpcHBlZApAQCAtMjk4LDkgKzI5OCw2IEBA IGVkaXRpbmcvc2VsZWN0aW9uL2NvbnRleHQtbWVudS1vbi10ZXh0Lmh0bWwKICMgYW5kIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTAyMQogbWVkaWEvY29udGV4dC1t ZW51LWFjdGlvbnMuaHRtbAogCi0jIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00NDcxMwotZmFzdC9mcmFtZXMvaWZyYW1lLXJlcGFyZW50aW5nLWFkb3B0LW5vZGUuaHRt bAotCiAjIEFzc2VydGlvbiBmYWlsdXJlIGluIHJlcGxheVNhdmVkRXZlbnRzIGh0dHA6Ly93ZWJr aXQub3JnL2IvMjE3OTYKIGVkaXRpbmcvcGFzdGVib2FyZC9kcm9wLXRleHQtZXZlbnRzLmh0bWwK IGVkaXRpbmcvc2VsZWN0aW9uL2RyYWctaW4taWZyYW1lLmh0bWwKZGlmZiAtLWdpdCBhL1dlYktp dC93aW4vQ2hhbmdlTG9nIGIvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKaW5kZXggZTE4ZmRhNy4uOWYz OTRkZiAxMDA2NDQKLS0tIGEvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3dpbi9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0xMC0yMiAgSmVubiBCcmFpdGh3YWl0ZSAg PGplbm5iQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXaW5kb3dzIGNsaWVudCBuZWVkcyB1cGRhdGluZyB3aGVuIGxpdmUgaWZy YW1lIGVsZW1lbnQgaXMgbW92ZWQgYmV0d2VlbiBwYWdlcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDY5MTUKKworICAgICAgICAqIFdlYkNvcmVTdXBw b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYkZyYW1lTG9hZGVyQ2xp ZW50OjpkaWRUcmFuc2ZlckNoaWxkRnJhbWVUb05ld0RvY3VtZW50KToKKyAgICAgICAgVXBkYXRl IFdlYlZpZXcgaW4gV2ViRnJhbWUgdG8gbWF0Y2ggdGhhdCBvZiB0aGUgY3VycmVudCBwYWdlLgor ICAgICAgICAqIFdlYkZyYW1lLmNwcDoKKyAgICAgICAgKFdlYkZyYW1lOjpzZXRXZWJWaWV3KToK KyAgICAgICAgQWRkZWQuCisgICAgICAgICogV2ViRnJhbWUuaDoKKwogMjAxMC0xMC0yMiAgU2Ft IFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIEZpeCB3aW5kb3dzIGJ1aWxkLgpk aWZmIC0tZ2l0IGEvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu dC5jcHAgYi9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNw cAppbmRleCBlNzViOTg0Li5kZDU4ZWYzIDEwMDY0NAotLS0gYS9XZWJLaXQvd2luL1dlYkNvcmVT dXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9XZWJLaXQvd2luL1dlYkNvcmVT dXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtNzMwLDYgKzczMCw5IEBAIFBhc3NS ZWZQdHI8RnJhbWU+IFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpjcmVhdGVGcmFtZShjb25zdCBLVVJM JiB1cmwsIGNvbnN0IFN0cmluCiAKIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpZFRyYW5z ZmVyQ2hpbGRGcmFtZVRvTmV3RG9jdW1lbnQoUGFnZSopCiB7CisgICAgRnJhbWUqIGNvcmVGcmFt ZSA9IGNvcmUobV93ZWJGcmFtZSk7CisgICAgaWYgKG1fd2ViRnJhbWUtPndlYlZpZXcoKS0+cGFn ZSgpICE9IGNvcmVGcmFtZS0+cGFnZSgpKQorICAgICAgICBtX3dlYkZyYW1lLT5zZXRXZWJWaWV3 KGtpdChjb3JlRnJhbWUtPnBhZ2UoKSkpOwogfQogCiBQYXNzUmVmUHRyPEZyYW1lPiBXZWJGcmFt ZUxvYWRlckNsaWVudDo6Y3JlYXRlRnJhbWUoY29uc3QgS1VSTCYgVVJMLCBjb25zdCBTdHJpbmcm IG5hbWUsIEhUTUxGcmFtZU93bmVyRWxlbWVudCogb3duZXJFbGVtZW50LCBjb25zdCBTdHJpbmcm IHJlZmVycmVyKQpkaWZmIC0tZ2l0IGEvV2ViS2l0L3dpbi9XZWJGcmFtZS5jcHAgYi9XZWJLaXQv d2luL1dlYkZyYW1lLmNwcAppbmRleCAxOTJiNTI4Li45ZGI2YTJhIDEwMDY0NAotLS0gYS9XZWJL aXQvd2luL1dlYkZyYW1lLmNwcAorKysgYi9XZWJLaXQvd2luL1dlYkZyYW1lLmNwcApAQCAtMjU4 Niw2ICsyNTg2LDExIEBAIFdlYlZpZXcqIFdlYkZyYW1lOjp3ZWJWaWV3KCkgY29uc3QKICAgICBy ZXR1cm4gZC0+d2ViVmlldzsKIH0KIAordm9pZCBXZWJGcmFtZTo6c2V0V2ViVmlldyhXZWJWaWV3 KiB3ZWJWaWV3KQoreworICAgIGQtPndlYlZpZXcgPSB3ZWJWaWV3OworfQorCiBDT01QdHI8SUFj Y2Vzc2libGU+IFdlYkZyYW1lOjphY2Nlc3NpYmxlKCkgY29uc3QKIHsKICAgICBGcmFtZSogY29y ZUZyYW1lID0gY29yZSh0aGlzKTsKZGlmZiAtLWdpdCBhL1dlYktpdC93aW4vV2ViRnJhbWUuaCBi L1dlYktpdC93aW4vV2ViRnJhbWUuaAppbmRleCAzN2NiMjA1Li5iZGMyOGFiIDEwMDY0NAotLS0g YS9XZWJLaXQvd2luL1dlYkZyYW1lLmgKKysrIGIvV2ViS2l0L3dpbi9XZWJGcmFtZS5oCkBAIC0z NzYsNiArMzc2LDcgQEAgcHVibGljOgogICAgIFdlYkNvcmU6OktVUkwgdXJsKCkgY29uc3Q7CiAK ICAgICBXZWJWaWV3KiB3ZWJWaWV3KCkgY29uc3Q7CisgICAgdm9pZCBzZXRXZWJWaWV3KFdlYlZp ZXcqKTsKIAogICAgIENPTVB0cjxJQWNjZXNzaWJsZT4gYWNjZXNzaWJsZSgpIGNvbnN0OwogCg== 71613 2010-10-22 17:11:28 -0700 2010-10-22 17:48:12 -0700 updated patch again patch46915-3.txt text/plain 3458 jennb ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhZTJmNzI1Li45YzU1NjY2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMTAt MjIgIEplbm4gQnJhaXRod2FpdGUgIDxqZW5uYkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2luZG93cyBjbGllbnQgbmVlZHMg dXBkYXRpbmcgd2hlbiBsaXZlIGlmcmFtZSBlbGVtZW50IGlzIG1vdmVkIGJldHdlZW4gcGFnZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2OTE1CisK KyAgICAgICAgKiBwbGF0Zm9ybS93aW4vU2tpcHBlZDoKKyAgICAgICAgU3RvcCBza2lwcGluZyBm YXN0L2ZyYW1lcy9pZnJhbWUtcmVwYXJlbnRpbmctYWRvcHQtbm9kZS5odG1sCisKIDIwMTAtMTAt MjIgIEFiaGlzaGVrIEFyeWEgIDxpbmZlcm5vQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBEYXZlIEh5YXR0LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2lu L1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vU2tpcHBlZAppbmRleCBkOTJmZTY2 Li5jODBjZjQwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vU2tpcHBlZAor KysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vU2tpcHBlZApAQCAtMjk4LDkgKzI5OCw2IEBA IGVkaXRpbmcvc2VsZWN0aW9uL2NvbnRleHQtbWVudS1vbi10ZXh0Lmh0bWwKICMgYW5kIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTAyMQogbWVkaWEvY29udGV4dC1t ZW51LWFjdGlvbnMuaHRtbAogCi0jIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00NDcxMwotZmFzdC9mcmFtZXMvaWZyYW1lLXJlcGFyZW50aW5nLWFkb3B0LW5vZGUuaHRt bAotCiAjIEFzc2VydGlvbiBmYWlsdXJlIGluIHJlcGxheVNhdmVkRXZlbnRzIGh0dHA6Ly93ZWJr aXQub3JnL2IvMjE3OTYKIGVkaXRpbmcvcGFzdGVib2FyZC9kcm9wLXRleHQtZXZlbnRzLmh0bWwK IGVkaXRpbmcvc2VsZWN0aW9uL2RyYWctaW4taWZyYW1lLmh0bWwKZGlmZiAtLWdpdCBhL1dlYktp dC93aW4vQ2hhbmdlTG9nIGIvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKaW5kZXggZTE4ZmRhNy4uOWYz OTRkZiAxMDA2NDQKLS0tIGEvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3dpbi9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0xMC0yMiAgSmVubiBCcmFpdGh3YWl0ZSAg PGplbm5iQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXaW5kb3dzIGNsaWVudCBuZWVkcyB1cGRhdGluZyB3aGVuIGxpdmUgaWZy YW1lIGVsZW1lbnQgaXMgbW92ZWQgYmV0d2VlbiBwYWdlcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDY5MTUKKworICAgICAgICAqIFdlYkNvcmVTdXBw b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYkZyYW1lTG9hZGVyQ2xp ZW50OjpkaWRUcmFuc2ZlckNoaWxkRnJhbWVUb05ld0RvY3VtZW50KToKKyAgICAgICAgVXBkYXRl IFdlYlZpZXcgaW4gV2ViRnJhbWUgdG8gbWF0Y2ggdGhhdCBvZiB0aGUgY3VycmVudCBwYWdlLgor ICAgICAgICAqIFdlYkZyYW1lLmNwcDoKKyAgICAgICAgKFdlYkZyYW1lOjpzZXRXZWJWaWV3KToK KyAgICAgICAgQWRkZWQuCisgICAgICAgICogV2ViRnJhbWUuaDoKKwogMjAxMC0xMC0yMiAgU2Ft IFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIEZpeCB3aW5kb3dzIGJ1aWxkLgpk aWZmIC0tZ2l0IGEvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu dC5jcHAgYi9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNw cAppbmRleCBlNzViOTg0Li4xOTNmNjg1IDEwMDY0NAotLS0gYS9XZWJLaXQvd2luL1dlYkNvcmVT dXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9XZWJLaXQvd2luL1dlYkNvcmVT dXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtNzMwLDYgKzczMCwxMSBAQCBQYXNz UmVmUHRyPEZyYW1lPiBXZWJGcmFtZUxvYWRlckNsaWVudDo6Y3JlYXRlRnJhbWUoY29uc3QgS1VS TCYgdXJsLCBjb25zdCBTdHJpbgogCiB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaWRUcmFu c2ZlckNoaWxkRnJhbWVUb05ld0RvY3VtZW50KFBhZ2UqKQogeworICAgIEZyYW1lKiBjb3JlRnJh bWUgPSBjb3JlKG1fd2ViRnJhbWUpOworICAgIEFTU0VSVChjb3JlRnJhbWUpOworICAgIFdlYlZp ZXcqIHdlYlZpZXcgPSBraXQoY29yZUZyYW1lLT5wYWdlKCkpOworICAgIGlmIChtX3dlYkZyYW1l LT53ZWJWaWV3KCkgIT0gd2ViVmlldykKKyAgICAgICAgbV93ZWJGcmFtZS0+c2V0V2ViVmlldyh3 ZWJWaWV3KTsKIH0KIAogUGFzc1JlZlB0cjxGcmFtZT4gV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmNy ZWF0ZUZyYW1lKGNvbnN0IEtVUkwmIFVSTCwgY29uc3QgU3RyaW5nJiBuYW1lLCBIVE1MRnJhbWVP d25lckVsZW1lbnQqIG93bmVyRWxlbWVudCwgY29uc3QgU3RyaW5nJiByZWZlcnJlcikKZGlmZiAt LWdpdCBhL1dlYktpdC93aW4vV2ViRnJhbWUuY3BwIGIvV2ViS2l0L3dpbi9XZWJGcmFtZS5jcHAK aW5kZXggMTkyYjUyOC4uOWRiNmEyYSAxMDA2NDQKLS0tIGEvV2ViS2l0L3dpbi9XZWJGcmFtZS5j cHAKKysrIGIvV2ViS2l0L3dpbi9XZWJGcmFtZS5jcHAKQEAgLTI1ODYsNiArMjU4NiwxMSBAQCBX ZWJWaWV3KiBXZWJGcmFtZTo6d2ViVmlldygpIGNvbnN0CiAgICAgcmV0dXJuIGQtPndlYlZpZXc7 CiB9CiAKK3ZvaWQgV2ViRnJhbWU6OnNldFdlYlZpZXcoV2ViVmlldyogd2ViVmlldykKK3sKKyAg ICBkLT53ZWJWaWV3ID0gd2ViVmlldzsKK30KKwogQ09NUHRyPElBY2Nlc3NpYmxlPiBXZWJGcmFt ZTo6YWNjZXNzaWJsZSgpIGNvbnN0CiB7CiAgICAgRnJhbWUqIGNvcmVGcmFtZSA9IGNvcmUodGhp cyk7CmRpZmYgLS1naXQgYS9XZWJLaXQvd2luL1dlYkZyYW1lLmggYi9XZWJLaXQvd2luL1dlYkZy YW1lLmgKaW5kZXggMzdjYjIwNS4uYmRjMjhhYiAxMDA2NDQKLS0tIGEvV2ViS2l0L3dpbi9XZWJG cmFtZS5oCisrKyBiL1dlYktpdC93aW4vV2ViRnJhbWUuaApAQCAtMzc2LDYgKzM3Niw3IEBAIHB1 YmxpYzoKICAgICBXZWJDb3JlOjpLVVJMIHVybCgpIGNvbnN0OwogCiAgICAgV2ViVmlldyogd2Vi VmlldygpIGNvbnN0OworICAgIHZvaWQgc2V0V2ViVmlldyhXZWJWaWV3Kik7CiAKICAgICBDT01Q dHI8SUFjY2Vzc2libGU+IGFjY2Vzc2libGUoKSBjb25zdDsKIAo=