25597 2009-05-06 14:32:09 -0700 In prepartion for enabling VIDEO, fixing some API drift that caused this code to no longer compiler. 2009-05-06 15:56:22 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ajwong levin fishd scherkus oldest_to_newest 120152 0 ajwong 2009-05-06 14:32:09 -0700 In preparation for enabling the VIDEO tag in chromium for Mac, there were some compilation errors found in the #ifdef'ed segment of code for rendering media controls. This patch shores up the API drift. Note that the copying of MediaControllerThemeStyle from RenderThemeMac.mm is a temporary fix until we can settle on the look/feel of the media controls on Mac. For now, this is just to get us building and displaying. 120153 1 30065 ajwong 2009-05-06 14:33:22 -0700 Created attachment 30065 Fix some API drift that occurred while this code was ifdefed out. 120154 2 30065 ajwong 2009-05-06 14:34:08 -0700 Comment on attachment 30065 Fix some API drift that occurred while this code was ifdefed out. gha...wrong patch uploaded. uploading the one with the changelog in a sec. 120155 3 30066 ajwong 2009-05-06 14:37:05 -0700 Created attachment 30066 Fix some API drift that occurred while this code was ifdefed out. This one has the changelog. 120156 4 30066 ajwong 2009-05-06 14:38:39 -0700 Comment on attachment 30066 Fix some API drift that occurred while this code was ifdefed out. >diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog >index f4cc242..8035487 100644 >--- a/WebCore/ChangeLog >+++ b/WebCore/ChangeLog >@@ -1,3 +1,18 @@ >+2009-05-06 Albert J. Wong <ajwong@chromium.org> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ https://bugs.webkit.org/show_bug.cgi?id=25597 >+ Fix API drift compile errors that occurred while this was ifdef-ed out. >+ >+ * rendering/RenderThemeChromiumMac.mm: >+ (WebCore::RenderThemeChromiumMac::paintMediaFullscreenButton): >+ (WebCore::RenderThemeChromiumMac::paintMediaMuteButton): >+ (WebCore::RenderThemeChromiumMac::paintMediaPlayButton): >+ (WebCore::RenderThemeChromiumMac::paintMediaSeekBackButton): >+ (WebCore::RenderThemeChromiumMac::paintMediaSeekForwardButton): >+ (WebCore::RenderThemeChromiumMac::paintMediaSliderTrack): >+ (WebCore::RenderThemeChromiumMac::paintMediaSliderThumb): >+ > 2009-05-06 Hin-Chung Lam <hclam@chromium.org> > > Reviewed by Darin Fisher. >diff --git a/WebCore/rendering/RenderThemeChromiumMac.mm b/WebCore/rendering/RenderThemeChromiumMac.mm >index 61bc9eb..56c07de 100644 >--- a/WebCore/rendering/RenderThemeChromiumMac.mm >+++ b/WebCore/rendering/RenderThemeChromiumMac.mm >@@ -1779,15 +1779,23 @@ bool RenderThemeChromiumMac::paintSearchFieldResultsButton(RenderObject* o, cons > return false; > } > >+#if ENABLE(VIDEO) >+// FIXME: This enum is lifted from RenderThemeMac.mm We need to decide which theme to use for the default controls, or decide to avoid wkDrawMediaUIPart and render our own. >+typedef enum { >+ MediaControllerThemeClassic = 1, >+ MediaControllerThemeQT = 2 >+} MediaControllerThemeStyle; >+#endif >+ > bool RenderThemeChromiumMac::paintMediaFullscreenButton(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r) > { > #if ENABLE(VIDEO) >- Node* node = o->element(); >+ Node* node = o->node(); > if (!node) > return false; > > LocalCurrentGraphicsContext localContext(paintInfo.context); >- wkDrawMediaUIPart(MediaFullscreenButton, paintInfo.context->platformContext(), r, node->active()); >+ wkDrawMediaUIPart(MediaFullscreenButton, MediaControllerThemeClassic, paintInfo.context->platformContext(), r, node->active()); > #endif > return false; > } >@@ -1795,7 +1803,7 @@ bool RenderThemeChromiumMac::paintMediaFullscreenButton(RenderObject* o, const R > bool RenderThemeChromiumMac::paintMediaMuteButton(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r) > { > #if ENABLE(VIDEO) >- Node* node = o->element(); >+ Node* node = o->node(); > Node* mediaNode = node ? node->shadowAncestorNode() : 0; > if (!mediaNode || (!mediaNode->hasTagName(videoTag) && !mediaNode->hasTagName(audioTag))) > return false; >@@ -1805,7 +1813,7 @@ bool RenderThemeChromiumMac::paintMediaMuteButton(RenderObject* o, const RenderO > return false; > > LocalCurrentGraphicsContext localContext(paintInfo.context); >- wkDrawMediaUIPart(mediaElement->muted() ? MediaUnMuteButton : MediaMuteButton, paintInfo.context->platformContext(), r, node->active()); >+ wkDrawMediaUIPart(mediaElement->muted() ? MediaUnMuteButton : MediaMuteButton, MediaControllerThemeClassic, paintInfo.context->platformContext(), r, node->active()); > #endif > return false; > } >@@ -1813,7 +1821,7 @@ bool RenderThemeChromiumMac::paintMediaMuteButton(RenderObject* o, const RenderO > bool RenderThemeChromiumMac::paintMediaPlayButton(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r) > { > #if ENABLE(VIDEO) >- Node* node = o->element(); >+ Node* node = o->node(); > Node* mediaNode = node ? node->shadowAncestorNode() : 0; > if (!mediaNode || (!mediaNode->hasTagName(videoTag) && !mediaNode->hasTagName(audioTag))) > return false; >@@ -1823,7 +1831,7 @@ bool RenderThemeChromiumMac::paintMediaPlayButton(RenderObject* o, const RenderO > return false; > > LocalCurrentGraphicsContext localContext(paintInfo.context); >- wkDrawMediaUIPart(mediaElement->canPlay() ? MediaPlayButton : MediaPauseButton, paintInfo.context->platformContext(), r, node->active()); >+ wkDrawMediaUIPart(mediaElement->canPlay() ? MediaPlayButton : MediaPauseButton, MediaControllerThemeClassic, paintInfo.context->platformContext(), r, node->active()); > #endif > return false; > } >@@ -1831,12 +1839,12 @@ bool RenderThemeChromiumMac::paintMediaPlayButton(RenderObject* o, const RenderO > bool RenderThemeChromiumMac::paintMediaSeekBackButton(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r) > { > #if ENABLE(VIDEO) >- Node* node = o->element(); >+ Node* node = o->node(); > if (!node) > return false; > > LocalCurrentGraphicsContext localContext(paintInfo.context); >- wkDrawMediaUIPart(MediaSeekBackButton, paintInfo.context->platformContext(), r, node->active()); >+ wkDrawMediaUIPart(MediaSeekBackButton, MediaControllerThemeClassic, paintInfo.context->platformContext(), r, node->active()); > #endif > return false; > } >@@ -1844,12 +1852,12 @@ bool RenderThemeChromiumMac::paintMediaSeekBackButton(RenderObject* o, const Ren > bool RenderThemeChromiumMac::paintMediaSeekForwardButton(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r) > { > #if ENABLE(VIDEO) >- Node* node = o->element(); >+ Node* node = o->node(); > if (!node) > return false; > > LocalCurrentGraphicsContext localContext(paintInfo.context); >- wkDrawMediaUIPart(MediaSeekForwardButton, paintInfo.context->platformContext(), r, node->active()); >+ wkDrawMediaUIPart(MediaSeekForwardButton, MediaControllerThemeClassic, paintInfo.context->platformContext(), r, node->active()); > #endif > return false; > } >@@ -1857,7 +1865,7 @@ bool RenderThemeChromiumMac::paintMediaSeekForwardButton(RenderObject* o, const > bool RenderThemeChromiumMac::paintMediaSliderTrack(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r) > { > #if ENABLE(VIDEO) >- Node* node = o->element(); >+ Node* node = o->node(); > Node* mediaNode = node ? node->shadowAncestorNode() : 0; > if (!mediaNode || (!mediaNode->hasTagName(videoTag) && !mediaNode->hasTagName(audioTag))) > return false; >@@ -1875,7 +1883,7 @@ bool RenderThemeChromiumMac::paintMediaSliderTrack(RenderObject* o, const Render > currentTime = player->currentTime(); > } > >- wkDrawMediaSliderTrack(paintInfo.context->platformContext(), r, timeLoaded, currentTime, duration); >+ wkDrawMediaSliderTrack(MediaControllerThemeClassic, paintInfo.context->platformContext(), r, timeLoaded, currentTime, duration); > #endif > return false; > } >@@ -1883,12 +1891,12 @@ bool RenderThemeChromiumMac::paintMediaSliderTrack(RenderObject* o, const Render > bool RenderThemeChromiumMac::paintMediaSliderThumb(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r) > { > #if ENABLE(VIDEO) >- Node* node = o->element(); >+ Node* node = o->node(); > if (!node) > return false; > > LocalCurrentGraphicsContext localContext(paintInfo.context); >- wkDrawMediaUIPart(MediaSliderThumb, paintInfo.context->platformContext(), r, node->active()); >+ wkDrawMediaUIPart(MediaSliderThumb, MediaControllerThemeClassic, paintInfo.context->platformContext(), r, node->active()); > #endif > return false; > } 120161 5 30068 ajwong 2009-05-06 14:52:34 -0700 Created attachment 30068 Fix some API drift that occurred while this code was ifdefed out -- now with correct ChangeLog! this time for sure! 120172 6 levin 2009-05-06 15:49:51 -0700 Assigned to levin for landing. 120174 7 levin 2009-05-06 15:56:22 -0700 http://trac.webkit.org/changeset/43329 30065 2009-05-06 14:33:22 -0700 2009-05-06 14:34:08 -0700 Fix some API drift that occurred while this code was ifdefed out. rendertheme.path text/plain 6341 ajwong ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1NYWMubW0g Yi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtTWFjLm1tCmluZGV4IDYxYmM5 ZWIuLjU2YzA3ZGUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hy b21pdW1NYWMubW0KKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bU1h Yy5tbQpAQCAtMTc3OSwxNSArMTc3OSwyMyBAQCBib29sIFJlbmRlclRoZW1lQ2hyb21pdW1NYWM6 OnBhaW50U2VhcmNoRmllbGRSZXN1bHRzQnV0dG9uKFJlbmRlck9iamVjdCogbywgY29ucwogICAg IHJldHVybiBmYWxzZTsKIH0KIAorI2lmIEVOQUJMRShWSURFTykKKy8vIEZJWE1FOiBUaGlzIGVu dW0gaXMgbGlmdGVkIGZyb20gUmVuZGVyVGhlbWVNYWMubW0gIFdlIG5lZWQgdG8gZGVjaWRlIHdo aWNoIHRoZW1lIHRvIHVzZSBmb3IgdGhlIGRlZmF1bHQgY29udHJvbHMsIG9yIGRlY2lkZSB0byBh dm9pZCB3a0RyYXdNZWRpYVVJUGFydCBhbmQgcmVuZGVyIG91ciBvd24uCit0eXBlZGVmIGVudW0g eworICAgIE1lZGlhQ29udHJvbGxlclRoZW1lQ2xhc3NpYyAgID0gMSwKKyAgICBNZWRpYUNvbnRy b2xsZXJUaGVtZVFUICAgICAgICA9IDIKK30gTWVkaWFDb250cm9sbGVyVGhlbWVTdHlsZTsKKyNl bmRpZgorCiBib29sIFJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50TWVkaWFGdWxsc2NyZWVu QnV0dG9uKFJlbmRlck9iamVjdCogbywgY29uc3QgUmVuZGVyT2JqZWN0OjpQYWludEluZm8mIHBh aW50SW5mbywgY29uc3QgSW50UmVjdCYgcikKIHsKICNpZiBFTkFCTEUoVklERU8pCi0gICAgTm9k ZSogbm9kZSA9IG8tPmVsZW1lbnQoKTsKKyAgICBOb2RlKiBub2RlID0gby0+bm9kZSgpOwogICAg IGlmICghbm9kZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgTG9jYWxDdXJyZW50R3Jh cGhpY3NDb250ZXh0IGxvY2FsQ29udGV4dChwYWludEluZm8uY29udGV4dCk7Ci0gICAgd2tEcmF3 TWVkaWFVSVBhcnQoTWVkaWFGdWxsc2NyZWVuQnV0dG9uLCBwYWludEluZm8uY29udGV4dC0+cGxh dGZvcm1Db250ZXh0KCksIHIsIG5vZGUtPmFjdGl2ZSgpKTsKKyAgICB3a0RyYXdNZWRpYVVJUGFy dChNZWRpYUZ1bGxzY3JlZW5CdXR0b24sIE1lZGlhQ29udHJvbGxlclRoZW1lQ2xhc3NpYywgcGFp bnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCByLCBub2RlLT5hY3RpdmUoKSk7CiAj ZW5kaWYKICAgICByZXR1cm4gZmFsc2U7CiB9CkBAIC0xNzk1LDcgKzE4MDMsNyBAQCBib29sIFJl bmRlclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50TWVkaWFGdWxsc2NyZWVuQnV0dG9uKFJlbmRlck9i amVjdCogbywgY29uc3QgUgogYm9vbCBSZW5kZXJUaGVtZUNocm9taXVtTWFjOjpwYWludE1lZGlh TXV0ZUJ1dHRvbihSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFJlbmRlck9iamVjdDo6UGFpbnRJbmZv JiBwYWludEluZm8sIGNvbnN0IEludFJlY3QmIHIpCiB7CiAjaWYgRU5BQkxFKFZJREVPKQotICAg IE5vZGUqIG5vZGUgPSBvLT5lbGVtZW50KCk7CisgICAgTm9kZSogbm9kZSA9IG8tPm5vZGUoKTsK ICAgICBOb2RlKiBtZWRpYU5vZGUgPSBub2RlID8gbm9kZS0+c2hhZG93QW5jZXN0b3JOb2RlKCkg OiAwOwogICAgIGlmICghbWVkaWFOb2RlIHx8ICghbWVkaWFOb2RlLT5oYXNUYWdOYW1lKHZpZGVv VGFnKSAmJiAhbWVkaWFOb2RlLT5oYXNUYWdOYW1lKGF1ZGlvVGFnKSkpCiAgICAgICAgIHJldHVy biBmYWxzZTsKQEAgLTE4MDUsNyArMTgxMyw3IEBAIGJvb2wgUmVuZGVyVGhlbWVDaHJvbWl1bU1h Yzo6cGFpbnRNZWRpYU11dGVCdXR0b24oUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBSZW5kZXJPCiAg ICAgICAgIHJldHVybiBmYWxzZTsKICAgICAKICAgICBMb2NhbEN1cnJlbnRHcmFwaGljc0NvbnRl eHQgbG9jYWxDb250ZXh0KHBhaW50SW5mby5jb250ZXh0KTsKLSAgICB3a0RyYXdNZWRpYVVJUGFy dChtZWRpYUVsZW1lbnQtPm11dGVkKCkgPyBNZWRpYVVuTXV0ZUJ1dHRvbiA6IE1lZGlhTXV0ZUJ1 dHRvbiwgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCByLCBub2RlLT5hY3Rp dmUoKSk7CisgICAgd2tEcmF3TWVkaWFVSVBhcnQobWVkaWFFbGVtZW50LT5tdXRlZCgpID8gTWVk aWFVbk11dGVCdXR0b24gOiBNZWRpYU11dGVCdXR0b24sIE1lZGlhQ29udHJvbGxlclRoZW1lQ2xh c3NpYywgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCByLCBub2RlLT5hY3Rp dmUoKSk7CiAjZW5kaWYKICAgICByZXR1cm4gZmFsc2U7CiB9CkBAIC0xODEzLDcgKzE4MjEsNyBA QCBib29sIFJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50TWVkaWFNdXRlQnV0dG9uKFJlbmRl ck9iamVjdCogbywgY29uc3QgUmVuZGVyTwogYm9vbCBSZW5kZXJUaGVtZUNocm9taXVtTWFjOjpw YWludE1lZGlhUGxheUJ1dHRvbihSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFJlbmRlck9iamVjdDo6 UGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFJlY3QmIHIpCiB7CiAjaWYgRU5BQkxFKFZJ REVPKQotICAgIE5vZGUqIG5vZGUgPSBvLT5lbGVtZW50KCk7CisgICAgTm9kZSogbm9kZSA9IG8t Pm5vZGUoKTsKICAgICBOb2RlKiBtZWRpYU5vZGUgPSBub2RlID8gbm9kZS0+c2hhZG93QW5jZXN0 b3JOb2RlKCkgOiAwOwogICAgIGlmICghbWVkaWFOb2RlIHx8ICghbWVkaWFOb2RlLT5oYXNUYWdO YW1lKHZpZGVvVGFnKSAmJiAhbWVkaWFOb2RlLT5oYXNUYWdOYW1lKGF1ZGlvVGFnKSkpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKQEAgLTE4MjMsNyArMTgzMSw3IEBAIGJvb2wgUmVuZGVyVGhlbWVD aHJvbWl1bU1hYzo6cGFpbnRNZWRpYVBsYXlCdXR0b24oUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBS ZW5kZXJPCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIExvY2FsQ3VycmVudEdyYXBoaWNz Q29udGV4dCBsb2NhbENvbnRleHQocGFpbnRJbmZvLmNvbnRleHQpOwotICAgIHdrRHJhd01lZGlh VUlQYXJ0KG1lZGlhRWxlbWVudC0+Y2FuUGxheSgpID8gTWVkaWFQbGF5QnV0dG9uIDogTWVkaWFQ YXVzZUJ1dHRvbiwgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCByLCBub2Rl LT5hY3RpdmUoKSk7CisgICAgd2tEcmF3TWVkaWFVSVBhcnQobWVkaWFFbGVtZW50LT5jYW5QbGF5 KCkgPyBNZWRpYVBsYXlCdXR0b24gOiBNZWRpYVBhdXNlQnV0dG9uLCBNZWRpYUNvbnRyb2xsZXJU aGVtZUNsYXNzaWMsIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwgbm9k ZS0+YWN0aXZlKCkpOwogI2VuZGlmCiAgICAgcmV0dXJuIGZhbHNlOwogfQpAQCAtMTgzMSwxMiAr MTgzOSwxMiBAQCBib29sIFJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50TWVkaWFQbGF5QnV0 dG9uKFJlbmRlck9iamVjdCogbywgY29uc3QgUmVuZGVyTwogYm9vbCBSZW5kZXJUaGVtZUNocm9t aXVtTWFjOjpwYWludE1lZGlhU2Vla0JhY2tCdXR0b24oUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBS ZW5kZXJPYmplY3Q6OlBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBJbnRSZWN0JiByKQogewog I2lmIEVOQUJMRShWSURFTykKLSAgICBOb2RlKiBub2RlID0gby0+ZWxlbWVudCgpOworICAgIE5v ZGUqIG5vZGUgPSBvLT5ub2RlKCk7CiAgICAgaWYgKCFub2RlKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKICAgICBMb2NhbEN1cnJlbnRHcmFwaGljc0NvbnRleHQgbG9jYWxDb250ZXh0KHBhaW50 SW5mby5jb250ZXh0KTsKLSAgICB3a0RyYXdNZWRpYVVJUGFydChNZWRpYVNlZWtCYWNrQnV0dG9u LCBwYWludEluZm8uY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCksIHIsIG5vZGUtPmFjdGl2ZSgp KTsKKyAgICB3a0RyYXdNZWRpYVVJUGFydChNZWRpYVNlZWtCYWNrQnV0dG9uLCBNZWRpYUNvbnRy b2xsZXJUaGVtZUNsYXNzaWMsIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwg ciwgbm9kZS0+YWN0aXZlKCkpOwogI2VuZGlmCiAgICAgcmV0dXJuIGZhbHNlOwogfQpAQCAtMTg0 NCwxMiArMTg1MiwxMiBAQCBib29sIFJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50TWVkaWFT ZWVrQmFja0J1dHRvbihSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFJlbgogYm9vbCBSZW5kZXJUaGVt ZUNocm9taXVtTWFjOjpwYWludE1lZGlhU2Vla0ZvcndhcmRCdXR0b24oUmVuZGVyT2JqZWN0KiBv LCBjb25zdCBSZW5kZXJPYmplY3Q6OlBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBJbnRSZWN0 JiByKQogewogI2lmIEVOQUJMRShWSURFTykKLSAgICBOb2RlKiBub2RlID0gby0+ZWxlbWVudCgp OworICAgIE5vZGUqIG5vZGUgPSBvLT5ub2RlKCk7CiAgICAgaWYgKCFub2RlKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKICAgICBMb2NhbEN1cnJlbnRHcmFwaGljc0NvbnRleHQgbG9jYWxDb250 ZXh0KHBhaW50SW5mby5jb250ZXh0KTsKLSAgICB3a0RyYXdNZWRpYVVJUGFydChNZWRpYVNlZWtG b3J3YXJkQnV0dG9uLCBwYWludEluZm8uY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCksIHIsIG5v ZGUtPmFjdGl2ZSgpKTsKKyAgICB3a0RyYXdNZWRpYVVJUGFydChNZWRpYVNlZWtGb3J3YXJkQnV0 dG9uLCBNZWRpYUNvbnRyb2xsZXJUaGVtZUNsYXNzaWMsIHBhaW50SW5mby5jb250ZXh0LT5wbGF0 Zm9ybUNvbnRleHQoKSwgciwgbm9kZS0+YWN0aXZlKCkpOwogI2VuZGlmCiAgICAgcmV0dXJuIGZh bHNlOwogfQpAQCAtMTg1Nyw3ICsxODY1LDcgQEAgYm9vbCBSZW5kZXJUaGVtZUNocm9taXVtTWFj OjpwYWludE1lZGlhU2Vla0ZvcndhcmRCdXR0b24oUmVuZGVyT2JqZWN0KiBvLCBjb25zdAogYm9v bCBSZW5kZXJUaGVtZUNocm9taXVtTWFjOjpwYWludE1lZGlhU2xpZGVyVHJhY2soUmVuZGVyT2Jq ZWN0KiBvLCBjb25zdCBSZW5kZXJPYmplY3Q6OlBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBJ bnRSZWN0JiByKQogewogI2lmIEVOQUJMRShWSURFTykKLSAgICBOb2RlKiBub2RlID0gby0+ZWxl bWVudCgpOworICAgIE5vZGUqIG5vZGUgPSBvLT5ub2RlKCk7CiAgICAgTm9kZSogbWVkaWFOb2Rl ID0gbm9kZSA/IG5vZGUtPnNoYWRvd0FuY2VzdG9yTm9kZSgpIDogMDsKICAgICBpZiAoIW1lZGlh Tm9kZSB8fCAoIW1lZGlhTm9kZS0+aGFzVGFnTmFtZSh2aWRlb1RhZykgJiYgIW1lZGlhTm9kZS0+ aGFzVGFnTmFtZShhdWRpb1RhZykpKQogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC0xODc1LDcg KzE4ODMsNyBAQCBib29sIFJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50TWVkaWFTbGlkZXJU cmFjayhSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFJlbmRlcgogICAgICAgICBjdXJyZW50VGltZSA9 IHBsYXllci0+Y3VycmVudFRpbWUoKTsKICAgICB9CiAKLSAgICB3a0RyYXdNZWRpYVNsaWRlclRy YWNrKHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwgdGltZUxvYWRlZCwg Y3VycmVudFRpbWUsIGR1cmF0aW9uKTsKKyAgICB3a0RyYXdNZWRpYVNsaWRlclRyYWNrKE1lZGlh Q29udHJvbGxlclRoZW1lQ2xhc3NpYywgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4 dCgpLCByLCB0aW1lTG9hZGVkLCBjdXJyZW50VGltZSwgZHVyYXRpb24pOwogI2VuZGlmCiAgICAg cmV0dXJuIGZhbHNlOwogfQpAQCAtMTg4MywxMiArMTg5MSwxMiBAQCBib29sIFJlbmRlclRoZW1l Q2hyb21pdW1NYWM6OnBhaW50TWVkaWFTbGlkZXJUcmFjayhSZW5kZXJPYmplY3QqIG8sIGNvbnN0 IFJlbmRlcgogYm9vbCBSZW5kZXJUaGVtZUNocm9taXVtTWFjOjpwYWludE1lZGlhU2xpZGVyVGh1 bWIoUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBSZW5kZXJPYmplY3Q6OlBhaW50SW5mbyYgcGFpbnRJ bmZvLCBjb25zdCBJbnRSZWN0JiByKQogewogI2lmIEVOQUJMRShWSURFTykKLSAgICBOb2RlKiBu b2RlID0gby0+ZWxlbWVudCgpOworICAgIE5vZGUqIG5vZGUgPSBvLT5ub2RlKCk7CiAgICAgaWYg KCFub2RlKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBMb2NhbEN1cnJlbnRHcmFwaGlj c0NvbnRleHQgbG9jYWxDb250ZXh0KHBhaW50SW5mby5jb250ZXh0KTsKLSAgICB3a0RyYXdNZWRp YVVJUGFydChNZWRpYVNsaWRlclRodW1iLCBwYWludEluZm8uY29udGV4dC0+cGxhdGZvcm1Db250 ZXh0KCksIHIsIG5vZGUtPmFjdGl2ZSgpKTsKKyAgICB3a0RyYXdNZWRpYVVJUGFydChNZWRpYVNs aWRlclRodW1iLCBNZWRpYUNvbnRyb2xsZXJUaGVtZUNsYXNzaWMsIHBhaW50SW5mby5jb250ZXh0 LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwgbm9kZS0+YWN0aXZlKCkpOwogI2VuZGlmCiAgICAgcmV0 dXJuIGZhbHNlOwogfQo= 30066 2009-05-06 14:37:05 -0700 2009-05-06 14:52:34 -0700 Fix some API drift that occurred while this code was ifdefed out. rendertheme.path text/plain 7279 ajwong ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZjRjYzI0Mi4uODAzNTQ4NyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwOS0wNS0wNiAgQWxiZXJ0IEouIFdv bmcgIDxhandvbmdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEZpeCBBUEkgZHJpZnQgY29tcGlsZSBlcnJvcnMgdGhhdCBvY2N1 cnJlZCB3aGlsZSB0aGlzIHdhcyBpZmRlZi1lZCBvdXQuCisKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyVGhlbWVDaHJvbWl1bU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1l Q2hyb21pdW1NYWM6OnBhaW50TWVkaWFGdWxsc2NyZWVuQnV0dG9uKToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50TWVkaWFNdXRlQnV0dG9uKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50TWVkaWFQbGF5QnV0dG9u KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50TWVkaWFT ZWVrQmFja0J1dHRvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUNocm9taXVtTWFj OjpwYWludE1lZGlhU2Vla0ZvcndhcmRCdXR0b24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VGhlbWVDaHJvbWl1bU1hYzo6cGFpbnRNZWRpYVNsaWRlclRyYWNrKToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50TWVkaWFTbGlkZXJUaHVtYik6CisKIDIw MDktMDUtMDYgIEhpbi1DaHVuZyBMYW0gIDxoY2xhbUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGhlbWVDaHJvbWl1bU1hYy5tbSBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1l Q2hyb21pdW1NYWMubW0KaW5kZXggNjFiYzllYi4uNTZjMDdkZSAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bU1hYy5tbQorKysgYi9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUaGVtZUNocm9taXVtTWFjLm1tCkBAIC0xNzc5LDE1ICsxNzc5LDIzIEBAIGJv b2wgUmVuZGVyVGhlbWVDaHJvbWl1bU1hYzo6cGFpbnRTZWFyY2hGaWVsZFJlc3VsdHNCdXR0b24o UmVuZGVyT2JqZWN0KiBvLCBjb25zCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCisjaWYgRU5BQkxF KFZJREVPKQorLy8gRklYTUU6IFRoaXMgZW51bSBpcyBsaWZ0ZWQgZnJvbSBSZW5kZXJUaGVtZU1h Yy5tbSAgV2UgbmVlZCB0byBkZWNpZGUgd2hpY2ggdGhlbWUgdG8gdXNlIGZvciB0aGUgZGVmYXVs dCBjb250cm9scywgb3IgZGVjaWRlIHRvIGF2b2lkIHdrRHJhd01lZGlhVUlQYXJ0IGFuZCByZW5k ZXIgb3VyIG93bi4KK3R5cGVkZWYgZW51bSB7CisgICAgTWVkaWFDb250cm9sbGVyVGhlbWVDbGFz c2ljICAgPSAxLAorICAgIE1lZGlhQ29udHJvbGxlclRoZW1lUVQgICAgICAgID0gMgorfSBNZWRp YUNvbnRyb2xsZXJUaGVtZVN0eWxlOworI2VuZGlmCisKIGJvb2wgUmVuZGVyVGhlbWVDaHJvbWl1 bU1hYzo6cGFpbnRNZWRpYUZ1bGxzY3JlZW5CdXR0b24oUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBS ZW5kZXJPYmplY3Q6OlBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBJbnRSZWN0JiByKQogewog I2lmIEVOQUJMRShWSURFTykKLSAgICBOb2RlKiBub2RlID0gby0+ZWxlbWVudCgpOworICAgIE5v ZGUqIG5vZGUgPSBvLT5ub2RlKCk7CiAgICAgaWYgKCFub2RlKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKICAgICBMb2NhbEN1cnJlbnRHcmFwaGljc0NvbnRleHQgbG9jYWxDb250ZXh0KHBhaW50 SW5mby5jb250ZXh0KTsKLSAgICB3a0RyYXdNZWRpYVVJUGFydChNZWRpYUZ1bGxzY3JlZW5CdXR0 b24sIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwgbm9kZS0+YWN0aXZl KCkpOworICAgIHdrRHJhd01lZGlhVUlQYXJ0KE1lZGlhRnVsbHNjcmVlbkJ1dHRvbiwgTWVkaWFD b250cm9sbGVyVGhlbWVDbGFzc2ljLCBwYWludEluZm8uY29udGV4dC0+cGxhdGZvcm1Db250ZXh0 KCksIHIsIG5vZGUtPmFjdGl2ZSgpKTsKICNlbmRpZgogICAgIHJldHVybiBmYWxzZTsKIH0KQEAg LTE3OTUsNyArMTgwMyw3IEBAIGJvb2wgUmVuZGVyVGhlbWVDaHJvbWl1bU1hYzo6cGFpbnRNZWRp YUZ1bGxzY3JlZW5CdXR0b24oUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBSCiBib29sIFJlbmRlclRo ZW1lQ2hyb21pdW1NYWM6OnBhaW50TWVkaWFNdXRlQnV0dG9uKFJlbmRlck9iamVjdCogbywgY29u c3QgUmVuZGVyT2JqZWN0OjpQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgSW50UmVjdCYgcikK IHsKICNpZiBFTkFCTEUoVklERU8pCi0gICAgTm9kZSogbm9kZSA9IG8tPmVsZW1lbnQoKTsKKyAg ICBOb2RlKiBub2RlID0gby0+bm9kZSgpOwogICAgIE5vZGUqIG1lZGlhTm9kZSA9IG5vZGUgPyBu b2RlLT5zaGFkb3dBbmNlc3Rvck5vZGUoKSA6IDA7CiAgICAgaWYgKCFtZWRpYU5vZGUgfHwgKCFt ZWRpYU5vZGUtPmhhc1RhZ05hbWUodmlkZW9UYWcpICYmICFtZWRpYU5vZGUtPmhhc1RhZ05hbWUo YXVkaW9UYWcpKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMTgwNSw3ICsxODEzLDcgQEAg Ym9vbCBSZW5kZXJUaGVtZUNocm9taXVtTWFjOjpwYWludE1lZGlhTXV0ZUJ1dHRvbihSZW5kZXJP YmplY3QqIG8sIGNvbnN0IFJlbmRlck8KICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIAogICAg IExvY2FsQ3VycmVudEdyYXBoaWNzQ29udGV4dCBsb2NhbENvbnRleHQocGFpbnRJbmZvLmNvbnRl eHQpOwotICAgIHdrRHJhd01lZGlhVUlQYXJ0KG1lZGlhRWxlbWVudC0+bXV0ZWQoKSA/IE1lZGlh VW5NdXRlQnV0dG9uIDogTWVkaWFNdXRlQnV0dG9uLCBwYWludEluZm8uY29udGV4dC0+cGxhdGZv cm1Db250ZXh0KCksIHIsIG5vZGUtPmFjdGl2ZSgpKTsKKyAgICB3a0RyYXdNZWRpYVVJUGFydCht ZWRpYUVsZW1lbnQtPm11dGVkKCkgPyBNZWRpYVVuTXV0ZUJ1dHRvbiA6IE1lZGlhTXV0ZUJ1dHRv biwgTWVkaWFDb250cm9sbGVyVGhlbWVDbGFzc2ljLCBwYWludEluZm8uY29udGV4dC0+cGxhdGZv cm1Db250ZXh0KCksIHIsIG5vZGUtPmFjdGl2ZSgpKTsKICNlbmRpZgogICAgIHJldHVybiBmYWxz ZTsKIH0KQEAgLTE4MTMsNyArMTgyMSw3IEBAIGJvb2wgUmVuZGVyVGhlbWVDaHJvbWl1bU1hYzo6 cGFpbnRNZWRpYU11dGVCdXR0b24oUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBSZW5kZXJPCiBib29s IFJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50TWVkaWFQbGF5QnV0dG9uKFJlbmRlck9iamVj dCogbywgY29uc3QgUmVuZGVyT2JqZWN0OjpQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgSW50 UmVjdCYgcikKIHsKICNpZiBFTkFCTEUoVklERU8pCi0gICAgTm9kZSogbm9kZSA9IG8tPmVsZW1l bnQoKTsKKyAgICBOb2RlKiBub2RlID0gby0+bm9kZSgpOwogICAgIE5vZGUqIG1lZGlhTm9kZSA9 IG5vZGUgPyBub2RlLT5zaGFkb3dBbmNlc3Rvck5vZGUoKSA6IDA7CiAgICAgaWYgKCFtZWRpYU5v ZGUgfHwgKCFtZWRpYU5vZGUtPmhhc1RhZ05hbWUodmlkZW9UYWcpICYmICFtZWRpYU5vZGUtPmhh c1RhZ05hbWUoYXVkaW9UYWcpKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMTgyMyw3ICsx ODMxLDcgQEAgYm9vbCBSZW5kZXJUaGVtZUNocm9taXVtTWFjOjpwYWludE1lZGlhUGxheUJ1dHRv bihSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFJlbmRlck8KICAgICAgICAgcmV0dXJuIGZhbHNlOwog CiAgICAgTG9jYWxDdXJyZW50R3JhcGhpY3NDb250ZXh0IGxvY2FsQ29udGV4dChwYWludEluZm8u Y29udGV4dCk7Ci0gICAgd2tEcmF3TWVkaWFVSVBhcnQobWVkaWFFbGVtZW50LT5jYW5QbGF5KCkg PyBNZWRpYVBsYXlCdXR0b24gOiBNZWRpYVBhdXNlQnV0dG9uLCBwYWludEluZm8uY29udGV4dC0+ cGxhdGZvcm1Db250ZXh0KCksIHIsIG5vZGUtPmFjdGl2ZSgpKTsKKyAgICB3a0RyYXdNZWRpYVVJ UGFydChtZWRpYUVsZW1lbnQtPmNhblBsYXkoKSA/IE1lZGlhUGxheUJ1dHRvbiA6IE1lZGlhUGF1 c2VCdXR0b24sIE1lZGlhQ29udHJvbGxlclRoZW1lQ2xhc3NpYywgcGFpbnRJbmZvLmNvbnRleHQt PnBsYXRmb3JtQ29udGV4dCgpLCByLCBub2RlLT5hY3RpdmUoKSk7CiAjZW5kaWYKICAgICByZXR1 cm4gZmFsc2U7CiB9CkBAIC0xODMxLDEyICsxODM5LDEyIEBAIGJvb2wgUmVuZGVyVGhlbWVDaHJv bWl1bU1hYzo6cGFpbnRNZWRpYVBsYXlCdXR0b24oUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBSZW5k ZXJPCiBib29sIFJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50TWVkaWFTZWVrQmFja0J1dHRv bihSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFJlbmRlck9iamVjdDo6UGFpbnRJbmZvJiBwYWludElu Zm8sIGNvbnN0IEludFJlY3QmIHIpCiB7CiAjaWYgRU5BQkxFKFZJREVPKQotICAgIE5vZGUqIG5v ZGUgPSBvLT5lbGVtZW50KCk7CisgICAgTm9kZSogbm9kZSA9IG8tPm5vZGUoKTsKICAgICBpZiAo IW5vZGUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIExvY2FsQ3VycmVudEdyYXBoaWNz Q29udGV4dCBsb2NhbENvbnRleHQocGFpbnRJbmZvLmNvbnRleHQpOwotICAgIHdrRHJhd01lZGlh VUlQYXJ0KE1lZGlhU2Vla0JhY2tCdXR0b24sIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNv bnRleHQoKSwgciwgbm9kZS0+YWN0aXZlKCkpOworICAgIHdrRHJhd01lZGlhVUlQYXJ0KE1lZGlh U2Vla0JhY2tCdXR0b24sIE1lZGlhQ29udHJvbGxlclRoZW1lQ2xhc3NpYywgcGFpbnRJbmZvLmNv bnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCByLCBub2RlLT5hY3RpdmUoKSk7CiAjZW5kaWYKICAg ICByZXR1cm4gZmFsc2U7CiB9CkBAIC0xODQ0LDEyICsxODUyLDEyIEBAIGJvb2wgUmVuZGVyVGhl bWVDaHJvbWl1bU1hYzo6cGFpbnRNZWRpYVNlZWtCYWNrQnV0dG9uKFJlbmRlck9iamVjdCogbywg Y29uc3QgUmVuCiBib29sIFJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50TWVkaWFTZWVrRm9y d2FyZEJ1dHRvbihSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFJlbmRlck9iamVjdDo6UGFpbnRJbmZv JiBwYWludEluZm8sIGNvbnN0IEludFJlY3QmIHIpCiB7CiAjaWYgRU5BQkxFKFZJREVPKQotICAg IE5vZGUqIG5vZGUgPSBvLT5lbGVtZW50KCk7CisgICAgTm9kZSogbm9kZSA9IG8tPm5vZGUoKTsK ICAgICBpZiAoIW5vZGUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIExvY2FsQ3VycmVu dEdyYXBoaWNzQ29udGV4dCBsb2NhbENvbnRleHQocGFpbnRJbmZvLmNvbnRleHQpOwotICAgIHdr RHJhd01lZGlhVUlQYXJ0KE1lZGlhU2Vla0ZvcndhcmRCdXR0b24sIHBhaW50SW5mby5jb250ZXh0 LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwgbm9kZS0+YWN0aXZlKCkpOworICAgIHdrRHJhd01lZGlh VUlQYXJ0KE1lZGlhU2Vla0ZvcndhcmRCdXR0b24sIE1lZGlhQ29udHJvbGxlclRoZW1lQ2xhc3Np YywgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCByLCBub2RlLT5hY3RpdmUo KSk7CiAjZW5kaWYKICAgICByZXR1cm4gZmFsc2U7CiB9CkBAIC0xODU3LDcgKzE4NjUsNyBAQCBi b29sIFJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50TWVkaWFTZWVrRm9yd2FyZEJ1dHRvbihS ZW5kZXJPYmplY3QqIG8sIGNvbnN0CiBib29sIFJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50 TWVkaWFTbGlkZXJUcmFjayhSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFJlbmRlck9iamVjdDo6UGFp bnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFJlY3QmIHIpCiB7CiAjaWYgRU5BQkxFKFZJREVP KQotICAgIE5vZGUqIG5vZGUgPSBvLT5lbGVtZW50KCk7CisgICAgTm9kZSogbm9kZSA9IG8tPm5v ZGUoKTsKICAgICBOb2RlKiBtZWRpYU5vZGUgPSBub2RlID8gbm9kZS0+c2hhZG93QW5jZXN0b3JO b2RlKCkgOiAwOwogICAgIGlmICghbWVkaWFOb2RlIHx8ICghbWVkaWFOb2RlLT5oYXNUYWdOYW1l KHZpZGVvVGFnKSAmJiAhbWVkaWFOb2RlLT5oYXNUYWdOYW1lKGF1ZGlvVGFnKSkpCiAgICAgICAg IHJldHVybiBmYWxzZTsKQEAgLTE4NzUsNyArMTg4Myw3IEBAIGJvb2wgUmVuZGVyVGhlbWVDaHJv bWl1bU1hYzo6cGFpbnRNZWRpYVNsaWRlclRyYWNrKFJlbmRlck9iamVjdCogbywgY29uc3QgUmVu ZGVyCiAgICAgICAgIGN1cnJlbnRUaW1lID0gcGxheWVyLT5jdXJyZW50VGltZSgpOwogICAgIH0K IAotICAgIHdrRHJhd01lZGlhU2xpZGVyVHJhY2socGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3Jt Q29udGV4dCgpLCByLCB0aW1lTG9hZGVkLCBjdXJyZW50VGltZSwgZHVyYXRpb24pOworICAgIHdr RHJhd01lZGlhU2xpZGVyVHJhY2soTWVkaWFDb250cm9sbGVyVGhlbWVDbGFzc2ljLCBwYWludElu Zm8uY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCksIHIsIHRpbWVMb2FkZWQsIGN1cnJlbnRUaW1l LCBkdXJhdGlvbik7CiAjZW5kaWYKICAgICByZXR1cm4gZmFsc2U7CiB9CkBAIC0xODgzLDEyICsx ODkxLDEyIEBAIGJvb2wgUmVuZGVyVGhlbWVDaHJvbWl1bU1hYzo6cGFpbnRNZWRpYVNsaWRlclRy YWNrKFJlbmRlck9iamVjdCogbywgY29uc3QgUmVuZGVyCiBib29sIFJlbmRlclRoZW1lQ2hyb21p dW1NYWM6OnBhaW50TWVkaWFTbGlkZXJUaHVtYihSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFJlbmRl ck9iamVjdDo6UGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFJlY3QmIHIpCiB7CiAjaWYg RU5BQkxFKFZJREVPKQotICAgIE5vZGUqIG5vZGUgPSBvLT5lbGVtZW50KCk7CisgICAgTm9kZSog bm9kZSA9IG8tPm5vZGUoKTsKICAgICBpZiAoIW5vZGUpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAogICAgIExvY2FsQ3VycmVudEdyYXBoaWNzQ29udGV4dCBsb2NhbENvbnRleHQocGFpbnRJbmZv LmNvbnRleHQpOwotICAgIHdrRHJhd01lZGlhVUlQYXJ0KE1lZGlhU2xpZGVyVGh1bWIsIHBhaW50 SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwgbm9kZS0+YWN0aXZlKCkpOworICAg IHdrRHJhd01lZGlhVUlQYXJ0KE1lZGlhU2xpZGVyVGh1bWIsIE1lZGlhQ29udHJvbGxlclRoZW1l Q2xhc3NpYywgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCByLCBub2RlLT5h Y3RpdmUoKSk7CiAjZW5kaWYKICAgICByZXR1cm4gZmFsc2U7CiB9Cg== 30068 2009-05-06 14:52:34 -0700 2009-05-06 14:55:34 -0700 Fix some API drift that occurred while this code was ifdefed out -- now with correct ChangeLog! rendertheme.path text/plain 7537 ajwong ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZjRjYzI0Mi4uMWZhZGFmMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAwOS0wNS0wNiAgQWxiZXJ0IEouIFdv bmcgIDxhandvbmdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yNTU5NworICAgICAgICBGaXggQVBJIGRyaWZ0IGNvbXBpbGUgZXJyb3JzIHRoYXQgb2NjdXJy ZWQgd2hpbGUgdGhpcyB3YXMgaWZkZWYtZWQgb3V0LgorICAgICAgICBUaGUgdHdvIGJpZyBpc3N1 ZXMgd2VyZSB0aGF0IFJlbmRlck9iamVjdDo6ZWxlbWVudCgpIGJlY2FtZQorICAgICAgICBSZW5k ZXJPYmplY3Q6Om5vZGUoKSBhbmQgc29tZSBvZiB0aGUgd2sqIGRyYXdpbmcgZnVuY3Rpb25zIGhh ZAorICAgICAgICBhbiBleHRyYSB0aGVtZSBwYXJhbWV0ZXIgYWRkZWQgdG8gdGhlIGFyZ3VtZW50 IGxpc3QuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bU1hYy5tbToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50TWVkaWFGdWxs c2NyZWVuQnV0dG9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lQ2hyb21pdW1NYWM6 OnBhaW50TWVkaWFNdXRlQnV0dG9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lQ2hy b21pdW1NYWM6OnBhaW50TWVkaWFQbGF5QnV0dG9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clRoZW1lQ2hyb21pdW1NYWM6OnBhaW50TWVkaWFTZWVrQmFja0J1dHRvbik6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJUaGVtZUNocm9taXVtTWFjOjpwYWludE1lZGlhU2Vla0ZvcndhcmRCdXR0 b24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVDaHJvbWl1bU1hYzo6cGFpbnRNZWRp YVNsaWRlclRyYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lQ2hyb21pdW1NYWM6 OnBhaW50TWVkaWFTbGlkZXJUaHVtYik6CisKIDIwMDktMDUtMDYgIEhpbi1DaHVuZyBMYW0gIDxo Y2xhbUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVyLgpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bU1hYy5tbSBi L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1NYWMubW0KaW5kZXggNjFiYzll Yi4uNTZjMDdkZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJv bWl1bU1hYy5tbQorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtTWFj Lm1tCkBAIC0xNzc5LDE1ICsxNzc5LDIzIEBAIGJvb2wgUmVuZGVyVGhlbWVDaHJvbWl1bU1hYzo6 cGFpbnRTZWFyY2hGaWVsZFJlc3VsdHNCdXR0b24oUmVuZGVyT2JqZWN0KiBvLCBjb25zCiAgICAg cmV0dXJuIGZhbHNlOwogfQogCisjaWYgRU5BQkxFKFZJREVPKQorLy8gRklYTUU6IFRoaXMgZW51 bSBpcyBsaWZ0ZWQgZnJvbSBSZW5kZXJUaGVtZU1hYy5tbSAgV2UgbmVlZCB0byBkZWNpZGUgd2hp Y2ggdGhlbWUgdG8gdXNlIGZvciB0aGUgZGVmYXVsdCBjb250cm9scywgb3IgZGVjaWRlIHRvIGF2 b2lkIHdrRHJhd01lZGlhVUlQYXJ0IGFuZCByZW5kZXIgb3VyIG93bi4KK3R5cGVkZWYgZW51bSB7 CisgICAgTWVkaWFDb250cm9sbGVyVGhlbWVDbGFzc2ljICAgPSAxLAorICAgIE1lZGlhQ29udHJv bGxlclRoZW1lUVQgICAgICAgID0gMgorfSBNZWRpYUNvbnRyb2xsZXJUaGVtZVN0eWxlOworI2Vu ZGlmCisKIGJvb2wgUmVuZGVyVGhlbWVDaHJvbWl1bU1hYzo6cGFpbnRNZWRpYUZ1bGxzY3JlZW5C dXR0b24oUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBSZW5kZXJPYmplY3Q6OlBhaW50SW5mbyYgcGFp bnRJbmZvLCBjb25zdCBJbnRSZWN0JiByKQogewogI2lmIEVOQUJMRShWSURFTykKLSAgICBOb2Rl KiBub2RlID0gby0+ZWxlbWVudCgpOworICAgIE5vZGUqIG5vZGUgPSBvLT5ub2RlKCk7CiAgICAg aWYgKCFub2RlKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBMb2NhbEN1cnJlbnRHcmFw aGljc0NvbnRleHQgbG9jYWxDb250ZXh0KHBhaW50SW5mby5jb250ZXh0KTsKLSAgICB3a0RyYXdN ZWRpYVVJUGFydChNZWRpYUZ1bGxzY3JlZW5CdXR0b24sIHBhaW50SW5mby5jb250ZXh0LT5wbGF0 Zm9ybUNvbnRleHQoKSwgciwgbm9kZS0+YWN0aXZlKCkpOworICAgIHdrRHJhd01lZGlhVUlQYXJ0 KE1lZGlhRnVsbHNjcmVlbkJ1dHRvbiwgTWVkaWFDb250cm9sbGVyVGhlbWVDbGFzc2ljLCBwYWlu dEluZm8uY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCksIHIsIG5vZGUtPmFjdGl2ZSgpKTsKICNl bmRpZgogICAgIHJldHVybiBmYWxzZTsKIH0KQEAgLTE3OTUsNyArMTgwMyw3IEBAIGJvb2wgUmVu ZGVyVGhlbWVDaHJvbWl1bU1hYzo6cGFpbnRNZWRpYUZ1bGxzY3JlZW5CdXR0b24oUmVuZGVyT2Jq ZWN0KiBvLCBjb25zdCBSCiBib29sIFJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50TWVkaWFN dXRlQnV0dG9uKFJlbmRlck9iamVjdCogbywgY29uc3QgUmVuZGVyT2JqZWN0OjpQYWludEluZm8m IHBhaW50SW5mbywgY29uc3QgSW50UmVjdCYgcikKIHsKICNpZiBFTkFCTEUoVklERU8pCi0gICAg Tm9kZSogbm9kZSA9IG8tPmVsZW1lbnQoKTsKKyAgICBOb2RlKiBub2RlID0gby0+bm9kZSgpOwog ICAgIE5vZGUqIG1lZGlhTm9kZSA9IG5vZGUgPyBub2RlLT5zaGFkb3dBbmNlc3Rvck5vZGUoKSA6 IDA7CiAgICAgaWYgKCFtZWRpYU5vZGUgfHwgKCFtZWRpYU5vZGUtPmhhc1RhZ05hbWUodmlkZW9U YWcpICYmICFtZWRpYU5vZGUtPmhhc1RhZ05hbWUoYXVkaW9UYWcpKSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwpAQCAtMTgwNSw3ICsxODEzLDcgQEAgYm9vbCBSZW5kZXJUaGVtZUNocm9taXVtTWFj OjpwYWludE1lZGlhTXV0ZUJ1dHRvbihSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFJlbmRlck8KICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIAogICAgIExvY2FsQ3VycmVudEdyYXBoaWNzQ29udGV4 dCBsb2NhbENvbnRleHQocGFpbnRJbmZvLmNvbnRleHQpOwotICAgIHdrRHJhd01lZGlhVUlQYXJ0 KG1lZGlhRWxlbWVudC0+bXV0ZWQoKSA/IE1lZGlhVW5NdXRlQnV0dG9uIDogTWVkaWFNdXRlQnV0 dG9uLCBwYWludEluZm8uY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCksIHIsIG5vZGUtPmFjdGl2 ZSgpKTsKKyAgICB3a0RyYXdNZWRpYVVJUGFydChtZWRpYUVsZW1lbnQtPm11dGVkKCkgPyBNZWRp YVVuTXV0ZUJ1dHRvbiA6IE1lZGlhTXV0ZUJ1dHRvbiwgTWVkaWFDb250cm9sbGVyVGhlbWVDbGFz c2ljLCBwYWludEluZm8uY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCksIHIsIG5vZGUtPmFjdGl2 ZSgpKTsKICNlbmRpZgogICAgIHJldHVybiBmYWxzZTsKIH0KQEAgLTE4MTMsNyArMTgyMSw3IEBA IGJvb2wgUmVuZGVyVGhlbWVDaHJvbWl1bU1hYzo6cGFpbnRNZWRpYU11dGVCdXR0b24oUmVuZGVy T2JqZWN0KiBvLCBjb25zdCBSZW5kZXJPCiBib29sIFJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OnBh aW50TWVkaWFQbGF5QnV0dG9uKFJlbmRlck9iamVjdCogbywgY29uc3QgUmVuZGVyT2JqZWN0OjpQ YWludEluZm8mIHBhaW50SW5mbywgY29uc3QgSW50UmVjdCYgcikKIHsKICNpZiBFTkFCTEUoVklE RU8pCi0gICAgTm9kZSogbm9kZSA9IG8tPmVsZW1lbnQoKTsKKyAgICBOb2RlKiBub2RlID0gby0+ bm9kZSgpOwogICAgIE5vZGUqIG1lZGlhTm9kZSA9IG5vZGUgPyBub2RlLT5zaGFkb3dBbmNlc3Rv ck5vZGUoKSA6IDA7CiAgICAgaWYgKCFtZWRpYU5vZGUgfHwgKCFtZWRpYU5vZGUtPmhhc1RhZ05h bWUodmlkZW9UYWcpICYmICFtZWRpYU5vZGUtPmhhc1RhZ05hbWUoYXVkaW9UYWcpKSkKICAgICAg ICAgcmV0dXJuIGZhbHNlOwpAQCAtMTgyMyw3ICsxODMxLDcgQEAgYm9vbCBSZW5kZXJUaGVtZUNo cm9taXVtTWFjOjpwYWludE1lZGlhUGxheUJ1dHRvbihSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFJl bmRlck8KICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgTG9jYWxDdXJyZW50R3JhcGhpY3ND b250ZXh0IGxvY2FsQ29udGV4dChwYWludEluZm8uY29udGV4dCk7Ci0gICAgd2tEcmF3TWVkaWFV SVBhcnQobWVkaWFFbGVtZW50LT5jYW5QbGF5KCkgPyBNZWRpYVBsYXlCdXR0b24gOiBNZWRpYVBh dXNlQnV0dG9uLCBwYWludEluZm8uY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCksIHIsIG5vZGUt PmFjdGl2ZSgpKTsKKyAgICB3a0RyYXdNZWRpYVVJUGFydChtZWRpYUVsZW1lbnQtPmNhblBsYXko KSA/IE1lZGlhUGxheUJ1dHRvbiA6IE1lZGlhUGF1c2VCdXR0b24sIE1lZGlhQ29udHJvbGxlclRo ZW1lQ2xhc3NpYywgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCByLCBub2Rl LT5hY3RpdmUoKSk7CiAjZW5kaWYKICAgICByZXR1cm4gZmFsc2U7CiB9CkBAIC0xODMxLDEyICsx ODM5LDEyIEBAIGJvb2wgUmVuZGVyVGhlbWVDaHJvbWl1bU1hYzo6cGFpbnRNZWRpYVBsYXlCdXR0 b24oUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBSZW5kZXJPCiBib29sIFJlbmRlclRoZW1lQ2hyb21p dW1NYWM6OnBhaW50TWVkaWFTZWVrQmFja0J1dHRvbihSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFJl bmRlck9iamVjdDo6UGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFJlY3QmIHIpCiB7CiAj aWYgRU5BQkxFKFZJREVPKQotICAgIE5vZGUqIG5vZGUgPSBvLT5lbGVtZW50KCk7CisgICAgTm9k ZSogbm9kZSA9IG8tPm5vZGUoKTsKICAgICBpZiAoIW5vZGUpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKIAogICAgIExvY2FsQ3VycmVudEdyYXBoaWNzQ29udGV4dCBsb2NhbENvbnRleHQocGFpbnRJ bmZvLmNvbnRleHQpOwotICAgIHdrRHJhd01lZGlhVUlQYXJ0KE1lZGlhU2Vla0JhY2tCdXR0b24s IHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwgbm9kZS0+YWN0aXZlKCkp OworICAgIHdrRHJhd01lZGlhVUlQYXJ0KE1lZGlhU2Vla0JhY2tCdXR0b24sIE1lZGlhQ29udHJv bGxlclRoZW1lQ2xhc3NpYywgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCBy LCBub2RlLT5hY3RpdmUoKSk7CiAjZW5kaWYKICAgICByZXR1cm4gZmFsc2U7CiB9CkBAIC0xODQ0 LDEyICsxODUyLDEyIEBAIGJvb2wgUmVuZGVyVGhlbWVDaHJvbWl1bU1hYzo6cGFpbnRNZWRpYVNl ZWtCYWNrQnV0dG9uKFJlbmRlck9iamVjdCogbywgY29uc3QgUmVuCiBib29sIFJlbmRlclRoZW1l Q2hyb21pdW1NYWM6OnBhaW50TWVkaWFTZWVrRm9yd2FyZEJ1dHRvbihSZW5kZXJPYmplY3QqIG8s IGNvbnN0IFJlbmRlck9iamVjdDo6UGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFJlY3Qm IHIpCiB7CiAjaWYgRU5BQkxFKFZJREVPKQotICAgIE5vZGUqIG5vZGUgPSBvLT5lbGVtZW50KCk7 CisgICAgTm9kZSogbm9kZSA9IG8tPm5vZGUoKTsKICAgICBpZiAoIW5vZGUpCiAgICAgICAgIHJl dHVybiBmYWxzZTsKIAogICAgIExvY2FsQ3VycmVudEdyYXBoaWNzQ29udGV4dCBsb2NhbENvbnRl eHQocGFpbnRJbmZvLmNvbnRleHQpOwotICAgIHdrRHJhd01lZGlhVUlQYXJ0KE1lZGlhU2Vla0Zv cndhcmRCdXR0b24sIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwgbm9k ZS0+YWN0aXZlKCkpOworICAgIHdrRHJhd01lZGlhVUlQYXJ0KE1lZGlhU2Vla0ZvcndhcmRCdXR0 b24sIE1lZGlhQ29udHJvbGxlclRoZW1lQ2xhc3NpYywgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRm b3JtQ29udGV4dCgpLCByLCBub2RlLT5hY3RpdmUoKSk7CiAjZW5kaWYKICAgICByZXR1cm4gZmFs c2U7CiB9CkBAIC0xODU3LDcgKzE4NjUsNyBAQCBib29sIFJlbmRlclRoZW1lQ2hyb21pdW1NYWM6 OnBhaW50TWVkaWFTZWVrRm9yd2FyZEJ1dHRvbihSZW5kZXJPYmplY3QqIG8sIGNvbnN0CiBib29s IFJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50TWVkaWFTbGlkZXJUcmFjayhSZW5kZXJPYmpl Y3QqIG8sIGNvbnN0IFJlbmRlck9iamVjdDo6UGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IElu dFJlY3QmIHIpCiB7CiAjaWYgRU5BQkxFKFZJREVPKQotICAgIE5vZGUqIG5vZGUgPSBvLT5lbGVt ZW50KCk7CisgICAgTm9kZSogbm9kZSA9IG8tPm5vZGUoKTsKICAgICBOb2RlKiBtZWRpYU5vZGUg PSBub2RlID8gbm9kZS0+c2hhZG93QW5jZXN0b3JOb2RlKCkgOiAwOwogICAgIGlmICghbWVkaWFO b2RlIHx8ICghbWVkaWFOb2RlLT5oYXNUYWdOYW1lKHZpZGVvVGFnKSAmJiAhbWVkaWFOb2RlLT5o YXNUYWdOYW1lKGF1ZGlvVGFnKSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTE4NzUsNyAr MTg4Myw3IEBAIGJvb2wgUmVuZGVyVGhlbWVDaHJvbWl1bU1hYzo6cGFpbnRNZWRpYVNsaWRlclRy YWNrKFJlbmRlck9iamVjdCogbywgY29uc3QgUmVuZGVyCiAgICAgICAgIGN1cnJlbnRUaW1lID0g cGxheWVyLT5jdXJyZW50VGltZSgpOwogICAgIH0KIAotICAgIHdrRHJhd01lZGlhU2xpZGVyVHJh Y2socGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCByLCB0aW1lTG9hZGVkLCBj dXJyZW50VGltZSwgZHVyYXRpb24pOworICAgIHdrRHJhd01lZGlhU2xpZGVyVHJhY2soTWVkaWFD b250cm9sbGVyVGhlbWVDbGFzc2ljLCBwYWludEluZm8uY29udGV4dC0+cGxhdGZvcm1Db250ZXh0 KCksIHIsIHRpbWVMb2FkZWQsIGN1cnJlbnRUaW1lLCBkdXJhdGlvbik7CiAjZW5kaWYKICAgICBy ZXR1cm4gZmFsc2U7CiB9CkBAIC0xODgzLDEyICsxODkxLDEyIEBAIGJvb2wgUmVuZGVyVGhlbWVD aHJvbWl1bU1hYzo6cGFpbnRNZWRpYVNsaWRlclRyYWNrKFJlbmRlck9iamVjdCogbywgY29uc3Qg UmVuZGVyCiBib29sIFJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50TWVkaWFTbGlkZXJUaHVt YihSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFJlbmRlck9iamVjdDo6UGFpbnRJbmZvJiBwYWludElu Zm8sIGNvbnN0IEludFJlY3QmIHIpCiB7CiAjaWYgRU5BQkxFKFZJREVPKQotICAgIE5vZGUqIG5v ZGUgPSBvLT5lbGVtZW50KCk7CisgICAgTm9kZSogbm9kZSA9IG8tPm5vZGUoKTsKICAgICBpZiAo IW5vZGUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIExvY2FsQ3VycmVudEdyYXBoaWNz Q29udGV4dCBsb2NhbENvbnRleHQocGFpbnRJbmZvLmNvbnRleHQpOwotICAgIHdrRHJhd01lZGlh VUlQYXJ0KE1lZGlhU2xpZGVyVGh1bWIsIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRl eHQoKSwgciwgbm9kZS0+YWN0aXZlKCkpOworICAgIHdrRHJhd01lZGlhVUlQYXJ0KE1lZGlhU2xp ZGVyVGh1bWIsIE1lZGlhQ29udHJvbGxlclRoZW1lQ2xhc3NpYywgcGFpbnRJbmZvLmNvbnRleHQt PnBsYXRmb3JtQ29udGV4dCgpLCByLCBub2RlLT5hY3RpdmUoKSk7CiAjZW5kaWYKICAgICByZXR1 cm4gZmFsc2U7CiB9Cg==