57418 2011-03-29 21:25:54 -0700 [Qt] [Symbian] GraphicsLayer: support plugins on symbian 2011-06-27 06:58:25 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) S60 Hardware S60 3rd edition RESOLVED FIXED Qt, QtTriaged P3 Normal --- 34415 35524 1 ostap73 webkit-unassigned ademar benjamin cmarrin eric girish jamesr koivisto laszlo.gombos webkit.review.bot oldest_to_newest 376024 0 ostap73 2011-03-29 21:25:54 -0700 Add graphics layer support for plugins on symbian. 376025 1 87462 ostap73 2011-03-29 21:31:18 -0700 Created attachment 87462 Implement graphics layer support for plugins on symbian. 376027 2 webkit.review.bot 2011-03-29 21:33:50 -0700 Attachment 87462 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/plugins/symbian/PluginViewSymbian.cpp:113: Missing space before ( in if( [whitespace/parens] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 376041 3 87465 ostap73 2011-03-29 22:08:38 -0700 Created attachment 87465 Fix style 376201 4 87465 benjamin 2011-03-30 04:59:21 -0700 Comment on attachment 87465 Fix style View in context: https://bugs.webkit.org/attachment.cgi?id=87465&action=review Is there no way to test this? There are changes to PluginView which do not look Symbian specific, can't they be commited separately with test coverage? > Source/WebCore/plugins/symbian/PluginViewSymbian.cpp:93 > +// Qt's GraphicsLayer (GraphicsLayerQt) requires layers to be QGraphicsWidgets Missing dot at the end of the sentence. Useless comment anyway, it does not add information/explanation, you can remove it. > Source/WebCore/plugins/symbian/PluginViewSymbian.cpp:112 > + clipRect.translate(-clipRect.topLeft()); That looks weird, are you trying to map and object from content coordinate to window coordinate? > Source/WebCore/plugins/symbian/PluginViewSymbian.cpp:118 > + rect.adjust(-1, -1, 1, 1); WHAAAAAAAAT? That deserve a comment :) > Source/WebCore/plugins/symbian/PluginViewSymbian.cpp:484 > + // Trigger layer computation in RenderLayerCompositor Not period at the end of the sentence. Useless comment anyway. 376349 5 ostap73 2011-03-30 08:33:47 -0700 (In reply to comment #4) > (From update of attachment 87465 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=87465&action=review > > Is there no way to test this? > There are changes to PluginView which do not look Symbian specific, can't they be commited separately with test coverage? What is not symbian specific? Moving out m_platformLayer definition out of XP_UNIX ifdef? ;) I have similar patch coming for windows, so all platforms should be covered. In any case, having unused m_platformLayer member shouldn't harm. > > Source/WebCore/plugins/symbian/PluginViewSymbian.cpp:93 > > +// Qt's GraphicsLayer (GraphicsLayerQt) requires layers to be QGraphicsWidgets > > Missing dot at the end of the sentence. > Useless comment anyway, it does not add information/explanation, you can remove it. Copy paste from Linux patch ;) > > Source/WebCore/plugins/symbian/PluginViewSymbian.cpp:112 > > + clipRect.translate(-clipRect.topLeft()); > > That looks weird, are you trying to map and object from content coordinate to window coordinate? Yes. What's weird here? It assigned from frameRect one line upper. Would this QRectF clipRect(m_view->frameRect().translated(-m_view->frameRect().topLeft())); look better? ;) > > Source/WebCore/plugins/symbian/PluginViewSymbian.cpp:118 > > + rect.adjust(-1, -1, 1, 1); > > WHAAAAAAAAT? > That deserve a comment :) It is converted from QRectF to QRect. I see artifacts with animated transparent plugins when QGraphicsWebView is scaled. Here is sample: goo.gl/uhgYk > > Source/WebCore/plugins/symbian/PluginViewSymbian.cpp:484 > > + // Trigger layer computation in RenderLayerCompositor > > Not period at the end of the sentence. > Useless comment anyway. Copy/paste again ;) 376417 6 87556 ostap73 2011-03-30 09:56:47 -0700 Created attachment 87556 Updated patch proposal 384000 7 87556 ostap73 2011-04-12 07:48:44 -0700 Comment on attachment 87556 Updated patch proposal Need to update patch with fix similar to https://bugs.webkit.org/show_bug.cgi?id=34415 393628 8 91306 ostap73 2011-04-27 10:10:50 -0700 Created attachment 91306 Updated patch 397398 9 91306 menard 2011-05-03 14:36:23 -0700 Comment on attachment 91306 Updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=91306&action=review > Source/WebCore/plugins/symbian/PluginViewSymbian.cpp:111 > + clipRect &= option->exposedRect; Just by curiosity, partial updates are worth it? Do you have a test case where it performs better for the plugin? 397457 10 ostap73 2011-05-03 15:33:59 -0700 (In reply to comment #9) > (From update of attachment 91306 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=91306&action=review > > > Source/WebCore/plugins/symbian/PluginViewSymbian.cpp:111 > > + clipRect &= option->exposedRect; > > Just by curiosity, partial updates are worth it? Why not? ;) > Do you have a test case where it performs better for the plugin? Flash plugins could be quite big - bigger than screen size. It makes difference even for simple bit blit. From previous measurements full screen bit blit without alpha on N97 was taking about 12ms. If plugin is bigger, or alpha blending involved, than it will be longer. 408406 11 91306 eric 2011-05-23 15:44:55 -0700 Comment on attachment 91306 Updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=91306&action=review > Source/WebCore/plugins/PluginView.h:432 > +#if USE(ACCELERATED_COMPOSITING) && (defined(XP_UNIX) || OS(SYMBIAN)) Why the unix here? > Source/WebCore/plugins/symbian/PluginViewSymbian.cpp:472 > + if (m_parentFrame->page()->chrome()->client()->allowsAcceleratedCompositing() > + && m_parentFrame->page()->settings() > + && m_parentFrame->page()->settings()->acceleratedCompositingEnabled()) { I wonder if this shouldn't be a helper function. 408407 12 eric 2011-05-23 15:45:47 -0700 The CC'd folks should know about accellerated compositing and PlatformLayer (to tell if this patch makes sense). 408425 13 91306 menard 2011-05-23 16:01:08 -0700 Comment on attachment 91306 Updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=91306&action=review >> Source/WebCore/plugins/PluginView.h:432 >> +#if USE(ACCELERATED_COMPOSITING) && (defined(XP_UNIX) || OS(SYMBIAN)) > > Why the unix here? +1 >>> Source/WebCore/plugins/symbian/PluginViewSymbian.cpp:111 >>> + clipRect &= option->exposedRect; >> >> Just by curiosity, partial updates are worth it? Do you have a test case where it performs better for the plugin? > > Why not? ;) Because computing the exposed rect may be costly in QGV. 408830 14 ostap73 2011-05-24 07:18:44 -0700 (In reply to comment #11) > (From update of attachment 91306 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=91306&action=review > > > Source/WebCore/plugins/PluginView.h:432 > > +#if USE(ACCELERATED_COMPOSITING) && (defined(XP_UNIX) || OS(SYMBIAN)) > > Why the unix here? Because this patch adds AC plugin layer implementation for symbian to already existing unix implementation. Mac and windows still do not have plugin AC layer implementation for Qt. I just modified existing ifdef (added SYMBIAN). It's a bit unclear, because I had to break previous #ifdef at line 429 (paintUsingXPixmap is not needed on symbian and other platforms). > > > Source/WebCore/plugins/symbian/PluginViewSymbian.cpp:472 > > + if (m_parentFrame->page()->chrome()->client()->allowsAcceleratedCompositing() > > + && m_parentFrame->page()->settings() > > + && m_parentFrame->page()->settings()->acceleratedCompositingEnabled()) { > > I wonder if this shouldn't be a helper function. What exactly? Big condition or creating of plugin layer? Or both together? ;) In any case, I'd prefer to leave it as it is to make it similar to unix implementation to make later merging of other changes simpler. 408835 15 eric 2011-05-24 07:27:21 -0700 (In reply to comment #14) > (In reply to comment #11) > > (From update of attachment 91306 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=91306&action=review > > > > > Source/WebCore/plugins/PluginView.h:432 > > > +#if USE(ACCELERATED_COMPOSITING) && (defined(XP_UNIX) || OS(SYMBIAN)) > > > > Why the unix here? > > Because this patch adds AC plugin layer implementation for symbian to already existing unix implementation. Mac and windows still do not have plugin AC layer implementation for Qt. I just modified existing ifdef (added SYMBIAN). > It's a bit unclear, because I had to break previous #ifdef at line 429 (paintUsingXPixmap is not needed on symbian and other platforms). Sounds like we might want to come up with a new define then. Otherwise we're going to have to add defined(WIN) || everywhere when we add win, and then again fo mac, etc. > > > > > Source/WebCore/plugins/symbian/PluginViewSymbian.cpp:472 > > > + if (m_parentFrame->page()->chrome()->client()->allowsAcceleratedCompositing() > > > + && m_parentFrame->page()->settings() > > > + && m_parentFrame->page()->settings()->acceleratedCompositingEnabled()) { > > > > I wonder if this shouldn't be a helper function. > > What exactly? Big condition or creating of plugin layer? Or both together? ;) > In any case, I'd prefer to leave it as it is to make it similar to unix implementation to make later merging of other changes simpler. Well, consider this example: if (shouldUseAccelleratedComposititing(m_parentFrame)) Such is very clear at the call site what it does. And the actual implementation of the check can use local variables and early return as well. I'm not saying that splitting ifs off into functions is always a good choice. But in this one, I think it might be, given all the m_parentFrame->paget()->chrome copy paste. 408836 16 ostap73 2011-05-24 07:31:11 -0700 (In reply to comment #13) > >>> Source/WebCore/plugins/symbian/PluginViewSymbian.cpp:111 > >>> + clipRect &= option->exposedRect; > >> > >> Just by curiosity, partial updates are worth it? Do you have a test case where it performs better for the plugin? > > > > Why not? ;) > > Because computing the exposed rect may be costly in QGV. Costlier than blitting of the whole screen? ;) I didn't test this implementation for performance, but in other browser on symbian there is clear difference for big plugins that do partial screen updates (like some animation running) on N8 with raster only flash plugin. Frame rate drops significantly and visually you can seed difference. With HW accelerated plugin difference is minmal (5% max for small animations on full screen plugin), but still exists. 408842 17 ostap73 2011-05-24 07:49:12 -0700 (In reply to comment #15) > (In reply to comment #14) > > (In reply to comment #11) > > > (From update of attachment 91306 [details] [details] [details]) > > > View in context: https://bugs.webkit.org/attachment.cgi?id=91306&action=review > > > > > > > Source/WebCore/plugins/PluginView.h:432 > > > > +#if USE(ACCELERATED_COMPOSITING) && (defined(XP_UNIX) || OS(SYMBIAN)) > > > > > > Why the unix here? > > > > Because this patch adds AC plugin layer implementation for symbian to already existing unix implementation. Mac and windows still do not have plugin AC layer implementation for Qt. I just modified existing ifdef (added SYMBIAN). > > It's a bit unclear, because I had to break previous #ifdef at line 429 (paintUsingXPixmap is not needed on symbian and other platforms). > > Sounds like we might want to come up with a new define then. Otherwise we're going to have to add defined(WIN) || everywhere when we add win, and then again fo mac, etc. After mac and win AC plugin layers are implemented this condition can be removed because all 4 platforms will be supported. > > > > > > > Source/WebCore/plugins/symbian/PluginViewSymbian.cpp:472 > > > > + if (m_parentFrame->page()->chrome()->client()->allowsAcceleratedCompositing() > > > > + && m_parentFrame->page()->settings() > > > > + && m_parentFrame->page()->settings()->acceleratedCompositingEnabled()) { > > > > > > I wonder if this shouldn't be a helper function. > > > > What exactly? Big condition or creating of plugin layer? Or both together? ;) > > In any case, I'd prefer to leave it as it is to make it similar to unix implementation to make later merging of other changes simpler. > > Well, consider this example: > > if (shouldUseAccelleratedComposititing(m_parentFrame)) > > Such is very clear at the call site what it does. And the actual implementation of the check can use local variables and early return as well. > > I'm not saying that splitting ifs off into functions is always a good choice. But in this one, I think it might be, given all the m_parentFrame->paget()->chrome copy paste. Yes, I've got it. Should I make it for linux part also? I'd like to keep it similar. 409274 18 laszlo.gombos 2011-05-24 15:44:44 -0700 > > > > Source/WebCore/plugins/PluginView.h:432 > > > > +#if USE(ACCELERATED_COMPOSITING) && (defined(XP_UNIX) || OS(SYMBIAN)) > > > > > > Why the unix here? > > > > Because this patch adds AC plugin layer implementation for symbian to already existing unix implementation. Mac and windows still do not have plugin AC layer implementation for Qt. I just modified existing ifdef (added SYMBIAN). > > It's a bit unclear, because I had to break previous #ifdef at line 429 (paintUsingXPixmap is not needed on symbian and other platforms). > > Sounds like we might want to come up with a new define then. Perhaps a local macro ? #if PLATFORM(QT) && USE(ACCELERATED_COMPOSITING) && ENABLE(NETSCAPE_PLUGIN_API) && (defined(XP_UNIX) || OS(SYMBIAN)) #define WTF_USE_ACCELERATED_COMPOSITING_PLUGIN_LAYER #endif 409277 19 91306 laszlo.gombos 2011-05-24 15:49:06 -0700 Comment on attachment 91306 Updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=91306&action=review r- to make sure guards are used consistently. >>>>>> Source/WebCore/plugins/PluginView.h:432 >>>>>> +#if USE(ACCELERATED_COMPOSITING) && (defined(XP_UNIX) || OS(SYMBIAN)) >>>>> >>>>> Why the unix here? >>>> >>>> +1 >>> >>> Because this patch adds AC plugin layer implementation for symbian to already existing unix implementation. Mac and windows still do not have plugin AC layer implementation for Qt. I just modified existing ifdef (added SYMBIAN). >>> It's a bit unclear, because I had to break previous #ifdef at line 429 (paintUsingXPixmap is not needed on symbian and other platforms). >> >> Sounds like we might want to come up with a new define then. Otherwise we're going to have to add defined(WIN) || everywhere when we add win, and then again fo mac, etc. > > After mac and win AC plugin layers are implemented this condition can be removed because all 4 platforms will be supported. This probably breaks the build when ENABLE(NETSCAPE_PLUGIN_API) is false. A local macro use consistently would help avoid making mistakes like this and would help with readability. 410716 20 95016 ostap73 2011-05-26 12:10:58 -0700 Created attachment 95016 Updated patch 420199 21 95016 laszlo.gombos 2011-06-13 21:41:23 -0700 Comment on attachment 95016 Updated patch LGTM, r+. 420526 22 95016 webkit.review.bot 2011-06-14 10:13:14 -0700 Comment on attachment 95016 Updated patch Clearing flags on attachment: 95016 Committed r88816: <http://trac.webkit.org/changeset/88816> 420527 23 webkit.review.bot 2011-06-14 10:13:21 -0700 All reviewed patches have been landed. Closing bug. 427905 24 ademar 2011-06-27 06:58:25 -0700 Revision r88816 cherry-picked into qtwebkit-2.2 with commit 7a6f64d <http://gitorious.org/webkit/qtwebkit/commit/7a6f64d> 87462 2011-03-29 21:31:18 -0700 2011-03-29 22:08:38 -0700 Implement graphics layer support for plugins on symbian. ACSymbianPlugin_02.diff text/plain 5572 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlYThjYzU3Li4zOWVjNmE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMDMtMjkgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPG9zdGFwZW5rby52aWF0Y2hl c2xhdkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW1F0XSBbU3ltYmlhbl0gR3JhcGhpY3NMYXllcjogc3VwcG9ydCBwbHVnaW5zIG9u IFN5bWJpYW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTU3NDE4CisKKyAgICAgICAgSW1wbGVtZW50IGdyYXBoaWNzIGxheWVyIGZvciBwbHVnaW5zIG9u IFN5bWJpYW4uCisKKyAgICAgICAgKiBwbHVnaW5zL1BsdWdpblZpZXcuaDoKKyAgICAgICAgKiBw bHVnaW5zL3N5bWJpYW4vUGx1Z2luVmlld1N5bWJpYW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UGx1Z2luR3JhcGhpY3NMYXllclF0OjpQbHVnaW5HcmFwaGljc0xheWVyUXQpOgorICAgICAgICAo V2ViQ29yZTo6UGx1Z2luR3JhcGhpY3NMYXllclF0Ojp+UGx1Z2luR3JhcGhpY3NMYXllclF0KToK KyAgICAgICAgKFdlYkNvcmU6OlBsdWdpbkdyYXBoaWNzTGF5ZXJRdDo6cGFpbnQpOgorICAgICAg ICAoV2ViQ29yZTo6UGx1Z2luVmlldzo6cGFpbnQpOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2lu Vmlldzo6aW52YWxpZGF0ZVJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luVmlldzo6cGxh dGZvcm1TdGFydCk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3OjpwbGF0Zm9ybUxheWVy KToKKwogMjAxMS0wMy0yOSAgSmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUnVzc2VsbC4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9Q bHVnaW5WaWV3LmgKaW5kZXggODk2NTA4ZC4uMTdhZmM0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9Q bHVnaW5WaWV3LmgKQEAgLTI1NSw3ICsyNTUsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAg ICAgIHZvaWQga2VlcEFsaXZlKCk7CiAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcp Ci0jaWYgZGVmaW5lZChYUF9VTklYKSAmJiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkgJiYg UExBVEZPUk0oUVQpCisjaWYgKGRlZmluZWQoWFBfVU5JWCkgfHwgT1MoU1lNQklBTikpICYmIEVO QUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKSAmJiBQTEFURk9STShRVCkKICAgICAgICAgdmlydHVh bCBQbGF0Zm9ybUxheWVyKiBwbGF0Zm9ybUxheWVyKCkgY29uc3Q7CiAjZWxzZQogICAgICAgICB2 aXJ0dWFsIFBsYXRmb3JtTGF5ZXIqIHBsYXRmb3JtTGF5ZXIoKSBjb25zdCB7IHJldHVybiAwOyB9 CkBAIC00MjgsMTEgKzQyOCwxMSBAQCBwcml2YXRlOgogI2VuZGlmCiAjaWYgZGVmaW5lZChYUF9V TklYKSAmJiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKICAgICAgICAgdm9pZCBwYWludFVz aW5nWFBpeG1hcChRUGFpbnRlciogcGFpbnRlciwgY29uc3QgUVJlY3QgJmV4cG9zZWRSZWN0KTsK KyNlbmRpZgogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICAgICAgT3duUHRy PFBsYXRmb3JtTGF5ZXI+IG1fcGxhdGZvcm1MYXllcjsKICAgICAgICAgZnJpZW5kIGNsYXNzIFBs dWdpbkdyYXBoaWNzTGF5ZXJRdDsKICNlbmRpZiAvLyBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJ TkcpCi0jZW5kaWYKICNlbmRpZiAvLyBQTEFURk9STShRVCkKIAogI2lmIFBMQVRGT1JNKEdUSykK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvc3ltYmlhbi9QbHVnaW5WaWV3U3lt Ymlhbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL3N5bWJpYW4vUGx1Z2luVmlld1N5bWJp YW4uY3BwCmluZGV4IDFhOWE5Y2EuLjQ3MGVhOWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsdWdpbnMvc3ltYmlhbi9QbHVnaW5WaWV3U3ltYmlhbi5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGx1Z2lucy9zeW1iaWFuL1BsdWdpblZpZXdTeW1iaWFuLmNwcApAQCAtMjAsNiArMjAsOCBA QAogI2luY2x1ZGUgIlBsdWdpblZpZXcuaCIKIAogI2luY2x1ZGUgIkJyaWRnZUpTQy5oIgorI2lu Y2x1ZGUgIkNocm9tZS5oIgorI2luY2x1ZGUgIkNocm9tZUNsaWVudC5oIgogI2luY2x1ZGUgIkRv Y3VtZW50LmgiCiAjaW5jbHVkZSAiRG9jdW1lbnRMb2FkZXIuaCIKICNpbmNsdWRlICJFbGVtZW50 LmgiCkBAIC02MCw2ICs2Miw3IEBACiAjaW5jbHVkZSA8UUtleUV2ZW50PgogI2luY2x1ZGUgPFFQ aXhtYXA+CiAjaW5jbHVkZSA8UVJlZ2lvbj4KKyNpbmNsdWRlIDxRU3R5bGVPcHRpb25HcmFwaGlj c0l0ZW0+CiAjaW5jbHVkZSA8UVZlY3Rvcj4KICNpbmNsdWRlIDxRV2lkZ2V0PgogI2luY2x1ZGUg PHJ1bnRpbWUvSlNMb2NrLmg+CkBAIC04Niw2ICs4OSw0NiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CiAKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09N UE9TSVRJTkcpCisvLyBRdCdzIEdyYXBoaWNzTGF5ZXIgKEdyYXBoaWNzTGF5ZXJRdCkgcmVxdWly ZXMgbGF5ZXJzIHRvIGJlIFFHcmFwaGljc1dpZGdldHMKK2NsYXNzIFBsdWdpbkdyYXBoaWNzTGF5 ZXJRdCA6IHB1YmxpYyBRR3JhcGhpY3NXaWRnZXQgeworcHVibGljOgorICAgIFBsdWdpbkdyYXBo aWNzTGF5ZXJRdChQbHVnaW5WaWV3KiB2aWV3KSA6IG1fdmlldyh2aWV3KQorICAgIHsKKyAgICAg ICAgc2V0RmxhZyhRR3JhcGhpY3NJdGVtOjpJdGVtVXNlc0V4dGVuZGVkU3R5bGVPcHRpb24sIHRy dWUpOworICAgIH0KKworICAgIH5QbHVnaW5HcmFwaGljc0xheWVyUXQoKSB7IH0KKworICAgIHZv aWQgcGFpbnQoUVBhaW50ZXIqIHBhaW50ZXIsIGNvbnN0IFFTdHlsZU9wdGlvbkdyYXBoaWNzSXRl bSogb3B0aW9uLCBRV2lkZ2V0KiB3aWRnZXQgPSAwKQorICAgIHsKKyAgICAgICAgUV9VTlVTRUQo d2lkZ2V0KTsKKworICAgICAgICBtX3ZpZXctPm1fbnBXaW5kb3cud3NfaW5mbyA9ICh2b2lkKiko cGFpbnRlcik7CisgICAgICAgIG1fdmlldy0+c2V0TlBXaW5kb3dJZk5lZWRlZCgpOworCisgICAg ICAgIHBhaW50ZXItPnNhdmUoKTsKKyAgICAgICAgUVJlY3RGIGNsaXBSZWN0KG1fdmlldy0+ZnJh bWVSZWN0KCkpOworICAgICAgICBjbGlwUmVjdC50cmFuc2xhdGUoLWNsaXBSZWN0LnRvcExlZnQo KSk7CisgICAgICAgIGlmKG9wdGlvbiAmJiAhb3B0aW9uLT5leHBvc2VkUmVjdC5pc0VtcHR5KCkp CisgICAgICAgICAgICBjbGlwUmVjdC5pbnRlcnNlY3Qob3B0aW9uLT5leHBvc2VkUmVjdCk7Cisg ICAgICAgIHBhaW50ZXItPnNldENsaXBSZWN0KGNsaXBSZWN0KTsKKworICAgICAgICBRUmVjdCBy ZWN0ID0gY2xpcFJlY3QudG9SZWN0KCk7CisgICAgICAgIHJlY3QuYWRqdXN0KC0xLCAtMSwgMSwg MSk7CisKKyAgICAgICAgUVBhaW50RXZlbnQgZXYocmVjdCk7CisgICAgICAgIFFFdmVudCYgbnBF dmVudCA9IGV2OworICAgICAgICBtX3ZpZXctPmRpc3BhdGNoTlBFdmVudChucEV2ZW50KTsKKwor ICAgICAgICBwYWludGVyLT5yZXN0b3JlKCk7CisgICAgfQorCitwcml2YXRlOgorICAgIFBsdWdp blZpZXcqIG1fdmlldzsKK307CisjZW5kaWYKKwogdm9pZCBQbHVnaW5WaWV3Ojp1cGRhdGVQbHVn aW5XaWRnZXQoKQogewogICAgIGlmICghcGFyZW50KCkpCkBAIC0xNTQsNiArMTk3LDExIEBAIHZv aWQgUGx1Z2luVmlldzo6cGFpbnQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRS ZWN0JiByZWN0KQogICAgIGlmIChtX2lzV2luZG93ZWQpCiAgICAgICAgIHJldHVybjsKIAorI2lm IFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyAgICBpZiAobV9wbGF0Zm9ybUxheWVyKQor ICAgICAgICByZXR1cm47CisjZW5kaWYKKwogICAgIGNvbnRleHQtPnNhdmUoKTsKICAgICBJbnRS ZWN0IGNsaXBSZWN0KHJlY3QpOwogICAgIGNsaXBSZWN0LmludGVyc2VjdChmcmFtZVJlY3QoKSk7 CkBAIC0zNTAsNiArMzk4LDEzIEBAIGJvb2wgUGx1Z2luVmlldzo6cGxhdGZvcm1HZXRWYWx1ZShO UE5WYXJpYWJsZSwgdm9pZCosIE5QRXJyb3IqKQogCiB2b2lkIFBsdWdpblZpZXc6OmludmFsaWRh dGVSZWN0KGNvbnN0IEludFJlY3QmIHJlY3QpCiB7CisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBP U0lUSU5HKSAmJiAhVVNFKFRFWFRVUkVfTUFQUEVSKQorICAgIGlmIChtX3BsYXRmb3JtTGF5ZXIp IHsKKyAgICAgICAgbV9wbGF0Zm9ybUxheWVyLT51cGRhdGUoUVJlY3RGKHJlY3QpKTsKKyAgICAg ICAgcmV0dXJuOworICAgIH0KKyNlbmRpZgorCiAgICAgaWYgKG1faXNXaW5kb3dlZCkgewogICAg ICAgICBwbGF0Zm9ybVdpZGdldCgpLT51cGRhdGUocmVjdCk7CiAgICAgICAgIHJldHVybjsKQEAg LTQyMSw2ICs0NzYsMTUgQEAgYm9vbCBQbHVnaW5WaWV3OjpwbGF0Zm9ybVN0YXJ0KCkKICAgICAg ICAgc2V0UGxhdGZvcm1XaWRnZXQoMCk7CiAgICAgICAgIG1fbnBXaW5kb3cudHlwZSA9IE5QV2lu ZG93VHlwZURyYXdhYmxlOwogICAgICAgICBtX25wV2luZG93LndpbmRvdyA9IDA7IC8vIE5vdCB1 c2VkPworI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykgJiYgIVVTRShURVhUVVJFX01B UFBFUikKKyAgICAgICAgaWYgKG1fcGFyZW50RnJhbWUtPnBhZ2UoKS0+Y2hyb21lKCktPmNsaWVu dCgpLT5hbGxvd3NBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCkKKyAgICAgICAgICAgICYmIG1fcGFy ZW50RnJhbWUtPnBhZ2UoKS0+c2V0dGluZ3MoKQorICAgICAgICAgICAgJiYgbV9wYXJlbnRGcmFt ZS0+cGFnZSgpLT5zZXR0aW5ncygpLT5hY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCgpKSB7 CisgICAgICAgICAgICBtX3BsYXRmb3JtTGF5ZXIgPSBuZXcgUGx1Z2luR3JhcGhpY3NMYXllclF0 KHRoaXMpOworICAgICAgICAgICAgLy8gVHJpZ2dlciBsYXllciBjb21wdXRhdGlvbiBpbiBSZW5k ZXJMYXllckNvbXBvc2l0b3IKKyAgICAgICAgICAgIG1fZWxlbWVudC0+c2V0TmVlZHNTdHlsZVJl Y2FsYyhTeW50aGV0aWNTdHlsZUNoYW5nZSk7CisgICAgICAgIH0KKyNlbmRpZgogICAgIH0gICAg CiAgICAgdXBkYXRlUGx1Z2luV2lkZ2V0KCk7CiAgICAgc2V0TlBXaW5kb3dJZk5lZWRlZCgpOwpA QCAtNDUwLDQgKzUxNCwxMSBAQCB2b2lkIFBsdWdpblZpZXc6OnJlc3RhcnQoKQogewogfQogCisj aWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQorUGxhdGZvcm1MYXllciogUGx1Z2luVmll dzo6cGxhdGZvcm1MYXllcigpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fcGxhdGZvcm1MYXllci5n ZXQoKTsKK30KKyNlbmRpZgorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg== 87465 2011-03-29 22:08:38 -0700 2011-03-30 09:56:47 -0700 Fix style ACSymbianPlugin_03.diff text/plain 5573 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlYThjYzU3Li4zOWVjNmE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMDMtMjkgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPG9zdGFwZW5rby52aWF0Y2hl c2xhdkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW1F0XSBbU3ltYmlhbl0gR3JhcGhpY3NMYXllcjogc3VwcG9ydCBwbHVnaW5zIG9u IFN5bWJpYW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTU3NDE4CisKKyAgICAgICAgSW1wbGVtZW50IGdyYXBoaWNzIGxheWVyIGZvciBwbHVnaW5zIG9u IFN5bWJpYW4uCisKKyAgICAgICAgKiBwbHVnaW5zL1BsdWdpblZpZXcuaDoKKyAgICAgICAgKiBw bHVnaW5zL3N5bWJpYW4vUGx1Z2luVmlld1N5bWJpYW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UGx1Z2luR3JhcGhpY3NMYXllclF0OjpQbHVnaW5HcmFwaGljc0xheWVyUXQpOgorICAgICAgICAo V2ViQ29yZTo6UGx1Z2luR3JhcGhpY3NMYXllclF0Ojp+UGx1Z2luR3JhcGhpY3NMYXllclF0KToK KyAgICAgICAgKFdlYkNvcmU6OlBsdWdpbkdyYXBoaWNzTGF5ZXJRdDo6cGFpbnQpOgorICAgICAg ICAoV2ViQ29yZTo6UGx1Z2luVmlldzo6cGFpbnQpOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2lu Vmlldzo6aW52YWxpZGF0ZVJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luVmlldzo6cGxh dGZvcm1TdGFydCk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3OjpwbGF0Zm9ybUxheWVy KToKKwogMjAxMS0wMy0yOSAgSmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUnVzc2VsbC4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9Q bHVnaW5WaWV3LmgKaW5kZXggODk2NTA4ZC4uMTdhZmM0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9Q bHVnaW5WaWV3LmgKQEAgLTI1NSw3ICsyNTUsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAg ICAgIHZvaWQga2VlcEFsaXZlKCk7CiAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcp Ci0jaWYgZGVmaW5lZChYUF9VTklYKSAmJiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkgJiYg UExBVEZPUk0oUVQpCisjaWYgKGRlZmluZWQoWFBfVU5JWCkgfHwgT1MoU1lNQklBTikpICYmIEVO QUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKSAmJiBQTEFURk9STShRVCkKICAgICAgICAgdmlydHVh bCBQbGF0Zm9ybUxheWVyKiBwbGF0Zm9ybUxheWVyKCkgY29uc3Q7CiAjZWxzZQogICAgICAgICB2 aXJ0dWFsIFBsYXRmb3JtTGF5ZXIqIHBsYXRmb3JtTGF5ZXIoKSBjb25zdCB7IHJldHVybiAwOyB9 CkBAIC00MjgsMTEgKzQyOCwxMSBAQCBwcml2YXRlOgogI2VuZGlmCiAjaWYgZGVmaW5lZChYUF9V TklYKSAmJiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKICAgICAgICAgdm9pZCBwYWludFVz aW5nWFBpeG1hcChRUGFpbnRlciogcGFpbnRlciwgY29uc3QgUVJlY3QgJmV4cG9zZWRSZWN0KTsK KyNlbmRpZgogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICAgICAgT3duUHRy PFBsYXRmb3JtTGF5ZXI+IG1fcGxhdGZvcm1MYXllcjsKICAgICAgICAgZnJpZW5kIGNsYXNzIFBs dWdpbkdyYXBoaWNzTGF5ZXJRdDsKICNlbmRpZiAvLyBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJ TkcpCi0jZW5kaWYKICNlbmRpZiAvLyBQTEFURk9STShRVCkKIAogI2lmIFBMQVRGT1JNKEdUSykK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvc3ltYmlhbi9QbHVnaW5WaWV3U3lt Ymlhbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL3N5bWJpYW4vUGx1Z2luVmlld1N5bWJp YW4uY3BwCmluZGV4IDFhOWE5Y2EuLjhmMDFiNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsdWdpbnMvc3ltYmlhbi9QbHVnaW5WaWV3U3ltYmlhbi5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGx1Z2lucy9zeW1iaWFuL1BsdWdpblZpZXdTeW1iaWFuLmNwcApAQCAtMjAsNiArMjAsOCBA QAogI2luY2x1ZGUgIlBsdWdpblZpZXcuaCIKIAogI2luY2x1ZGUgIkJyaWRnZUpTQy5oIgorI2lu Y2x1ZGUgIkNocm9tZS5oIgorI2luY2x1ZGUgIkNocm9tZUNsaWVudC5oIgogI2luY2x1ZGUgIkRv Y3VtZW50LmgiCiAjaW5jbHVkZSAiRG9jdW1lbnRMb2FkZXIuaCIKICNpbmNsdWRlICJFbGVtZW50 LmgiCkBAIC02MCw2ICs2Miw3IEBACiAjaW5jbHVkZSA8UUtleUV2ZW50PgogI2luY2x1ZGUgPFFQ aXhtYXA+CiAjaW5jbHVkZSA8UVJlZ2lvbj4KKyNpbmNsdWRlIDxRU3R5bGVPcHRpb25HcmFwaGlj c0l0ZW0+CiAjaW5jbHVkZSA8UVZlY3Rvcj4KICNpbmNsdWRlIDxRV2lkZ2V0PgogI2luY2x1ZGUg PHJ1bnRpbWUvSlNMb2NrLmg+CkBAIC04Niw2ICs4OSw0NiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CiAKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09N UE9TSVRJTkcpCisvLyBRdCdzIEdyYXBoaWNzTGF5ZXIgKEdyYXBoaWNzTGF5ZXJRdCkgcmVxdWly ZXMgbGF5ZXJzIHRvIGJlIFFHcmFwaGljc1dpZGdldHMKK2NsYXNzIFBsdWdpbkdyYXBoaWNzTGF5 ZXJRdCA6IHB1YmxpYyBRR3JhcGhpY3NXaWRnZXQgeworcHVibGljOgorICAgIFBsdWdpbkdyYXBo aWNzTGF5ZXJRdChQbHVnaW5WaWV3KiB2aWV3KSA6IG1fdmlldyh2aWV3KQorICAgIHsKKyAgICAg ICAgc2V0RmxhZyhRR3JhcGhpY3NJdGVtOjpJdGVtVXNlc0V4dGVuZGVkU3R5bGVPcHRpb24sIHRy dWUpOworICAgIH0KKworICAgIH5QbHVnaW5HcmFwaGljc0xheWVyUXQoKSB7IH0KKworICAgIHZv aWQgcGFpbnQoUVBhaW50ZXIqIHBhaW50ZXIsIGNvbnN0IFFTdHlsZU9wdGlvbkdyYXBoaWNzSXRl bSogb3B0aW9uLCBRV2lkZ2V0KiB3aWRnZXQgPSAwKQorICAgIHsKKyAgICAgICAgUV9VTlVTRUQo d2lkZ2V0KTsKKworICAgICAgICBtX3ZpZXctPm1fbnBXaW5kb3cud3NfaW5mbyA9ICh2b2lkKiko cGFpbnRlcik7CisgICAgICAgIG1fdmlldy0+c2V0TlBXaW5kb3dJZk5lZWRlZCgpOworCisgICAg ICAgIHBhaW50ZXItPnNhdmUoKTsKKyAgICAgICAgUVJlY3RGIGNsaXBSZWN0KG1fdmlldy0+ZnJh bWVSZWN0KCkpOworICAgICAgICBjbGlwUmVjdC50cmFuc2xhdGUoLWNsaXBSZWN0LnRvcExlZnQo KSk7CisgICAgICAgIGlmIChvcHRpb24gJiYgIW9wdGlvbi0+ZXhwb3NlZFJlY3QuaXNFbXB0eSgp KQorICAgICAgICAgICAgY2xpcFJlY3QuaW50ZXJzZWN0KG9wdGlvbi0+ZXhwb3NlZFJlY3QpOwor ICAgICAgICBwYWludGVyLT5zZXRDbGlwUmVjdChjbGlwUmVjdCk7CisKKyAgICAgICAgUVJlY3Qg cmVjdCA9IGNsaXBSZWN0LnRvUmVjdCgpOworICAgICAgICByZWN0LmFkanVzdCgtMSwgLTEsIDEs IDEpOworCisgICAgICAgIFFQYWludEV2ZW50IGV2KHJlY3QpOworICAgICAgICBRRXZlbnQmIG5w RXZlbnQgPSBldjsKKyAgICAgICAgbV92aWV3LT5kaXNwYXRjaE5QRXZlbnQobnBFdmVudCk7CisK KyAgICAgICAgcGFpbnRlci0+cmVzdG9yZSgpOworICAgIH0KKworcHJpdmF0ZToKKyAgICBQbHVn aW5WaWV3KiBtX3ZpZXc7Cit9OworI2VuZGlmCisKIHZvaWQgUGx1Z2luVmlldzo6dXBkYXRlUGx1 Z2luV2lkZ2V0KCkKIHsKICAgICBpZiAoIXBhcmVudCgpKQpAQCAtMTU0LDYgKzE5NywxMSBAQCB2 b2lkIFBsdWdpblZpZXc6OnBhaW50KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50 UmVjdCYgcmVjdCkKICAgICBpZiAobV9pc1dpbmRvd2VkKQogICAgICAgICByZXR1cm47CiAKKyNp ZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisgICAgaWYgKG1fcGxhdGZvcm1MYXllcikK KyAgICAgICAgcmV0dXJuOworI2VuZGlmCisKICAgICBjb250ZXh0LT5zYXZlKCk7CiAgICAgSW50 UmVjdCBjbGlwUmVjdChyZWN0KTsKICAgICBjbGlwUmVjdC5pbnRlcnNlY3QoZnJhbWVSZWN0KCkp OwpAQCAtMzUwLDYgKzM5OCwxMyBAQCBib29sIFBsdWdpblZpZXc6OnBsYXRmb3JtR2V0VmFsdWUo TlBOVmFyaWFibGUsIHZvaWQqLCBOUEVycm9yKikKIAogdm9pZCBQbHVnaW5WaWV3OjppbnZhbGlk YXRlUmVjdChjb25zdCBJbnRSZWN0JiByZWN0KQogeworI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01Q T1NJVElORykgJiYgIVVTRShURVhUVVJFX01BUFBFUikKKyAgICBpZiAobV9wbGF0Zm9ybUxheWVy KSB7CisgICAgICAgIG1fcGxhdGZvcm1MYXllci0+dXBkYXRlKFFSZWN0RihyZWN0KSk7CisgICAg ICAgIHJldHVybjsKKyAgICB9CisjZW5kaWYKKwogICAgIGlmIChtX2lzV2luZG93ZWQpIHsKICAg ICAgICAgcGxhdGZvcm1XaWRnZXQoKS0+dXBkYXRlKHJlY3QpOwogICAgICAgICByZXR1cm47CkBA IC00MjEsNiArNDc2LDE1IEBAIGJvb2wgUGx1Z2luVmlldzo6cGxhdGZvcm1TdGFydCgpCiAgICAg ICAgIHNldFBsYXRmb3JtV2lkZ2V0KDApOwogICAgICAgICBtX25wV2luZG93LnR5cGUgPSBOUFdp bmRvd1R5cGVEcmF3YWJsZTsKICAgICAgICAgbV9ucFdpbmRvdy53aW5kb3cgPSAwOyAvLyBOb3Qg dXNlZD8KKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpICYmICFVU0UoVEVYVFVSRV9N QVBQRVIpCisgICAgICAgIGlmIChtX3BhcmVudEZyYW1lLT5wYWdlKCktPmNocm9tZSgpLT5jbGll bnQoKS0+YWxsb3dzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpCisgICAgICAgICAgICAmJiBtX3Bh cmVudEZyYW1lLT5wYWdlKCktPnNldHRpbmdzKCkKKyAgICAgICAgICAgICYmIG1fcGFyZW50RnJh bWUtPnBhZ2UoKS0+c2V0dGluZ3MoKS0+YWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQoKSkg eworICAgICAgICAgICAgbV9wbGF0Zm9ybUxheWVyID0gbmV3IFBsdWdpbkdyYXBoaWNzTGF5ZXJR dCh0aGlzKTsKKyAgICAgICAgICAgIC8vIFRyaWdnZXIgbGF5ZXIgY29tcHV0YXRpb24gaW4gUmVu ZGVyTGF5ZXJDb21wb3NpdG9yCisgICAgICAgICAgICBtX2VsZW1lbnQtPnNldE5lZWRzU3R5bGVS ZWNhbGMoU3ludGhldGljU3R5bGVDaGFuZ2UpOworICAgICAgICB9CisjZW5kaWYKICAgICB9ICAg IAogICAgIHVwZGF0ZVBsdWdpbldpZGdldCgpOwogICAgIHNldE5QV2luZG93SWZOZWVkZWQoKTsK QEAgLTQ1MCw0ICs1MTQsMTEgQEAgdm9pZCBQbHVnaW5WaWV3OjpyZXN0YXJ0KCkKIHsKIH0KIAor I2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKK1BsYXRmb3JtTGF5ZXIqIFBsdWdpblZp ZXc6OnBsYXRmb3JtTGF5ZXIoKSBjb25zdAoreworICAgIHJldHVybiBtX3BsYXRmb3JtTGF5ZXIu Z2V0KCk7Cit9CisjZW5kaWYKKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo= 87556 2011-03-30 09:56:47 -0700 2011-04-12 07:48:44 -0700 Updated patch proposal ACSymbianPlugin_05.diff text/plain 5474 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkZjRhODVmLi4yMzNhYTNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMDMtMjkgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPG9zdGFwZW5rby52aWF0Y2hl c2xhdkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW1F0XSBbU3ltYmlhbl0gR3JhcGhpY3NMYXllcjogc3VwcG9ydCBwbHVnaW5zIG9u IFN5bWJpYW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTU3NDE4CisKKyAgICAgICAgSW1wbGVtZW50IGdyYXBoaWNzIGxheWVyIGZvciBwbHVnaW5zIG9u IFN5bWJpYW4uCisKKyAgICAgICAgKiBwbHVnaW5zL1BsdWdpblZpZXcuaDoKKyAgICAgICAgKiBw bHVnaW5zL3N5bWJpYW4vUGx1Z2luVmlld1N5bWJpYW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UGx1Z2luR3JhcGhpY3NMYXllclF0OjpQbHVnaW5HcmFwaGljc0xheWVyUXQpOgorICAgICAgICAo V2ViQ29yZTo6UGx1Z2luR3JhcGhpY3NMYXllclF0Ojp+UGx1Z2luR3JhcGhpY3NMYXllclF0KToK KyAgICAgICAgKFdlYkNvcmU6OlBsdWdpbkdyYXBoaWNzTGF5ZXJRdDo6cGFpbnQpOgorICAgICAg ICAoV2ViQ29yZTo6UGx1Z2luVmlldzo6cGFpbnQpOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2lu Vmlldzo6aW52YWxpZGF0ZVJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luVmlldzo6cGxh dGZvcm1TdGFydCk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3OjpwbGF0Zm9ybUxheWVy KToKKwogMjAxMS0wMy0yOSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgog CiAgICAgICAgIFVucmV2aWV3ZWQgcm9sbG91dCByODIyODIsIHBhcnQgb2YgcjgyMjg4LCByODIy OTguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL1BsdWdpblZpZXcuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5oCmluZGV4IDg5NjUwOGQuLjE3YWZjNGIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5oCkBAIC0yNTUsNyArMjU1LDcgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIGtlZXBBbGl2ZSgpOwogCiAjaWYgVVNFKEFD Q0VMRVJBVEVEX0NPTVBPU0lUSU5HKQotI2lmIGRlZmluZWQoWFBfVU5JWCkgJiYgRU5BQkxFKE5F VFNDQVBFX1BMVUdJTl9BUEkpICYmIFBMQVRGT1JNKFFUKQorI2lmIChkZWZpbmVkKFhQX1VOSVgp IHx8IE9TKFNZTUJJQU4pKSAmJiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkgJiYgUExBVEZP Uk0oUVQpCiAgICAgICAgIHZpcnR1YWwgUGxhdGZvcm1MYXllciogcGxhdGZvcm1MYXllcigpIGNv bnN0OwogI2Vsc2UKICAgICAgICAgdmlydHVhbCBQbGF0Zm9ybUxheWVyKiBwbGF0Zm9ybUxheWVy KCkgY29uc3QgeyByZXR1cm4gMDsgfQpAQCAtNDI4LDExICs0MjgsMTEgQEAgcHJpdmF0ZToKICNl bmRpZgogI2lmIGRlZmluZWQoWFBfVU5JWCkgJiYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkp CiAgICAgICAgIHZvaWQgcGFpbnRVc2luZ1hQaXhtYXAoUVBhaW50ZXIqIHBhaW50ZXIsIGNvbnN0 IFFSZWN0ICZleHBvc2VkUmVjdCk7CisjZW5kaWYKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9T SVRJTkcpCiAgICAgICAgIE93blB0cjxQbGF0Zm9ybUxheWVyPiBtX3BsYXRmb3JtTGF5ZXI7CiAg ICAgICAgIGZyaWVuZCBjbGFzcyBQbHVnaW5HcmFwaGljc0xheWVyUXQ7CiAjZW5kaWYgLy8gVVNF KEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQotI2VuZGlmCiAjZW5kaWYgLy8gUExBVEZPUk0oUVQp CiAKICNpZiBQTEFURk9STShHVEspCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5z L3N5bWJpYW4vUGx1Z2luVmlld1N5bWJpYW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9z eW1iaWFuL1BsdWdpblZpZXdTeW1iaWFuLmNwcAppbmRleCAxYTlhOWNhLi5kMTg3Y2UzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL3N5bWJpYW4vUGx1Z2luVmlld1N5bWJpYW4u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvc3ltYmlhbi9QbHVnaW5WaWV3U3ltYmlh bi5jcHAKQEAgLTIwLDYgKzIwLDggQEAKICNpbmNsdWRlICJQbHVnaW5WaWV3LmgiCiAKICNpbmNs dWRlICJCcmlkZ2VKU0MuaCIKKyNpbmNsdWRlICJDaHJvbWUuaCIKKyNpbmNsdWRlICJDaHJvbWVD bGllbnQuaCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIkRvY3VtZW50TG9hZGVy LmgiCiAjaW5jbHVkZSAiRWxlbWVudC5oIgpAQCAtNjAsNiArNjIsNyBAQAogI2luY2x1ZGUgPFFL ZXlFdmVudD4KICNpbmNsdWRlIDxRUGl4bWFwPgogI2luY2x1ZGUgPFFSZWdpb24+CisjaW5jbHVk ZSA8UVN0eWxlT3B0aW9uR3JhcGhpY3NJdGVtPgogI2luY2x1ZGUgPFFWZWN0b3I+CiAjaW5jbHVk ZSA8UVdpZGdldD4KICNpbmNsdWRlIDxydW50aW1lL0pTTG9jay5oPgpAQCAtODYsNiArODksNDUg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwogCisj aWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQorY2xhc3MgUGx1Z2luR3JhcGhpY3NMYXll clF0IDogcHVibGljIFFHcmFwaGljc1dpZGdldCB7CitwdWJsaWM6CisgICAgUGx1Z2luR3JhcGhp Y3NMYXllclF0KFBsdWdpblZpZXcqIHZpZXcpIDogbV92aWV3KHZpZXcpCisgICAgeworICAgICAg ICBzZXRGbGFnKFFHcmFwaGljc0l0ZW06Okl0ZW1Vc2VzRXh0ZW5kZWRTdHlsZU9wdGlvbiwgdHJ1 ZSk7CisgICAgfQorCisgICAgflBsdWdpbkdyYXBoaWNzTGF5ZXJRdCgpIHsgfQorCisgICAgdm9p ZCBwYWludChRUGFpbnRlciogcGFpbnRlciwgY29uc3QgUVN0eWxlT3B0aW9uR3JhcGhpY3NJdGVt KiBvcHRpb24sIFFXaWRnZXQqIHdpZGdldCA9IDApCisgICAgeworICAgICAgICBRX1VOVVNFRCh3 aWRnZXQpOworCisgICAgICAgIG1fdmlldy0+bV9ucFdpbmRvdy53c19pbmZvID0gKHZvaWQqKShw YWludGVyKTsKKyAgICAgICAgbV92aWV3LT5zZXROUFdpbmRvd0lmTmVlZGVkKCk7CisKKyAgICAg ICAgcGFpbnRlci0+c2F2ZSgpOworICAgICAgICBRUmVjdEYgY2xpcFJlY3QoUVBvaW50RigwLCAw KSwgUVNpemVGKG1fdmlldy0+ZnJhbWVSZWN0KCkuc2l6ZSgpKSk7CisgICAgICAgIGlmIChvcHRp b24gJiYgIW9wdGlvbi0+ZXhwb3NlZFJlY3QuaXNFbXB0eSgpKQorICAgICAgICAgICAgY2xpcFJl Y3QgJj0gb3B0aW9uLT5leHBvc2VkUmVjdDsKKyAgICAgICAgcGFpbnRlci0+c2V0Q2xpcFJlY3Qo Y2xpcFJlY3QpOworCisgICAgICAgIFFSZWN0IHJlY3QgPSBjbGlwUmVjdC50b1JlY3QoKTsKKyAg ICAgICAgLy8gZXhwYW5kIHVwZGF0ZSByZWN0IHRvIGZpeCByb3VuZGluZyBlcnJvcnMKKyAgICAg ICAgcmVjdC5hZGp1c3QoLTEsIC0xLCAxLCAxKTsKKworICAgICAgICBRUGFpbnRFdmVudCBldihy ZWN0KTsKKyAgICAgICAgUUV2ZW50JiBucEV2ZW50ID0gZXY7CisgICAgICAgIG1fdmlldy0+ZGlz cGF0Y2hOUEV2ZW50KG5wRXZlbnQpOworCisgICAgICAgIHBhaW50ZXItPnJlc3RvcmUoKTsKKyAg ICB9CisKK3ByaXZhdGU6CisgICAgUGx1Z2luVmlldyogbV92aWV3OworfTsKKyNlbmRpZgorCiB2 b2lkIFBsdWdpblZpZXc6OnVwZGF0ZVBsdWdpbldpZGdldCgpCiB7CiAgICAgaWYgKCFwYXJlbnQo KSkKQEAgLTE1NCw2ICsxOTYsMTEgQEAgdm9pZCBQbHVnaW5WaWV3OjpwYWludChHcmFwaGljc0Nv bnRleHQqIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIHJlY3QpCiAgICAgaWYgKG1faXNXaW5kb3dl ZCkKICAgICAgICAgcmV0dXJuOwogCisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQor ICAgIGlmIChtX3BsYXRmb3JtTGF5ZXIpCisgICAgICAgIHJldHVybjsKKyNlbmRpZgorCiAgICAg Y29udGV4dC0+c2F2ZSgpOwogICAgIEludFJlY3QgY2xpcFJlY3QocmVjdCk7CiAgICAgY2xpcFJl Y3QuaW50ZXJzZWN0KGZyYW1lUmVjdCgpKTsKQEAgLTM1MCw2ICszOTcsMTMgQEAgYm9vbCBQbHVn aW5WaWV3OjpwbGF0Zm9ybUdldFZhbHVlKE5QTlZhcmlhYmxlLCB2b2lkKiwgTlBFcnJvciopCiAK IHZvaWQgUGx1Z2luVmlldzo6aW52YWxpZGF0ZVJlY3QoY29uc3QgSW50UmVjdCYgcmVjdCkKIHsK KyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpICYmICFVU0UoVEVYVFVSRV9NQVBQRVIp CisgICAgaWYgKG1fcGxhdGZvcm1MYXllcikgeworICAgICAgICBtX3BsYXRmb3JtTGF5ZXItPnVw ZGF0ZShRUmVjdEYocmVjdCkpOworICAgICAgICByZXR1cm47CisgICAgfQorI2VuZGlmCisKICAg ICBpZiAobV9pc1dpbmRvd2VkKSB7CiAgICAgICAgIHBsYXRmb3JtV2lkZ2V0KCktPnVwZGF0ZShy ZWN0KTsKICAgICAgICAgcmV0dXJuOwpAQCAtNDIxLDYgKzQ3NSwxNCBAQCBib29sIFBsdWdpblZp ZXc6OnBsYXRmb3JtU3RhcnQoKQogICAgICAgICBzZXRQbGF0Zm9ybVdpZGdldCgwKTsKICAgICAg ICAgbV9ucFdpbmRvdy50eXBlID0gTlBXaW5kb3dUeXBlRHJhd2FibGU7CiAgICAgICAgIG1fbnBX aW5kb3cud2luZG93ID0gMDsgLy8gTm90IHVzZWQ/CisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBP U0lUSU5HKSAmJiAhVVNFKFRFWFRVUkVfTUFQUEVSKQorICAgICAgICBpZiAobV9wYXJlbnRGcmFt ZS0+cGFnZSgpLT5jaHJvbWUoKS0+Y2xpZW50KCktPmFsbG93c0FjY2VsZXJhdGVkQ29tcG9zaXRp bmcoKQorICAgICAgICAgICAgJiYgbV9wYXJlbnRGcmFtZS0+cGFnZSgpLT5zZXR0aW5ncygpCisg ICAgICAgICAgICAmJiBtX3BhcmVudEZyYW1lLT5wYWdlKCktPnNldHRpbmdzKCktPmFjY2VsZXJh dGVkQ29tcG9zaXRpbmdFbmFibGVkKCkpIHsKKyAgICAgICAgICAgIG1fcGxhdGZvcm1MYXllciA9 IG5ldyBQbHVnaW5HcmFwaGljc0xheWVyUXQodGhpcyk7CisgICAgICAgICAgICBtX2VsZW1lbnQt PnNldE5lZWRzU3R5bGVSZWNhbGMoU3ludGhldGljU3R5bGVDaGFuZ2UpOworICAgICAgICB9Cisj ZW5kaWYKICAgICB9ICAgIAogICAgIHVwZGF0ZVBsdWdpbldpZGdldCgpOwogICAgIHNldE5QV2lu ZG93SWZOZWVkZWQoKTsKQEAgLTQ1MCw0ICs1MTIsMTEgQEAgdm9pZCBQbHVnaW5WaWV3OjpyZXN0 YXJ0KCkKIHsKIH0KIAorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKK1BsYXRmb3Jt TGF5ZXIqIFBsdWdpblZpZXc6OnBsYXRmb3JtTGF5ZXIoKSBjb25zdAoreworICAgIHJldHVybiBt X3BsYXRmb3JtTGF5ZXIuZ2V0KCk7Cit9CisjZW5kaWYKKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQo= 91306 2011-04-27 10:10:50 -0700 2011-05-26 12:10:58 -0700 Updated patch ACSymbianPlugin_06.diff text/plain 5503 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlZTY0YjU0Li45MjZjYTU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMDQtMjcgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPG9zdGFwZW5rby52aWF0Y2hl c2xhdkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW1F0XSBbU3ltYmlhbl0gR3JhcGhpY3NMYXllcjogc3VwcG9ydCBwbHVnaW5zIG9u IHN5bWJpYW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTU3NDE4CisKKyAgICAgICAgSW1wbGVtZW50IGdyYXBoaWNzIGxheWVyIGZvciBwbHVnaW5zIG9u IFN5bWJpYW4uCisKKyAgICAgICAgKiBwbHVnaW5zL1BsdWdpblZpZXcuaDoKKyAgICAgICAgKiBw bHVnaW5zL3N5bWJpYW4vUGx1Z2luVmlld1N5bWJpYW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UGx1Z2luR3JhcGhpY3NMYXllclF0OjpQbHVnaW5HcmFwaGljc0xheWVyUXQpOgorICAgICAgICAo V2ViQ29yZTo6UGx1Z2luR3JhcGhpY3NMYXllclF0Ojp+UGx1Z2luR3JhcGhpY3NMYXllclF0KToK KyAgICAgICAgKFdlYkNvcmU6OlBsdWdpbkdyYXBoaWNzTGF5ZXJRdDo6cGFpbnQpOgorICAgICAg ICAoV2ViQ29yZTo6UGx1Z2luVmlldzo6cGFpbnQpOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2lu Vmlldzo6aW52YWxpZGF0ZVJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luVmlldzo6cGxh dGZvcm1TdGFydCk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3OjpwbGF0Zm9ybUxheWVy KToKKwogMjAxMS0wNC0yNiAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgQWRlbGUgUGV0ZXJzb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbHVnaW5zL1BsdWdpblZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2lu Vmlldy5oCmluZGV4IDlkM2VjMzYuLmMxMzAwYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsdWdpbnMvUGx1Z2luVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2lu Vmlldy5oCkBAIC0yNTUsNyArMjU1LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2 b2lkIGtlZXBBbGl2ZSgpOwogCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQotI2lm IGRlZmluZWQoWFBfVU5JWCkgJiYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpICYmIFBMQVRG T1JNKFFUKQorI2lmIChkZWZpbmVkKFhQX1VOSVgpIHx8IE9TKFNZTUJJQU4pKSAmJiBFTkFCTEUo TkVUU0NBUEVfUExVR0lOX0FQSSkgJiYgUExBVEZPUk0oUVQpCiAgICAgICAgIHZpcnR1YWwgUGxh dGZvcm1MYXllciogcGxhdGZvcm1MYXllcigpIGNvbnN0OwogI2Vsc2UKICAgICAgICAgdmlydHVh bCBQbGF0Zm9ybUxheWVyKiBwbGF0Zm9ybUxheWVyKCkgY29uc3QgeyByZXR1cm4gMDsgfQpAQCAt NDI4LDExICs0MjgsMTEgQEAgcHJpdmF0ZToKICNlbmRpZgogI2lmIGRlZmluZWQoWFBfVU5JWCkg JiYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCiAgICAgICAgIHZvaWQgcGFpbnRVc2luZ1hQ aXhtYXAoUVBhaW50ZXIqIHBhaW50ZXIsIGNvbnN0IFFSZWN0ICZleHBvc2VkUmVjdCk7Ci0jaWYg VVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQorI2VuZGlmCisjaWYgVVNFKEFDQ0VMRVJBVEVE X0NPTVBPU0lUSU5HKSAmJiAoZGVmaW5lZChYUF9VTklYKSB8fCBPUyhTWU1CSUFOKSkKICAgICAg ICAgT3duUHRyPFBsYXRmb3JtTGF5ZXI+IG1fcGxhdGZvcm1MYXllcjsKICAgICAgICAgZnJpZW5k IGNsYXNzIFBsdWdpbkdyYXBoaWNzTGF5ZXJRdDsKLSNlbmRpZiAvLyBVU0UoQUNDRUxFUkFURURf Q09NUE9TSVRJTkcpCi0jZW5kaWYKKyNlbmRpZiAvLyBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJ TkcpICYmIChkZWZpbmVkKFhQX1VOSVgpIHx8IE9TKFNZTUJJQU4pKQogI2VuZGlmIC8vIFBMQVRG T1JNKFFUKQogCiAjaWYgUExBVEZPUk0oR1RLKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGx1Z2lucy9zeW1iaWFuL1BsdWdpblZpZXdTeW1iaWFuLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs dWdpbnMvc3ltYmlhbi9QbHVnaW5WaWV3U3ltYmlhbi5jcHAKaW5kZXggODExMDYwNS4uYzA2MWRl YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9zeW1iaWFuL1BsdWdpblZpZXdT eW1iaWFuLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL3N5bWJpYW4vUGx1Z2luVmll d1N5bWJpYW4uY3BwCkBAIC0yMCw2ICsyMCw4IEBACiAjaW5jbHVkZSAiUGx1Z2luVmlldy5oIgog CiAjaW5jbHVkZSAiQnJpZGdlSlNDLmgiCisjaW5jbHVkZSAiQ2hyb21lLmgiCisjaW5jbHVkZSAi Q2hyb21lQ2xpZW50LmgiCiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJEb2N1bWVu dExvYWRlci5oIgogI2luY2x1ZGUgIkVsZW1lbnQuaCIKQEAgLTU5LDYgKzYxLDcgQEAKICNpbmNs dWRlIDxRS2V5RXZlbnQ+CiAjaW5jbHVkZSA8UVBpeG1hcD4KICNpbmNsdWRlIDxRUmVnaW9uPgor I2luY2x1ZGUgPFFTdHlsZU9wdGlvbkdyYXBoaWNzSXRlbT4KICNpbmNsdWRlIDxRVmVjdG9yPgog I2luY2x1ZGUgPFFXaWRnZXQ+CiAjaW5jbHVkZSA8cnVudGltZS9KU0xvY2suaD4KQEAgLTg1LDYg Kzg4LDQyIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogdXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1l czsKIAorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKK2NsYXNzIFBsdWdpbkdyYXBo aWNzTGF5ZXJRdCA6IHB1YmxpYyBRR3JhcGhpY3NXaWRnZXQgeworcHVibGljOgorICAgIFBsdWdp bkdyYXBoaWNzTGF5ZXJRdChQbHVnaW5WaWV3KiB2aWV3KSA6IG1fdmlldyh2aWV3KQorICAgIHsK KyAgICAgICAgc2V0RmxhZyhRR3JhcGhpY3NJdGVtOjpJdGVtVXNlc0V4dGVuZGVkU3R5bGVPcHRp b24sIHRydWUpOworICAgIH0KKworICAgIH5QbHVnaW5HcmFwaGljc0xheWVyUXQoKSB7IH0KKwor ICAgIHZvaWQgcGFpbnQoUVBhaW50ZXIqIHBhaW50ZXIsIGNvbnN0IFFTdHlsZU9wdGlvbkdyYXBo aWNzSXRlbSogb3B0aW9uLCBRV2lkZ2V0KiB3aWRnZXQgPSAwKQorICAgIHsKKyAgICAgICAgUV9V TlVTRUQod2lkZ2V0KTsKKworICAgICAgICBtX3ZpZXctPm1fbnBXaW5kb3cud3NfaW5mbyA9ICh2 b2lkKikocGFpbnRlcik7CisgICAgICAgIG1fdmlldy0+c2V0TlBXaW5kb3dJZk5lZWRlZCgpOwor CisgICAgICAgIHBhaW50ZXItPnNhdmUoKTsKKyAgICAgICAgUVJlY3RGIGNsaXBSZWN0KFFQb2lu dEYoMCwgMCksIFFTaXplRihtX3ZpZXctPmZyYW1lUmVjdCgpLnNpemUoKSkpOworICAgICAgICBp ZiAob3B0aW9uICYmICFvcHRpb24tPmV4cG9zZWRSZWN0LmlzRW1wdHkoKSkKKyAgICAgICAgICAg IGNsaXBSZWN0ICY9IG9wdGlvbi0+ZXhwb3NlZFJlY3Q7CisgICAgICAgIHBhaW50ZXItPnNldENs aXBSZWN0KGNsaXBSZWN0KTsKKworICAgICAgICBRUmVjdCByZWN0ID0gY2xpcFJlY3QudG9SZWN0 KCk7CisgICAgICAgIFFQYWludEV2ZW50IGV2KHJlY3QpOworICAgICAgICBRRXZlbnQmIG5wRXZl bnQgPSBldjsKKyAgICAgICAgbV92aWV3LT5kaXNwYXRjaE5QRXZlbnQobnBFdmVudCk7CisKKyAg ICAgICAgcGFpbnRlci0+cmVzdG9yZSgpOworICAgIH0KKworcHJpdmF0ZToKKyAgICBQbHVnaW5W aWV3KiBtX3ZpZXc7Cit9OworI2VuZGlmCisKIHZvaWQgUGx1Z2luVmlldzo6dXBkYXRlUGx1Z2lu V2lkZ2V0KCkKIHsKICAgICBpZiAoIXBhcmVudCgpKQpAQCAtMTQ4LDYgKzE4NywxMSBAQCB2b2lk IFBsdWdpblZpZXc6OnBhaW50KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVj dCYgcmVjdCkKICAgICBpZiAobV9pc1dpbmRvd2VkKQogICAgICAgICByZXR1cm47CiAKKyNpZiBV U0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisgICAgaWYgKG1fcGxhdGZvcm1MYXllcikKKyAg ICAgICAgcmV0dXJuOworI2VuZGlmCisKICAgICBjb250ZXh0LT5zYXZlKCk7CiAgICAgSW50UmVj dCBjbGlwUmVjdChyZWN0KTsKICAgICBjbGlwUmVjdC5pbnRlcnNlY3QoZnJhbWVSZWN0KCkpOwpA QCAtMzQ0LDYgKzM4OCwxMyBAQCBib29sIFBsdWdpblZpZXc6OnBsYXRmb3JtR2V0VmFsdWUoTlBO VmFyaWFibGUsIHZvaWQqLCBOUEVycm9yKikKIAogdm9pZCBQbHVnaW5WaWV3OjppbnZhbGlkYXRl UmVjdChjb25zdCBJbnRSZWN0JiByZWN0KQogeworI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJ VElORykgJiYgIVVTRShURVhUVVJFX01BUFBFUikKKyAgICBpZiAobV9wbGF0Zm9ybUxheWVyKSB7 CisgICAgICAgIG1fcGxhdGZvcm1MYXllci0+dXBkYXRlKFFSZWN0RihyZWN0KSk7CisgICAgICAg IHJldHVybjsKKyAgICB9CisjZW5kaWYKKwogICAgIGlmIChtX2lzV2luZG93ZWQpIHsKICAgICAg ICAgcGxhdGZvcm1XaWRnZXQoKS0+dXBkYXRlKHJlY3QpOwogICAgICAgICByZXR1cm47CkBAIC00 MTUsNiArNDY2LDE0IEBAIGJvb2wgUGx1Z2luVmlldzo6cGxhdGZvcm1TdGFydCgpCiAgICAgICAg IHNldFBsYXRmb3JtV2lkZ2V0KDApOwogICAgICAgICBtX25wV2luZG93LnR5cGUgPSBOUFdpbmRv d1R5cGVEcmF3YWJsZTsKICAgICAgICAgbV9ucFdpbmRvdy53aW5kb3cgPSAwOyAvLyBOb3QgdXNl ZD8KKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpICYmICFVU0UoVEVYVFVSRV9NQVBQ RVIpCisgICAgICAgIGlmIChtX3BhcmVudEZyYW1lLT5wYWdlKCktPmNocm9tZSgpLT5jbGllbnQo KS0+YWxsb3dzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpCisgICAgICAgICAgICAmJiBtX3BhcmVu dEZyYW1lLT5wYWdlKCktPnNldHRpbmdzKCkKKyAgICAgICAgICAgICYmIG1fcGFyZW50RnJhbWUt PnBhZ2UoKS0+c2V0dGluZ3MoKS0+YWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQoKSkgewor ICAgICAgICAgICAgbV9wbGF0Zm9ybUxheWVyID0gbmV3IFBsdWdpbkdyYXBoaWNzTGF5ZXJRdCh0 aGlzKTsKKyAgICAgICAgICAgIG1fZWxlbWVudC0+c2V0TmVlZHNTdHlsZVJlY2FsYyhTeW50aGV0 aWNTdHlsZUNoYW5nZSk7CisgICAgICAgIH0KKyNlbmRpZgogICAgIH0gICAgCiAgICAgdXBkYXRl UGx1Z2luV2lkZ2V0KCk7CiAgICAgc2V0TlBXaW5kb3dJZk5lZWRlZCgpOwpAQCAtNDQ0LDQgKzUw MywxMSBAQCB2b2lkIFBsdWdpblZpZXc6OnJlc3RhcnQoKQogewogfQogCisjaWYgVVNFKEFDQ0VM RVJBVEVEX0NPTVBPU0lUSU5HKQorUGxhdGZvcm1MYXllciogUGx1Z2luVmlldzo6cGxhdGZvcm1M YXllcigpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fcGxhdGZvcm1MYXllci5nZXQoKTsKK30KKyNl bmRpZgorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg== 95016 2011-05-26 12:10:58 -0700 2011-06-14 10:13:14 -0700 Updated patch ACSymbianPlugin_07.diff text/plain 7475 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3MmExMDkyLi44MDlmZmY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTEtMDUtMjYgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPG9zdGFwZW5rby52aWF0Y2hl c2xhdkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW1F0XSBbU3ltYmlhbl0gR3JhcGhpY3NMYXllcjogc3VwcG9ydCBwbHVnaW5zIG9u IHN5bWJpYW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTU3NDE4CisKKyAgICAgICAgSW1wbGVtZW50IGdyYXBoaWNzIGxheWVyIGZvciBwbHVnaW5zIG9u IFN5bWJpYW4uCisKKyAgICAgICAgKiBwbHVnaW5zL1BsdWdpblZpZXcuaDoKKyAgICAgICAgKiBw bHVnaW5zL3F0L1BsdWdpblZpZXdRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3 OjpzaG91bGRVc2VBY2NlbGVyYXRlZENvbXBvc2l0aW5nKToKKyAgICAgICAgKFdlYkNvcmU6OlBs dWdpblZpZXc6OnBsYXRmb3JtU3RhcnQpOgorICAgICAgICAqIHBsdWdpbnMvc3ltYmlhbi9QbHVn aW5WaWV3U3ltYmlhbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5HcmFwaGljc0xheWVy UXQ6OlBsdWdpbkdyYXBoaWNzTGF5ZXJRdCk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5HcmFw aGljc0xheWVyUXQ6On5QbHVnaW5HcmFwaGljc0xheWVyUXQpOgorICAgICAgICAoV2ViQ29yZTo6 UGx1Z2luR3JhcGhpY3NMYXllclF0OjpwYWludCk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5W aWV3OjpzaG91bGRVc2VBY2NlbGVyYXRlZENvbXBvc2l0aW5nKToKKyAgICAgICAgKFdlYkNvcmU6 OlBsdWdpblZpZXc6OnBhaW50KToKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6OmludmFs aWRhdGVSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6OnBsYXRmb3JtU3RhcnQp OgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luVmlldzo6cGxhdGZvcm1MYXllcik6CisKIDIwMTEt MDUtMjYgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBZdXJ5IFNlbWlraGF0c2t5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGx1Z2lucy9QbHVnaW5WaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL1BsdWdpblZpZXcu aAppbmRleCBhNWM0YjkwLi5kZTAzOWZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbHVn aW5zL1BsdWdpblZpZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL1BsdWdpblZpZXcu aApAQCAtNjgsNiArNjgsMTEgQEAgUVRfQkVHSU5fTkFNRVNQQUNFCiBjbGFzcyBRUGFpbnRlcjsK IFFUX0VORF9OQU1FU1BBQ0UKICNlbmRpZgorI2lmIFBMQVRGT1JNKFFUKSAmJiBVU0UoQUNDRUxF UkFURURfQ09NUE9TSVRJTkcpICYmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKSAmJiAoZGVm aW5lZChYUF9VTklYKSB8fCBPUyhTWU1CSUFOKSkKKyNpZm5kZWYgV1RGX1VTRV9BQ0NFTEVSQVRF RF9DT01QT1NJVElOR19QTFVHSU5fTEFZRVIKKyNkZWZpbmUgV1RGX1VTRV9BQ0NFTEVSQVRFRF9D T01QT1NJVElOR19QTFVHSU5fTEFZRVIgMQorI2VuZGlmCisjZW5kaWYKICNpZiBQTEFURk9STShH VEspCiB0eXBlZGVmIHN0cnVjdCBfR3RrU29ja2V0IEd0a1NvY2tldDsKICNlbmRpZgpAQCAtMjU5 LDggKzI2NCw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBrZWVwQWxpdmUo KTsKIAogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKLSNpZiBkZWZpbmVkKFhQX1VO SVgpICYmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKSAmJiBQTEFURk9STShRVCkKKyNpZiBV U0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkdfUExVR0lOX0xBWUVSKQogICAgICAgICB2aXJ0dWFs IFBsYXRmb3JtTGF5ZXIqIHBsYXRmb3JtTGF5ZXIoKSBjb25zdDsKKyAgICAgICAgYm9vbCBzaG91 bGRVc2VBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCkgY29uc3Q7CiAjZWxzZQogICAgICAgICB2aXJ0 dWFsIFBsYXRmb3JtTGF5ZXIqIHBsYXRmb3JtTGF5ZXIoKSBjb25zdCB7IHJldHVybiAwOyB9CiAj ZW5kaWYKQEAgLTQzMiwxMSArNDM4LDExIEBAIHByaXZhdGU6CiAjZW5kaWYKICNpZiBkZWZpbmVk KFhQX1VOSVgpICYmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQogICAgICAgICB2b2lkIHBh aW50VXNpbmdYUGl4bWFwKFFQYWludGVyKiBwYWludGVyLCBjb25zdCBRUmVjdCAmZXhwb3NlZFJl Y3QpOwotI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyNlbmRpZgorI2lmIFVTRShB Q0NFTEVSQVRFRF9DT01QT1NJVElOR19QTFVHSU5fTEFZRVIpCiAgICAgICAgIE93blB0cjxQbGF0 Zm9ybUxheWVyPiBtX3BsYXRmb3JtTGF5ZXI7CiAgICAgICAgIGZyaWVuZCBjbGFzcyBQbHVnaW5H cmFwaGljc0xheWVyUXQ7Ci0jZW5kaWYgLy8gVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQot I2VuZGlmCisjZW5kaWYgLy8gVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HX1BMVUdJTl9MQVlF UikKICNlbmRpZiAvLyBQTEFURk9STShRVCkKIAogI2lmIFBMQVRGT1JNKEdUSykKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvcXQvUGx1Z2luVmlld1F0LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsdWdpbnMvcXQvUGx1Z2luVmlld1F0LmNwcAppbmRleCBlYWZkZjk3Li5hNGEzZTA2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL3F0L1BsdWdpblZpZXdRdC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9xdC9QbHVnaW5WaWV3UXQuY3BwCkBAIC0xMjAs NiArMTIwLDEzIEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgUGx1Z2luVmlldyogbV92aWV3Owog fTsKKworYm9vbCBQbHVnaW5WaWV3OjpzaG91bGRVc2VBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCkg Y29uc3QKK3sKKyAgICByZXR1cm4gbV9wYXJlbnRGcmFtZS0+cGFnZSgpLT5jaHJvbWUoKS0+Y2xp ZW50KCktPmFsbG93c0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcoKQorICAgICAgICAgICAmJiBtX3Bh cmVudEZyYW1lLT5wYWdlKCktPnNldHRpbmdzKCkKKyAgICAgICAgICAgJiYgbV9wYXJlbnRGcmFt ZS0+cGFnZSgpLT5zZXR0aW5ncygpLT5hY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCgpOwor fQogI2VuZGlmCiAKIHZvaWQgUGx1Z2luVmlldzo6dXBkYXRlUGx1Z2luV2lkZ2V0KCkKQEAgLTk0 OCw5ICs5NTUsNyBAQCBib29sIFBsdWdpblZpZXc6OnBsYXRmb3JtU3RhcnQoKQogICAgICAgICBt X3BsdWdpbkRpc3BsYXkgPSBnZXRQbHVnaW5EaXNwbGF5KCk7CiAKICNpZiBVU0UoQUNDRUxFUkFU RURfQ09NUE9TSVRJTkcpICYmICFVU0UoVEVYVFVSRV9NQVBQRVIpCi0gICAgICAgIGlmIChtX3Bh cmVudEZyYW1lLT5wYWdlKCktPmNocm9tZSgpLT5jbGllbnQoKS0+YWxsb3dzQWNjZWxlcmF0ZWRD b21wb3NpdGluZygpCi0gICAgICAgICAgICAmJiBtX3BhcmVudEZyYW1lLT5wYWdlKCktPnNldHRp bmdzKCkgCi0gICAgICAgICAgICAmJiBtX3BhcmVudEZyYW1lLT5wYWdlKCktPnNldHRpbmdzKCkt PmFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKCkpIHsKKyAgICAgICAgaWYgKHNob3VsZFVz ZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmcoKSkgewogICAgICAgICAgICAgbV9wbGF0Zm9ybUxheWVy ID0gYWRvcHRQdHIobmV3IFBsdWdpbkdyYXBoaWNzTGF5ZXJRdCh0aGlzKSk7CiAgICAgICAgICAg ICAvLyBUcmlnZ2VyIGxheWVyIGNvbXB1dGF0aW9uIGluIFJlbmRlckxheWVyQ29tcG9zaXRvcgog ICAgICAgICAgICAgbV9lbGVtZW50LT5zZXROZWVkc1N0eWxlUmVjYWxjKFN5bnRoZXRpY1N0eWxl Q2hhbmdlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvc3ltYmlhbi9QbHVn aW5WaWV3U3ltYmlhbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL3N5bWJpYW4vUGx1Z2lu Vmlld1N5bWJpYW4uY3BwCmluZGV4IDgxMTA2MDUuLjVjMGU5YzAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsdWdpbnMvc3ltYmlhbi9QbHVnaW5WaWV3U3ltYmlhbi5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGx1Z2lucy9zeW1iaWFuL1BsdWdpblZpZXdTeW1iaWFuLmNwcApAQCAtMjAs NiArMjAsOCBAQAogI2luY2x1ZGUgIlBsdWdpblZpZXcuaCIKIAogI2luY2x1ZGUgIkJyaWRnZUpT Qy5oIgorI2luY2x1ZGUgIkNocm9tZS5oIgorI2luY2x1ZGUgIkNocm9tZUNsaWVudC5oIgogI2lu Y2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRG9jdW1lbnRMb2FkZXIuaCIKICNpbmNsdWRl ICJFbGVtZW50LmgiCkBAIC01OSw2ICs2MSw3IEBACiAjaW5jbHVkZSA8UUtleUV2ZW50PgogI2lu Y2x1ZGUgPFFQaXhtYXA+CiAjaW5jbHVkZSA8UVJlZ2lvbj4KKyNpbmNsdWRlIDxRU3R5bGVPcHRp b25HcmFwaGljc0l0ZW0+CiAjaW5jbHVkZSA8UVZlY3Rvcj4KICNpbmNsdWRlIDxRV2lkZ2V0Pgog I2luY2x1ZGUgPHJ1bnRpbWUvSlNMb2NrLmg+CkBAIC04NSw2ICs4OCw0OSBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CiAKKyNpZiBVU0UoQUNDRUxF UkFURURfQ09NUE9TSVRJTkcpCitjbGFzcyBQbHVnaW5HcmFwaGljc0xheWVyUXQgOiBwdWJsaWMg UUdyYXBoaWNzV2lkZ2V0IHsKK3B1YmxpYzoKKyAgICBQbHVnaW5HcmFwaGljc0xheWVyUXQoUGx1 Z2luVmlldyogdmlldykgOiBtX3ZpZXcodmlldykKKyAgICB7CisgICAgICAgIHNldEZsYWcoUUdy YXBoaWNzSXRlbTo6SXRlbVVzZXNFeHRlbmRlZFN0eWxlT3B0aW9uLCB0cnVlKTsKKyAgICB9CisK KyAgICB+UGx1Z2luR3JhcGhpY3NMYXllclF0KCkgeyB9CisKKyAgICB2b2lkIHBhaW50KFFQYWlu dGVyKiBwYWludGVyLCBjb25zdCBRU3R5bGVPcHRpb25HcmFwaGljc0l0ZW0qIG9wdGlvbiwgUVdp ZGdldCogd2lkZ2V0ID0gMCkKKyAgICB7CisgICAgICAgIFFfVU5VU0VEKHdpZGdldCk7CisKKyAg ICAgICAgbV92aWV3LT5tX25wV2luZG93LndzX2luZm8gPSAodm9pZCopKHBhaW50ZXIpOworICAg ICAgICBtX3ZpZXctPnNldE5QV2luZG93SWZOZWVkZWQoKTsKKworICAgICAgICBwYWludGVyLT5z YXZlKCk7CisgICAgICAgIFFSZWN0RiBjbGlwUmVjdChRUG9pbnRGKDAsIDApLCBRU2l6ZUYobV92 aWV3LT5mcmFtZVJlY3QoKS5zaXplKCkpKTsKKyAgICAgICAgaWYgKG9wdGlvbiAmJiAhb3B0aW9u LT5leHBvc2VkUmVjdC5pc0VtcHR5KCkpCisgICAgICAgICAgICBjbGlwUmVjdCAmPSBvcHRpb24t PmV4cG9zZWRSZWN0OworICAgICAgICBwYWludGVyLT5zZXRDbGlwUmVjdChjbGlwUmVjdCk7CisK KyAgICAgICAgUVJlY3QgcmVjdCA9IGNsaXBSZWN0LnRvUmVjdCgpOworICAgICAgICBRUGFpbnRF dmVudCBldihyZWN0KTsKKyAgICAgICAgUUV2ZW50JiBucEV2ZW50ID0gZXY7CisgICAgICAgIG1f dmlldy0+ZGlzcGF0Y2hOUEV2ZW50KG5wRXZlbnQpOworCisgICAgICAgIHBhaW50ZXItPnJlc3Rv cmUoKTsKKyAgICB9CisKK3ByaXZhdGU6CisgICAgUGx1Z2luVmlldyogbV92aWV3OworfTsKKwor Ym9vbCBQbHVnaW5WaWV3OjpzaG91bGRVc2VBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCkgY29uc3QK K3sKKyAgICByZXR1cm4gbV9wYXJlbnRGcmFtZS0+cGFnZSgpLT5jaHJvbWUoKS0+Y2xpZW50KCkt PmFsbG93c0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcoKQorICAgICAgICAgICAmJiBtX3BhcmVudEZy YW1lLT5wYWdlKCktPnNldHRpbmdzKCkKKyAgICAgICAgICAgJiYgbV9wYXJlbnRGcmFtZS0+cGFn ZSgpLT5zZXR0aW5ncygpLT5hY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCgpOworfQorI2Vu ZGlmCisKIHZvaWQgUGx1Z2luVmlldzo6dXBkYXRlUGx1Z2luV2lkZ2V0KCkKIHsKICAgICBpZiAo IXBhcmVudCgpKQpAQCAtMTQ4LDYgKzE5NCwxMSBAQCB2b2lkIFBsdWdpblZpZXc6OnBhaW50KEdy YXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgcmVjdCkKICAgICBpZiAobV9p c1dpbmRvd2VkKQogICAgICAgICByZXR1cm47CiAKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9T SVRJTkcpCisgICAgaWYgKG1fcGxhdGZvcm1MYXllcikKKyAgICAgICAgcmV0dXJuOworI2VuZGlm CisKICAgICBjb250ZXh0LT5zYXZlKCk7CiAgICAgSW50UmVjdCBjbGlwUmVjdChyZWN0KTsKICAg ICBjbGlwUmVjdC5pbnRlcnNlY3QoZnJhbWVSZWN0KCkpOwpAQCAtMzQ0LDYgKzM5NSwxMyBAQCBi b29sIFBsdWdpblZpZXc6OnBsYXRmb3JtR2V0VmFsdWUoTlBOVmFyaWFibGUsIHZvaWQqLCBOUEVy cm9yKikKIAogdm9pZCBQbHVnaW5WaWV3OjppbnZhbGlkYXRlUmVjdChjb25zdCBJbnRSZWN0JiBy ZWN0KQogeworI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykgJiYgIVVTRShURVhUVVJF X01BUFBFUikKKyAgICBpZiAobV9wbGF0Zm9ybUxheWVyKSB7CisgICAgICAgIG1fcGxhdGZvcm1M YXllci0+dXBkYXRlKFFSZWN0RihyZWN0KSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisjZW5k aWYKKwogICAgIGlmIChtX2lzV2luZG93ZWQpIHsKICAgICAgICAgcGxhdGZvcm1XaWRnZXQoKS0+ dXBkYXRlKHJlY3QpOwogICAgICAgICByZXR1cm47CkBAIC00MTUsNiArNDczLDEyIEBAIGJvb2wg UGx1Z2luVmlldzo6cGxhdGZvcm1TdGFydCgpCiAgICAgICAgIHNldFBsYXRmb3JtV2lkZ2V0KDAp OwogICAgICAgICBtX25wV2luZG93LnR5cGUgPSBOUFdpbmRvd1R5cGVEcmF3YWJsZTsKICAgICAg ICAgbV9ucFdpbmRvdy53aW5kb3cgPSAwOyAvLyBOb3QgdXNlZD8KKyNpZiBVU0UoQUNDRUxFUkFU RURfQ09NUE9TSVRJTkcpICYmICFVU0UoVEVYVFVSRV9NQVBQRVIpCisgICAgICAgIGlmIChzaG91 bGRVc2VBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCkpIHsKKyAgICAgICAgICAgIG1fcGxhdGZvcm1M YXllciA9IG5ldyBQbHVnaW5HcmFwaGljc0xheWVyUXQodGhpcyk7CisgICAgICAgICAgICBtX2Vs ZW1lbnQtPnNldE5lZWRzU3R5bGVSZWNhbGMoU3ludGhldGljU3R5bGVDaGFuZ2UpOworICAgICAg ICB9CisjZW5kaWYKICAgICB9ICAgIAogICAgIHVwZGF0ZVBsdWdpbldpZGdldCgpOwogICAgIHNl dE5QV2luZG93SWZOZWVkZWQoKTsKQEAgLTQ0NCw0ICs1MDgsMTEgQEAgdm9pZCBQbHVnaW5WaWV3 OjpyZXN0YXJ0KCkKIHsKIH0KIAorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKK1Bs YXRmb3JtTGF5ZXIqIFBsdWdpblZpZXc6OnBsYXRmb3JtTGF5ZXIoKSBjb25zdAoreworICAgIHJl dHVybiBtX3BsYXRmb3JtTGF5ZXIuZ2V0KCk7Cit9CisjZW5kaWYKKwogfSAvLyBuYW1lc3BhY2Ug V2ViQ29yZQo=