113853 2013-04-03 01:13:06 -0700 [Qt] Add API in QWebSettings for setting the CSS media type 2013-04-10 08:08:42 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 jose.lejin webkit-unassigned allan.jensen ararunprasad arurajku commit-queue hausmann jturcotte menard webkit.review.bot oldest_to_newest 868509 0 jose.lejin 2013-04-03 01:13:06 -0700 API needed in QWebSettings for setting the CSS media type. Refer http://www.w3schools.com/tags/att_style_media.asp WebKit should know in what media type it is running(tv/screen/ handheld/projection/print etc.) to automatically behave. WebCore has the method(refer Settings.h) to change the media type, which can be exposed in Qt WebKit API. 868510 1 196296 jose.lejin 2013-04-03 01:14:16 -0700 Created attachment 196296 Test App 869054 2 196453 jose.lejin 2013-04-04 01:34:18 -0700 Created attachment 196453 Patch 869056 3 webkit.review.bot 2013-04-04 01:37:12 -0700 Attachment 196453 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/qt/Api/qwebsettings.cpp', u'Source/WebKit/qt/Api/qwebsettings.h', u'Source/WebKit/qt/ChangeLog']" exit_code: 1 Source/WebKit/qt/Api/qwebsettings.h:167: The parameter name "mediaType" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 869062 4 196455 jose.lejin 2013-04-04 01:58:10 -0700 Created attachment 196455 Patch 869063 5 jose.lejin 2013-04-04 01:59:15 -0700 (In reply to comment #4) > Created an attachment (id=196455) [details] > Patch In this corrected style check error. 869511 6 196455 buildbot 2013-04-04 19:24:50 -0700 Comment on attachment 196455 Patch Attachment 196455 did not pass win-ews (win): Output: http://webkit-commit-queue.appspot.com/results/17522053 870695 7 196455 jturcotte 2013-04-08 02:51:52 -0700 Comment on attachment 196455 Patch Did you test this well? By reading the code it seems like this only applies to the current FrameView (which is only used for the currently navigated page). If you click a link to navigate to a second page, it feels like this setting won't be applied unless you call setMediaTypeOverride again. A safer way to implement this would be to do like setMediaStyle is implemented in Source/WebKit/mac/WebView/WebView.mm. It could still live in QWebSettings, but instead of forwarding the value to WebCore::Settings, it would be fetched by our implementation of FrameLoaderClientQt::overrideMediaType in Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp. 870706 8 jose.lejin 2013-04-08 04:12:35 -0700 (In reply to comment #7) > (From update of attachment 196455 [details]) > Did you test this well? > By reading the code it seems like this only applies to the current FrameView (which is only used for the currently navigated page). > If you click a link to navigate to a second page, it feels like this setting won't be applied unless you call setMediaTypeOverride again. > > A safer way to implement this would be to do like setMediaStyle is implemented in Source/WebKit/mac/WebView/WebView.mm. > It could still live in QWebSettings, but instead of forwarding the value to WebCore::Settings, it would be fetched by our implementation of FrameLoaderClientQt::overrideMediaType in Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp. Thanks for the comment. You are right ! It will work for current frame view only. String FrameView::mediaType() const { // See if we have an override type. String overrideType = m_frame->loader()->client()->overrideMediaType(); InspectorInstrumentation::applyEmulatedMedia(m_frame.get(), &overrideType); if (!overrideType.isNull()) return overrideType; return m_mediaType; } Since overrideType is coming null, for next frameview "screen" default value set in m_mediaType is taken. But is this _intentionally_ done ? Example is I am browsing a page in "screen" type and I want to print that page. In browser I will set that to "print" type. When I transition to next page I assume same "screen" type behavior instead "print" css type. If we get type from FrameLoaderClientQt::overrideMediaType(), next page also will be in "print" css mode. Then it will become opposite to WebCore::Settings behavior. Please suggest ! (If application want to retain this css media type, they can do it in page transition by setting again as per need.) 870708 9 jturcotte 2013-04-08 04:56:17 -0700 (In reply to comment #8) "print" is already handled by QtWebKit since it can know better when it is getting printed than the application can itself. Also, the media type is then not confined to the scope of a navigated page, but rather in the scope of a layout done in preparation to render in a printing QPainter. So let's assume that this feature only applies to handheld, projector, tv, etc. media styles. I think that in this case, the media type won't change between navigations, and requiring the application to reset it on every page load would be a very cumbersome API. 870713 10 jose.lejin 2013-04-08 05:22:37 -0700 (In reply to comment #9) > (In reply to comment #8) > "print" is already handled by QtWebKit since it can know better when it is getting printed than the application can itself. Also, the media type is then not confined to the scope of a navigated page, but rather in the scope of a layout done in preparation to render in a printing QPainter. > > So let's assume that this feature only applies to handheld, projector, tv, etc. media styles. > I think that in this case, the media type won't change between navigations, and requiring the application to reset it on every page load would be a very cumbersome API. OK. We will return current media type set in FrameLoaderClientQt::overrideMediaType() by reading from WebCore::Settings. The value need to be set in Settings::setMediaTypeOverride(const String& mediaTypeOverride) since recalc style automatically happens if user changes style after page loads also. I will upload the new patch. 870716 11 196845 jose.lejin 2013-04-08 05:43:23 -0700 Created attachment 196845 Patch Updated as per comments 870758 12 196845 jturcotte 2013-04-08 06:46:18 -0700 Comment on attachment 196845 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=196845&action=review > Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp:1568 > + mediaType = m_frame->settings()->mediaTypeOverride(); Please don't do that, have a separate boolean in QWebSettingsPrivate. WebCore::Settings::mediaTypeOverride() seems to be used by testing code and this would be mixing layers that are not designed in that way. This also needs to work with QWebSettings::globalSettings(), which wouldn't in this case. Also, please add tests for this feature in Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp 870761 13 jturcotte 2013-04-08 06:46:53 -0700 (In reply to comment #12) > Please don't do that, have a separate boolean in QWebSettingsPrivate. I meant a separate QString, sorry. 871463 14 196999 jose.lejin 2013-04-08 22:47:48 -0700 Created attachment 196999 Patch Updated patch 871530 15 196999 jturcotte 2013-04-09 00:49:06 -0700 Comment on attachment 196999 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=196999&action=review This is starting to look pretty clean, but as stated in Comment #12, we needs a test for this in Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp. Testing this setting both thouth a non-global and through globalSettings() would be great. > Source/WebKit/qt/ChangeLog:3 > + Add API in QWebSettings for setting the CSS media type For Qt specific bugs, we add the "[Qt] " prefix in front of our changelog headlines. > Source/WebKit/qt/Api/qwebsettings.cpp:938 > + Sets the CSS media type. Please provide enough documentation for people to understand how this feature work. The documentation could match the one for mediaStyle and setMediaStyle in Source/WebKit/mac/WebView/WebView.h. Specifically, it should state that setting this to a null QString will revert to the default one, and that cssMediaType will only return the value set through setCSSMediaType and not the one used internally. > Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp:1572 > + // If type is null try to get value from QWebSettings::globalSettings() > + if (type.isNull()) > + type = QWebSettings::globalSettings()->cssMediaType(); This case should already be handled by your code in QWebSettings::apply(). If not, something is wrong. 871548 16 jose.lejin 2013-04-09 02:07:26 -0700 (In reply to comment #15) > (From update of attachment 196999 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=196999&action=review > > This is starting to look pretty clean, but as stated in Comment #12, we needs a test for this in Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp. Testing this setting both thouth a non-global and through globalSettings() would be great. > > > Source/WebKit/qt/ChangeLog:3 > > + Add API in QWebSettings for setting the CSS media type > > For Qt specific bugs, we add the "[Qt] " prefix in front of our changelog headlines. > > > Source/WebKit/qt/Api/qwebsettings.cpp:938 > > + Sets the CSS media type. > > Please provide enough documentation for people to understand how this feature work. > The documentation could match the one for mediaStyle and setMediaStyle in Source/WebKit/mac/WebView/WebView.h. > > Specifically, it should state that setting this to a null QString will revert to the default one, and that cssMediaType will only return the value set through setCSSMediaType and not the one used internally. > > > Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp:1572 > > + // If type is null try to get value from QWebSettings::globalSettings() > > + if (type.isNull()) > > + type = QWebSettings::globalSettings()->cssMediaType(); > > This case should already be handled by your code in QWebSettings::apply(). If not, something is wrong. Thanks for review. I will add needed test cases and documentation. Yes.. QWebSettings::apply() is taking care of returning proper media type set by globalSettings. I will remove this in patch. 871551 17 jturcotte 2013-04-09 02:11:33 -0700 Simon, Allan: Please tell if you see anything wrong with this added API. 871956 18 197145 jose.lejin 2013-04-09 10:54:19 -0700 Created attachment 197145 Patch Updated patch with test cases and documentation 872673 19 197145 jturcotte 2013-04-10 02:30:49 -0700 Comment on attachment 197145 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=197145&action=review A few minor issues: > Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp:1571 > + String type; > + if (m_webFrame && m_webFrame->pageAdapter && m_webFrame->pageAdapter->settings) > + type = m_webFrame->pageAdapter->settings->cssMediaType(); > + > + return type; To follow a bit more the style in the rest of the file: if (...) return ...->cssMediaType(); return String(); > Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:3296 > + page = new TestPage(); Try to use the existing m_page member like other tests do, you should be able to use the same page for all chunks. If that helps, you can separate the global and per-page setting in two different tests. > Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:3298 > + QTest::qWait(500); QVERIFY(::waitForSignal(m_view, SIGNAL(loadFinished(bool)))); 872679 20 jose.lejin 2013-04-10 02:47:35 -0700 (In reply to comment #19) > (From update of attachment 197145 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=197145&action=review > > A few minor issues: > > > Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp:1571 > > + String type; > > + if (m_webFrame && m_webFrame->pageAdapter && m_webFrame->pageAdapter->settings) > > + type = m_webFrame->pageAdapter->settings->cssMediaType(); > > + > > + return type; > > To follow a bit more the style in the rest of the file: > > if (...) > return ...->cssMediaType(); > return String(); > When I uploaded first patch style checker showed error on multiple return with webkit-patch upload script. I will correct this. > > Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:3296 > > + page = new TestPage(); > > Try to use the existing m_page member like other tests do, you should be able to use the same page for all chunks. > If that helps, you can separate the global and per-page setting in two different tests. > > > Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:3298 > > + QTest::qWait(500); > > QVERIFY(::waitForSignal(m_view, SIGNAL(loadFinished(bool)))); I will update test cases as per comments. 872726 21 197249 jose.lejin 2013-04-10 05:14:20 -0700 Created attachment 197249 Patch Updated patch 872728 22 jose.lejin 2013-04-10 05:17:09 -0700 (In reply to comment #19) > > > Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:3298 > > + QTest::qWait(500); > > QVERIFY(::waitForSignal(m_view, SIGNAL(loadFinished(bool)))); QVERIFY(::waitForSignal(m_view, SIGNAL(loadFinished(bool)))) fails since html content is too small and loads immediately on m_view->setHtml itself. So using QSignalSpy loadSpy(m_view, SIGNAL(loadFinished(bool))) 872732 23 197249 jturcotte 2013-04-10 05:47:11 -0700 Comment on attachment 197249 Patch Looks good to me! Please click on "Details" on the attachment and also set the cq flag to "?" when you're ready for this patch to land. 872780 24 197249 jturcotte 2013-04-10 07:22:21 -0700 Comment on attachment 197249 Patch cq requested by arunprasadr on IRC 872795 25 197249 commit-queue 2013-04-10 08:08:38 -0700 Comment on attachment 197249 Patch Clearing flags on attachment: 197249 Committed r148095: <http://trac.webkit.org/changeset/148095> 872796 26 commit-queue 2013-04-10 08:08:42 -0700 All reviewed patches have been landed. Closing bug. 196296 2013-04-03 01:14:16 -0700 2013-04-03 01:14:16 -0700 Test App Media_Style.html text/html 558 jose.lejin PEhUTUw+DQoNCjxIRUFEPg0KDQo8U1RZTEUgVHlwZT0gInRleHQvY3NzIj4NCglAbWVkaWEgdHYg ew0KCWJvZHl7CQ0KCQlmb250LXNpemU6MTg7DQoJCWNvbG9yOndoaXRlOw0KCQlmb250LWZhbWls eTpBcmlhbDsgDQoJCWJhY2tncm91bmQtY29sb3I6Z3JlZW47IC8qc2t5IGJsdWUgKi8NCgl9DQp9 DQoNCkBtZWRpYSBzY3JlZW4gew0KCWJvZHkgew0KCQkJZm9udC1zaXplOjIwOw0KCQkJY29sb3I6 eWVsbG93Ow0KCQkJZm9udC1mYW1pbHk6QXJpYWw7IA0KCQkJYmFja2dyb3VuZC1jb2xvcjpibHVl Ow0KCX0NCn0NCjwvU1RZTEU+DQo8L0hFQUQ+DQoNCjxCT0RZIGJnY29sb3I9IiMyODI4MjgiIHRl eHQ9Im9yYW5nZSI+DQoNCjxoMT4gMS4zLjExLiBDU1MgTWVkaWEgPC9oMT4NCg0KPGRpdj4NClRo aXMgcGFnZSB3aWxsIHRlc3QgdGhlIG1lZGlhIHN0eWxlLiAgPGJyPg0KDQpUaGUgYmFja2dyb3Vu ZC1jb2xvciB3aWxsIGJlIGJsdWUgb24gUEMuPGJyPg0KDQpUaGUgYmFja2dyb3VuZC1jb2xvciB3 aWxsIGJlIGdyZWVuIG9uIFRWLg0KPC9kaXY+DQo8L0JPRFk+DQo8L0hUTUw+ 196453 2013-04-04 01:34:18 -0700 2013-04-04 01:58:03 -0700 Patch bug-113853-20130404135806.patch text/plain 2090 jose.lejin SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNDc2MTQpCisrKyBTb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEzLTA0LTA0ICBK b3NlIExlamluIFBKICA8am9zZS5sZWppbkBnbWFpbC5jb20+CisKKyAgICAgICAgQWRkIEFQSSBp biBRV2ViU2V0dGluZ3MgZm9yIHNldHRpbmcgdGhlIENTUyBtZWRpYSB0eXBlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTM4NTMKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEFwaS9xd2Vic2V0dGluZ3Mu Y3BwOgorICAgICAgICAoUVdlYlNldHRpbmdzOjpzZXRDU1NNZWRpYVR5cGUpOgorICAgICAgICAo UVdlYlNldHRpbmdzOjpjc3NNZWRpYVR5cGUpOgorICAgICAgICAqIEFwaS9xd2Vic2V0dGluZ3Mu aDoKKwogMjAxMy0wMy0yOCAgSmVzdXMgU2FuY2hlei1QYWxlbmNpYSAgPGplc3VzLnBhbGVuY2lh QG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgW1F0XSBTd2l0Y2ggQ29udGV4dE1lbnUgaW1wbGVt ZW50YXRpb24gdG8gQ1JPU1NfUExBVEZPUk1fQ09OVEVYVF9NRU5VCkluZGV4OiBTb3VyY2UvV2Vi S2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv cXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAJKHJldmlzaW9uIDE0NzYxMikKKysrIFNvdXJjZS9XZWJL aXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTkzMSw2ICs5MzEs MjYgQEAgUVdlYlNldHRpbmdzOjpUaGlyZFBhcnR5Q29va2llUG9saWN5IFFXZQogfQogCiAvKiEK KyAgICBTZXRzIHRoZSBDU1MgbWVkaWEgdHlwZS4KKyovCit2b2lkIFFXZWJTZXR0aW5nczo6c2V0 Q1NTTWVkaWFUeXBlKGNvbnN0IFFTdHJpbmcmIG1lZGlhVHlwZSkKK3sKKyAgICBpZiAoZC0+c2V0 dGluZ3MpCisgICAgICAgIGQtPnNldHRpbmdzLT5zZXRNZWRpYVR5cGVPdmVycmlkZShtZWRpYVR5 cGUpOworfQorCisvKiEKKyAgICBSZXR1cm5zIHRoZSBjdXJyZW50IENTUyBtZWRpYSB0eXBlLgor Ki8KK1FTdHJpbmcgUVdlYlNldHRpbmdzOjpjc3NNZWRpYVR5cGUoKSBjb25zdAoreworICAgIFFT dHJpbmcgbWVkaWFUeXBlOworICAgIGlmIChkLT5zZXR0aW5ncykKKyAgICAgICAgbWVkaWFUeXBl ID0gZC0+c2V0dGluZ3MtPm1lZGlhVHlwZU92ZXJyaWRlKCk7CisgICAgcmV0dXJuIG1lZGlhVHlw ZTsKK30KKworLyohCiAgICAgU2V0cyB0aGUgYWN0dWFsIGZvbnQgZmFtaWx5IHRvIFxhIGZhbWls eSBmb3IgdGhlIHNwZWNpZmllZCBnZW5lcmljIGZhbWlseSwKICAgICBcYSB3aGljaC4KICovCklu ZGV4OiBTb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuaAkocmV2aXNpb24gMTQ3NjEyKQorKysg U291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmgJKHdvcmtpbmcgY29weSkKQEAgLTE2 NCw2ICsxNjQsOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRUaGlyZFBhcnR5Q29va2llUG9saWN5 KFRoaXJkUGFydHlDb29raWVQb2xpY3kpOwogICAgIFFXZWJTZXR0aW5nczo6VGhpcmRQYXJ0eUNv b2tpZVBvbGljeSB0aGlyZFBhcnR5Q29va2llUG9saWN5KCkgY29uc3Q7CiAKKyAgICB2b2lkIHNl dENTU01lZGlhVHlwZShjb25zdCBRU3RyaW5nJiBtZWRpYVR5cGUpOworICAgIFFTdHJpbmcgY3Nz TWVkaWFUeXBlKCkgY29uc3Q7CisKICAgICBpbmxpbmUgUVdlYlNldHRpbmdzUHJpdmF0ZSogaGFu ZGxlKCkgY29uc3QgeyByZXR1cm4gZDsgfQogCiBwcml2YXRlOgo= 196455 2013-04-04 01:58:10 -0700 2013-04-08 05:43:15 -0700 Patch bug-113853-20130404142157.patch text/plain 2080 jose.lejin SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNDc2MTQpCisrKyBTb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEzLTA0LTA0ICBK b3NlIExlamluIFBKICA8am9zZS5sZWppbkBnbWFpbC5jb20+CisKKyAgICAgICAgQWRkIEFQSSBp biBRV2ViU2V0dGluZ3MgZm9yIHNldHRpbmcgdGhlIENTUyBtZWRpYSB0eXBlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTM4NTMKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEFwaS9xd2Vic2V0dGluZ3Mu Y3BwOgorICAgICAgICAoUVdlYlNldHRpbmdzOjpzZXRDU1NNZWRpYVR5cGUpOgorICAgICAgICAo UVdlYlNldHRpbmdzOjpjc3NNZWRpYVR5cGUpOgorICAgICAgICAqIEFwaS9xd2Vic2V0dGluZ3Mu aDoKKwogMjAxMy0wMy0yOCAgSmVzdXMgU2FuY2hlei1QYWxlbmNpYSAgPGplc3VzLnBhbGVuY2lh QG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgW1F0XSBTd2l0Y2ggQ29udGV4dE1lbnUgaW1wbGVt ZW50YXRpb24gdG8gQ1JPU1NfUExBVEZPUk1fQ09OVEVYVF9NRU5VCkluZGV4OiBTb3VyY2UvV2Vi S2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv cXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAJKHJldmlzaW9uIDE0NzYxMikKKysrIFNvdXJjZS9XZWJL aXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTkzMSw2ICs5MzEs MjYgQEAgUVdlYlNldHRpbmdzOjpUaGlyZFBhcnR5Q29va2llUG9saWN5IFFXZQogfQogCiAvKiEK KyAgICBTZXRzIHRoZSBDU1MgbWVkaWEgdHlwZS4KKyovCit2b2lkIFFXZWJTZXR0aW5nczo6c2V0 Q1NTTWVkaWFUeXBlKGNvbnN0IFFTdHJpbmcmIG1lZGlhVHlwZSkKK3sKKyAgICBpZiAoZC0+c2V0 dGluZ3MpCisgICAgICAgIGQtPnNldHRpbmdzLT5zZXRNZWRpYVR5cGVPdmVycmlkZShtZWRpYVR5 cGUpOworfQorCisvKiEKKyAgICBSZXR1cm5zIHRoZSBjdXJyZW50IENTUyBtZWRpYSB0eXBlLgor Ki8KK1FTdHJpbmcgUVdlYlNldHRpbmdzOjpjc3NNZWRpYVR5cGUoKSBjb25zdAoreworICAgIFFT dHJpbmcgbWVkaWFUeXBlOworICAgIGlmIChkLT5zZXR0aW5ncykKKyAgICAgICAgbWVkaWFUeXBl ID0gZC0+c2V0dGluZ3MtPm1lZGlhVHlwZU92ZXJyaWRlKCk7CisgICAgcmV0dXJuIG1lZGlhVHlw ZTsKK30KKworLyohCiAgICAgU2V0cyB0aGUgYWN0dWFsIGZvbnQgZmFtaWx5IHRvIFxhIGZhbWls eSBmb3IgdGhlIHNwZWNpZmllZCBnZW5lcmljIGZhbWlseSwKICAgICBcYSB3aGljaC4KICovCklu ZGV4OiBTb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuaAkocmV2aXNpb24gMTQ3NjEyKQorKysg U291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmgJKHdvcmtpbmcgY29weSkKQEAgLTE2 NCw2ICsxNjQsOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRUaGlyZFBhcnR5Q29va2llUG9saWN5 KFRoaXJkUGFydHlDb29raWVQb2xpY3kpOwogICAgIFFXZWJTZXR0aW5nczo6VGhpcmRQYXJ0eUNv b2tpZVBvbGljeSB0aGlyZFBhcnR5Q29va2llUG9saWN5KCkgY29uc3Q7CiAKKyAgICB2b2lkIHNl dENTU01lZGlhVHlwZShjb25zdCBRU3RyaW5nJik7CisgICAgUVN0cmluZyBjc3NNZWRpYVR5cGUo KSBjb25zdDsKKwogICAgIGlubGluZSBRV2ViU2V0dGluZ3NQcml2YXRlKiBoYW5kbGUoKSBjb25z dCB7IHJldHVybiBkOyB9CiAKIHByaXZhdGU6Cg== 196845 2013-04-08 05:43:23 -0700 2013-04-08 22:47:41 -0700 Patch bug-113853-20130408180655.patch text/plain 2779 jose.lejin SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNDc5MDkpCisrKyBTb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEzLTA0LTA4ICBK b3NlIExlamluIFBKICA8am9zZS5sZWppbkBnbWFpbC5jb20+CisKKyAgICAgICAgQWRkIEFQSSBp biBRV2ViU2V0dGluZ3MgZm9yIHNldHRpbmcgdGhlIENTUyBtZWRpYSB0eXBlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTM4NTMKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEFwaS9xd2Vic2V0dGluZ3Mu Y3BwOgorICAgICAgICAoUVdlYlNldHRpbmdzOjpzZXRDU1NNZWRpYVR5cGUpOgorICAgICAgICAo UVdlYlNldHRpbmdzOjpjc3NNZWRpYVR5cGUpOgorICAgICAgICAqIEFwaS9xd2Vic2V0dGluZ3Mu aDoKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6Om92ZXJyaWRlTWVkaWFUeXBlKToK KwogMjAxMy0wNC0wNSAgR2VvZmZyZXkgR2FyZW4gIDxnZ2FyZW5AYXBwbGUuY29tPgogCiAgICAg ICAgIE1hZGUgVVNFKEpTQykgdW5jb25kaXRpb25hbApJbmRleDogU291cmNlL1dlYktpdC9xdC9B cGkvcXdlYnNldHRpbmdzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3F0L0FwaS9x d2Vic2V0dGluZ3MuY3BwCShyZXZpc2lvbiAxNDc2MTIpCisrKyBTb3VyY2UvV2ViS2l0L3F0L0Fw aS9xd2Vic2V0dGluZ3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05MzEsNiArOTMxLDI2IEBAIFFX ZWJTZXR0aW5nczo6VGhpcmRQYXJ0eUNvb2tpZVBvbGljeSBRV2UKIH0KIAogLyohCisgICAgU2V0 cyB0aGUgQ1NTIG1lZGlhIHR5cGUuCisqLwordm9pZCBRV2ViU2V0dGluZ3M6OnNldENTU01lZGlh VHlwZShjb25zdCBRU3RyaW5nJiBtZWRpYVR5cGUpCit7CisgICAgaWYgKGQtPnNldHRpbmdzKQor ICAgICAgICBkLT5zZXR0aW5ncy0+c2V0TWVkaWFUeXBlT3ZlcnJpZGUobWVkaWFUeXBlKTsKK30K KworLyohCisgICAgUmV0dXJucyB0aGUgY3VycmVudCBDU1MgbWVkaWEgdHlwZS4KKyovCitRU3Ry aW5nIFFXZWJTZXR0aW5nczo6Y3NzTWVkaWFUeXBlKCkgY29uc3QKK3sKKyAgICBRU3RyaW5nIG1l ZGlhVHlwZTsKKyAgICBpZiAoZC0+c2V0dGluZ3MpCisgICAgICAgIG1lZGlhVHlwZSA9IGQtPnNl dHRpbmdzLT5tZWRpYVR5cGVPdmVycmlkZSgpOworICAgIHJldHVybiBtZWRpYVR5cGU7Cit9CisK Ky8qIQogICAgIFNldHMgdGhlIGFjdHVhbCBmb250IGZhbWlseSB0byBcYSBmYW1pbHkgZm9yIHRo ZSBzcGVjaWZpZWQgZ2VuZXJpYyBmYW1pbHksCiAgICAgXGEgd2hpY2guCiAqLwpJbmRleDogU291 cmNlL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmgJKHJldmlzaW9uIDE0NzYxMikKKysrIFNvdXJjZS9X ZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNjQsNiArMTY0 LDkgQEAgcHVibGljOgogICAgIHZvaWQgc2V0VGhpcmRQYXJ0eUNvb2tpZVBvbGljeShUaGlyZFBh cnR5Q29va2llUG9saWN5KTsKICAgICBRV2ViU2V0dGluZ3M6OlRoaXJkUGFydHlDb29raWVQb2xp Y3kgdGhpcmRQYXJ0eUNvb2tpZVBvbGljeSgpIGNvbnN0OwogCisgICAgdm9pZCBzZXRDU1NNZWRp YVR5cGUoY29uc3QgUVN0cmluZyYpOworICAgIFFTdHJpbmcgY3NzTWVkaWFUeXBlKCkgY29uc3Q7 CisKICAgICBpbmxpbmUgUVdlYlNldHRpbmdzUHJpdmF0ZSogaGFuZGxlKCkgY29uc3QgeyByZXR1 cm4gZDsgfQogCiBwcml2YXRlOgpJbmRleDogU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9y dC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3F0 L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCShyZXZpc2lvbiAxNDc2MTIp CisrKyBTb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTYzLDcgKzE1NjMsMTAgQEAgUGFzc1JlZlB0cjxXaWRn ZXQ+IEZyYW1lTG9hZGVyQ2xpZW50UXQ6OgogCiBTdHJpbmcgRnJhbWVMb2FkZXJDbGllbnRRdDo6 b3ZlcnJpZGVNZWRpYVR5cGUoKSBjb25zdAogewotICAgIHJldHVybiBTdHJpbmcoKTsKKyAgICBT dHJpbmcgbWVkaWFUeXBlOworICAgIGlmIChtX2ZyYW1lICYmIG1fZnJhbWUtPnNldHRpbmdzKCkp CisgICAgICAgIG1lZGlhVHlwZSA9IG1fZnJhbWUtPnNldHRpbmdzKCktPm1lZGlhVHlwZU92ZXJy aWRlKCk7CisgICAgcmV0dXJuIG1lZGlhVHlwZTsKIH0KIAogUVN0cmluZyBGcmFtZUxvYWRlckNs aWVudFF0OjpjaG9vc2VGaWxlKGNvbnN0IFFTdHJpbmcmIG9sZEZpbGUpCg== 196999 2013-04-08 22:47:48 -0700 2013-04-09 10:54:12 -0700 Patch bug-113853-20130409111118.patch text/plain 3930 jose.lejin SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNDc5ODEpCisrKyBTb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEzLTA0LTA4ICBK b3NlIExlamluIFBKICA8am9zZS5sZWppbkBnbWFpbC5jb20+CisKKyAgICAgICAgQWRkIEFQSSBp biBRV2ViU2V0dGluZ3MgZm9yIHNldHRpbmcgdGhlIENTUyBtZWRpYSB0eXBlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTM4NTMKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEFwaS9xd2Vic2V0dGluZ3Mu Y3BwOgorICAgICAgICAoUVdlYlNldHRpbmdzUHJpdmF0ZSk6CisgICAgICAgIChRV2ViU2V0dGlu Z3NQcml2YXRlOjphcHBseSk6CisgICAgICAgIChRV2ViU2V0dGluZ3M6OnNldENTU01lZGlhVHlw ZSk6CisgICAgICAgIChRV2ViU2V0dGluZ3M6OmNzc01lZGlhVHlwZSk6CisgICAgICAgICogQXBp L3F3ZWJzZXR0aW5ncy5oOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp ZW50UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRRdDo6b3ZlcnJp ZGVNZWRpYVR5cGUpOgorCiAyMDEzLTA0LTA4ICBCZW5qYW1pbiBQb3VsYWluICA8YmVuamFtaW5A d2Via2l0Lm9yZz4KIAogICAgICAgICBSZW1vdmUgSFRNTCBOb3RpZmljYXRpb24KSW5kZXg6IFNv dXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcAkocmV2aXNpb24gMTQ3NjEyKQorKysgU291 cmNlL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzks NiArNzksNyBAQCBwdWJsaWM6CiAgICAgUVN0cmluZyBkZWZhdWx0VGV4dEVuY29kaW5nOwogICAg IFFTdHJpbmcgbG9jYWxTdG9yYWdlUGF0aDsKICAgICBRU3RyaW5nIG9mZmxpbmVXZWJBcHBsaWNh dGlvbkNhY2hlUGF0aDsKKyAgICBRU3RyaW5nIG1lZGlhVHlwZTsKICAgICBxaW50NjQgb2ZmbGlu ZVN0b3JhZ2VEZWZhdWx0UXVvdGE7CiAgICAgUVdlYlNldHRpbmdzOjpUaGlyZFBhcnR5Q29va2ll UG9saWN5IHRoaXJkUGFydHlDb29raWVQb2xpY3k7CiAgICAgdm9pZCBhcHBseSgpOwpAQCAtMjM4 LDYgKzIzOSw5IEBAIHZvaWQgUVdlYlNldHRpbmdzUHJpdmF0ZTo6YXBwbHkoKQogICAgICAgICBR U3RyaW5nIHN0b3JhZ2VQYXRoID0gIWxvY2FsU3RvcmFnZVBhdGguaXNFbXB0eSgpID8gbG9jYWxT dG9yYWdlUGF0aCA6IGdsb2JhbC0+bG9jYWxTdG9yYWdlUGF0aDsKICAgICAgICAgc2V0dGluZ3Mt PnNldExvY2FsU3RvcmFnZURhdGFiYXNlUGF0aChzdG9yYWdlUGF0aCk7CiAKKyAgICAgICAgaWYg KG1lZGlhVHlwZS5pc0VtcHR5KCkpCisgICAgICAgICAgICBtZWRpYVR5cGUgPSBnbG9iYWwtPm1l ZGlhVHlwZTsKKwogICAgICAgICB2YWx1ZSA9IGF0dHJpYnV0ZXMudmFsdWUoUVdlYlNldHRpbmdz OjpQcmludEVsZW1lbnRCYWNrZ3JvdW5kcywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZ2xvYmFsLT5hdHRyaWJ1dGVzLnZhbHVlKFFXZWJTZXR0aW5nczo6UHJpbnRFbGVt ZW50QmFja2dyb3VuZHMpKTsKICAgICAgICAgc2V0dGluZ3MtPnNldFNob3VsZFByaW50QmFja2dy b3VuZHModmFsdWUpOwpAQCAtOTMxLDYgKzkzNSwyMyBAQCBRV2ViU2V0dGluZ3M6OlRoaXJkUGFy dHlDb29raWVQb2xpY3kgUVdlCiB9CiAKIC8qIQorICAgIFNldHMgdGhlIENTUyBtZWRpYSB0eXBl LgorKi8KK3ZvaWQgUVdlYlNldHRpbmdzOjpzZXRDU1NNZWRpYVR5cGUoY29uc3QgUVN0cmluZyYg dHlwZSkKK3sKKyAgICBkLT5tZWRpYVR5cGUgPSB0eXBlOworICAgIGQtPmFwcGx5KCk7Cit9CisK Ky8qIQorICAgIFJldHVybnMgdGhlIGN1cnJlbnQgQ1NTIG1lZGlhIHR5cGUuCisqLworUVN0cmlu ZyBRV2ViU2V0dGluZ3M6OmNzc01lZGlhVHlwZSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIGQtPm1l ZGlhVHlwZTsKK30KKworLyohCiAgICAgU2V0cyB0aGUgYWN0dWFsIGZvbnQgZmFtaWx5IHRvIFxh IGZhbWlseSBmb3IgdGhlIHNwZWNpZmllZCBnZW5lcmljIGZhbWlseSwKICAgICBcYSB3aGljaC4K ICovCkluZGV4OiBTb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuaAkocmV2aXNpb24gMTQ3NjEy KQorKysgU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmgJKHdvcmtpbmcgY29weSkK QEAgLTE2NCw2ICsxNjQsOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRUaGlyZFBhcnR5Q29va2ll UG9saWN5KFRoaXJkUGFydHlDb29raWVQb2xpY3kpOwogICAgIFFXZWJTZXR0aW5nczo6VGhpcmRQ YXJ0eUNvb2tpZVBvbGljeSB0aGlyZFBhcnR5Q29va2llUG9saWN5KCkgY29uc3Q7CiAKKyAgICB2 b2lkIHNldENTU01lZGlhVHlwZShjb25zdCBRU3RyaW5nJik7CisgICAgUVN0cmluZyBjc3NNZWRp YVR5cGUoKSBjb25zdDsKKwogICAgIGlubGluZSBRV2ViU2V0dGluZ3NQcml2YXRlKiBoYW5kbGUo KSBjb25zdCB7IHJldHVybiBkOyB9CiAKIHByaXZhdGU6CkluZGV4OiBTb3VyY2UvV2ViS2l0L3F0 L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAJKHJl dmlzaW9uIDE0NzYxMikKKysrIFNvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVM b2FkZXJDbGllbnRRdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc4LDYgKzc4LDcgQEAKICNpbmNs dWRlICJxd2ViaGlzdG9yeV9wLmgiCiAjaW5jbHVkZSAicXdlYmhpc3RvcnlpbnRlcmZhY2UuaCIK ICNpbmNsdWRlICJxd2VicGx1Z2luZmFjdG9yeS5oIgorI2luY2x1ZGUgInF3ZWJzZXR0aW5ncy5o IgogCiAjaW5jbHVkZSA8UUNvcmVBcHBsaWNhdGlvbj4KICNpbmNsdWRlIDxRRGVidWc+CkBAIC0x NTYzLDcgKzE1NjQsMTQgQEAgUGFzc1JlZlB0cjxXaWRnZXQ+IEZyYW1lTG9hZGVyQ2xpZW50UXQ6 OgogCiBTdHJpbmcgRnJhbWVMb2FkZXJDbGllbnRRdDo6b3ZlcnJpZGVNZWRpYVR5cGUoKSBjb25z dAogewotICAgIHJldHVybiBTdHJpbmcoKTsKKyAgICBTdHJpbmcgdHlwZTsKKyAgICBpZiAobV93 ZWJGcmFtZSAmJiBtX3dlYkZyYW1lLT5wYWdlQWRhcHRlciAmJiBtX3dlYkZyYW1lLT5wYWdlQWRh cHRlci0+c2V0dGluZ3MpCisgICAgICAgIHR5cGUgPSBtX3dlYkZyYW1lLT5wYWdlQWRhcHRlci0+ c2V0dGluZ3MtPmNzc01lZGlhVHlwZSgpOworICAgIC8vIElmIHR5cGUgaXMgbnVsbCB0cnkgdG8g Z2V0IHZhbHVlIGZyb20gUVdlYlNldHRpbmdzOjpnbG9iYWxTZXR0aW5ncygpIAorICAgIGlmICh0 eXBlLmlzTnVsbCgpKQorICAgICAgICB0eXBlID0gUVdlYlNldHRpbmdzOjpnbG9iYWxTZXR0aW5n cygpLT5jc3NNZWRpYVR5cGUoKTsKKworICAgIHJldHVybiB0eXBlOwogfQogCiBRU3RyaW5nIEZy YW1lTG9hZGVyQ2xpZW50UXQ6OmNob29zZUZpbGUoY29uc3QgUVN0cmluZyYgb2xkRmlsZSkK 197145 2013-04-09 10:54:19 -0700 2013-04-10 05:14:13 -0700 Patch bug-113853-20130409231746.patch text/plain 7294 jose.lejin SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNDgwMzEpCisrKyBTb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDEzLTA0LTA5ICBK b3NlIExlamluIFBKICA8am9zZS5sZWppbkBnbWFpbC5jb20+CisKKyAgICAgICAgW1F0XSBBZGQg QVBJIGluIFFXZWJTZXR0aW5ncyBmb3Igc2V0dGluZyB0aGUgQ1NTIG1lZGlhIHR5cGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzg1MworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQXBpL3F3ZWJzZXR0 aW5ncy5jcHA6CisgICAgICAgIChRV2ViU2V0dGluZ3NQcml2YXRlKToKKyAgICAgICAgKFFXZWJT ZXR0aW5nc1ByaXZhdGU6OmFwcGx5KToKKyAgICAgICAgKFFXZWJTZXR0aW5nczo6c2V0Q1NTTWVk aWFUeXBlKToKKyAgICAgICAgKFFXZWJTZXR0aW5nczo6Y3NzTWVkaWFUeXBlKToKKyAgICAgICAg KiBBcGkvcXdlYnNldHRpbmdzLmg6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2Fk ZXJDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0Ojpv dmVycmlkZU1lZGlhVHlwZSk6CisgICAgICAgICogdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdl LmNwcDoKKyAgICAgICAgKHRzdF9RV2ViUGFnZSk6CisgICAgICAgICh0c3RfUVdlYlBhZ2U6OmNz c01lZGlhVHlwZSk6CisKIDIwMTMtMDQtMDkgIFJhZmFlbCBCcmFuZGFvICA8cmFmYWVsLmxvYm9A b3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBbQ29vcmRpbmF0ZWRHcmFwaGljc10gc2VydmljZVNj cmlwdGVkQW5pbWF0aW9ucyBleHBlY3RzIHRpbWUgaW4gc2Vjb25kcwpJbmRleDogU291cmNlL1dl YktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCShyZXZpc2lvbiAxNDc2MTIpCisrKyBTb3VyY2UvV2Vi S2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03OSw2ICs3OSw3 IEBAIHB1YmxpYzoKICAgICBRU3RyaW5nIGRlZmF1bHRUZXh0RW5jb2Rpbmc7CiAgICAgUVN0cmlu ZyBsb2NhbFN0b3JhZ2VQYXRoOwogICAgIFFTdHJpbmcgb2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2Fj aGVQYXRoOworICAgIFFTdHJpbmcgbWVkaWFUeXBlOwogICAgIHFpbnQ2NCBvZmZsaW5lU3RvcmFn ZURlZmF1bHRRdW90YTsKICAgICBRV2ViU2V0dGluZ3M6OlRoaXJkUGFydHlDb29raWVQb2xpY3kg dGhpcmRQYXJ0eUNvb2tpZVBvbGljeTsKICAgICB2b2lkIGFwcGx5KCk7CkBAIC0yMzgsNiArMjM5 LDkgQEAgdm9pZCBRV2ViU2V0dGluZ3NQcml2YXRlOjphcHBseSgpCiAgICAgICAgIFFTdHJpbmcg c3RvcmFnZVBhdGggPSAhbG9jYWxTdG9yYWdlUGF0aC5pc0VtcHR5KCkgPyBsb2NhbFN0b3JhZ2VQ YXRoIDogZ2xvYmFsLT5sb2NhbFN0b3JhZ2VQYXRoOwogICAgICAgICBzZXR0aW5ncy0+c2V0TG9j YWxTdG9yYWdlRGF0YWJhc2VQYXRoKHN0b3JhZ2VQYXRoKTsKIAorICAgICAgICBpZiAobWVkaWFU eXBlLmlzRW1wdHkoKSkKKyAgICAgICAgICAgIG1lZGlhVHlwZSA9IGdsb2JhbC0+bWVkaWFUeXBl OworCiAgICAgICAgIHZhbHVlID0gYXR0cmlidXRlcy52YWx1ZShRV2ViU2V0dGluZ3M6OlByaW50 RWxlbWVudEJhY2tncm91bmRzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBnbG9iYWwtPmF0dHJpYnV0ZXMudmFsdWUoUVdlYlNldHRpbmdzOjpQcmludEVsZW1lbnRCYWNr Z3JvdW5kcykpOwogICAgICAgICBzZXR0aW5ncy0+c2V0U2hvdWxkUHJpbnRCYWNrZ3JvdW5kcyh2 YWx1ZSk7CkBAIC05MzEsNiArOTM1LDI5IEBAIFFXZWJTZXR0aW5nczo6VGhpcmRQYXJ0eUNvb2tp ZVBvbGljeSBRV2UKIH0KIAogLyohCisgICAgU2V0cyB0aGUgQ1NTIG1lZGlhIHR5cGUgdG8gXGEg dHlwZS4KKyAgICAKKyAgICBTZXR0aW5nIHRoaXMgd2lsbCBvdmVycmlkZSB0aGUgbm9ybWFsIHZh bHVlIG9mIHRoZSBDU1MgbWVkaWEgcHJvcGVydHkuCisgICAgCisgICAgXG5vdGUgU2V0dGluZyB0 aGUgdmFsdWUgdG8gbnVsbCBRU3RyaW5nIHdpbGwgcmVzdG9yZSB0aGUgZGVmYXVsdCB2YWx1ZS4K KyovCit2b2lkIFFXZWJTZXR0aW5nczo6c2V0Q1NTTWVkaWFUeXBlKGNvbnN0IFFTdHJpbmcmIHR5 cGUpCit7CisgICAgZC0+bWVkaWFUeXBlID0gdHlwZTsKKyAgICBkLT5hcHBseSgpOworfQorCisv KiEKKyAgICBSZXR1cm5zIHRoZSBjdXJyZW50IENTUyBtZWRpYSB0eXBlLgorICAgIAorICAgIFxu b3RlIEl0IHdpbGwgb25seSByZXR1cm4gdGhlIHZhbHVlIHNldCB0aHJvdWdoIHNldENTU01lZGlh VHlwZSBhbmQgbm90IHRoZSBvbmUgdXNlZCBpbnRlcm5hbGx5LgorKi8KK1FTdHJpbmcgUVdlYlNl dHRpbmdzOjpjc3NNZWRpYVR5cGUoKSBjb25zdAoreworICAgIHJldHVybiBkLT5tZWRpYVR5cGU7 Cit9CisKKy8qIQogICAgIFNldHMgdGhlIGFjdHVhbCBmb250IGZhbWlseSB0byBcYSBmYW1pbHkg Zm9yIHRoZSBzcGVjaWZpZWQgZ2VuZXJpYyBmYW1pbHksCiAgICAgXGEgd2hpY2guCiAqLwpJbmRl eDogU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmgJKHJldmlzaW9uIDE0NzYxMikKKysrIFNv dXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNjQs NiArMTY0LDkgQEAgcHVibGljOgogICAgIHZvaWQgc2V0VGhpcmRQYXJ0eUNvb2tpZVBvbGljeShU aGlyZFBhcnR5Q29va2llUG9saWN5KTsKICAgICBRV2ViU2V0dGluZ3M6OlRoaXJkUGFydHlDb29r aWVQb2xpY3kgdGhpcmRQYXJ0eUNvb2tpZVBvbGljeSgpIGNvbnN0OwogCisgICAgdm9pZCBzZXRD U1NNZWRpYVR5cGUoY29uc3QgUVN0cmluZyYpOworICAgIFFTdHJpbmcgY3NzTWVkaWFUeXBlKCkg Y29uc3Q7CisKICAgICBpbmxpbmUgUVdlYlNldHRpbmdzUHJpdmF0ZSogaGFuZGxlKCkgY29uc3Qg eyByZXR1cm4gZDsgfQogCiBwcml2YXRlOgpJbmRleDogU291cmNlL1dlYktpdC9xdC9XZWJDb3Jl U3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCShyZXZpc2lvbiAx NDc2MTIpCisrKyBTb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp ZW50UXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03OCw2ICs3OCw3IEBACiAjaW5jbHVkZSAicXdl Ymhpc3RvcnlfcC5oIgogI2luY2x1ZGUgInF3ZWJoaXN0b3J5aW50ZXJmYWNlLmgiCiAjaW5jbHVk ZSAicXdlYnBsdWdpbmZhY3RvcnkuaCIKKyNpbmNsdWRlICJxd2Vic2V0dGluZ3MuaCIKIAogI2lu Y2x1ZGUgPFFDb3JlQXBwbGljYXRpb24+CiAjaW5jbHVkZSA8UURlYnVnPgpAQCAtMTU2Myw3ICsx NTY0LDExIEBAIFBhc3NSZWZQdHI8V2lkZ2V0PiBGcmFtZUxvYWRlckNsaWVudFF0OjoKIAogU3Ry aW5nIEZyYW1lTG9hZGVyQ2xpZW50UXQ6Om92ZXJyaWRlTWVkaWFUeXBlKCkgY29uc3QKIHsKLSAg ICByZXR1cm4gU3RyaW5nKCk7CisgICAgU3RyaW5nIHR5cGU7CisgICAgaWYgKG1fd2ViRnJhbWUg JiYgbV93ZWJGcmFtZS0+cGFnZUFkYXB0ZXIgJiYgbV93ZWJGcmFtZS0+cGFnZUFkYXB0ZXItPnNl dHRpbmdzKQorICAgICAgICB0eXBlID0gbV93ZWJGcmFtZS0+cGFnZUFkYXB0ZXItPnNldHRpbmdz LT5jc3NNZWRpYVR5cGUoKTsKKworICAgIHJldHVybiB0eXBlOwogfQogCiBRU3RyaW5nIEZyYW1l TG9hZGVyQ2xpZW50UXQ6OmNob29zZUZpbGUoY29uc3QgUVN0cmluZyYgb2xkRmlsZSkKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAJ KHJldmlzaW9uIDE0NzYxMikKKysrIFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0 X3F3ZWJwYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTg3LDYgKzE4Nyw3IEBAIHByaXZhdGUg UV9TTE9UUzoKICAgICB2b2lkIGxvYWRTaWduYWxzT3JkZXJfZGF0YSgpOwogICAgIHZvaWQgbG9h ZFNpZ25hbHNPcmRlcigpOwogICAgIHZvaWQgb3BlbldpbmRvd0RlZmF1bHRTaXplKCk7CisgICAg dm9pZCBjc3NNZWRpYVR5cGUoKTsKIAogI2lmZGVmIFFfT1NfTUFDCiAgICAgdm9pZCBtYWNDb3B5 VW5pY29kZVRvQ2xpcGJvYXJkKCk7CkBAIC0zMjg2LDUgKzMyODcsNjAgQEAgdm9pZCB0c3RfUVdl YlBhZ2U6Om9wZW5XaW5kb3dEZWZhdWx0U2l6ZQogICAgIFFWRVJJRlkocmVxdWVzdGVkR2VvbWV0 cnkuaGVpZ2h0KCkgPT0gMTAwKTsKIH0KIAordm9pZCB0c3RfUVdlYlBhZ2U6OmNzc01lZGlhVHlw ZSgpCit7CisgICAgVGVzdFBhZ2UqIHBhZ2U7CisgICAgUVN0cmluZyB0ZXN0SHRtbCgiPHN0eWxl PkBtZWRpYSB0diB7Ym9keXtiYWNrZ3JvdW5kLWNvbG9yOnJlZDt9fUBtZWRpYSBoYW5kaGVsZCB7 Ym9keXtiYWNrZ3JvdW5kLWNvbG9yOmdyZWVuO319QG1lZGlhIHNjcmVlbiB7Ym9keXtiYWNrZ3Jv dW5kLWNvbG9yOmJsdWU7fX08L3N0eWxlPiIpOworICAgIC8vIFRlc3QgYnkgc2V0dGluZyB2aWEg UVdlYlNldHRpbmdzOjpnbG9iYWxTZXR0aW5ncygpCisgICAgUVdlYlNldHRpbmdzOjpnbG9iYWxT ZXR0aW5ncygpLT5zZXRDU1NNZWRpYVR5cGUoInR2Iik7CisgICAgcGFnZSA9IG5ldyBUZXN0UGFn ZSgpOworICAgIHBhZ2UtPm1haW5GcmFtZSgpLT5zZXRIdG1sKHRlc3RIdG1sKTsKKyAgICBRVGVz dDo6cVdhaXQoNTAwKTsKKyAgICBRVkVSSUZZKHBhZ2UtPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUph dmFTY3JpcHQoIndpbmRvdy5tYXRjaE1lZGlhKCd0dicpLm1hdGNoZXMgPT0gdHJ1ZSIpLnRvQm9v bCgpKTsgCisgICAgUVZFUklGWShRV2ViU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCktPmNzc01l ZGlhVHlwZSgpID09ICJ0diIpOworICAgIGRlbGV0ZSBwYWdlOworCisgICAgUVdlYlNldHRpbmdz OjpnbG9iYWxTZXR0aW5ncygpLT5zZXRDU1NNZWRpYVR5cGUoImhhbmRoZWxkIik7CisgICAgcGFn ZSA9IG5ldyBUZXN0UGFnZSgpOworICAgIHBhZ2UtPm1haW5GcmFtZSgpLT5zZXRIdG1sKHRlc3RI dG1sKTsKKyAgICBRVGVzdDo6cVdhaXQoNTAwKTsKKyAgICBRVkVSSUZZKHBhZ2UtPm1haW5GcmFt ZSgpLT5ldmFsdWF0ZUphdmFTY3JpcHQoIndpbmRvdy5tYXRjaE1lZGlhKCdoYW5kaGVsZCcpLm1h dGNoZXMgPT0gdHJ1ZSIpLnRvQm9vbCgpKTsKKyAgICBRVkVSSUZZKFFXZWJTZXR0aW5nczo6Z2xv YmFsU2V0dGluZ3MoKS0+Y3NzTWVkaWFUeXBlKCkgPT0gImhhbmRoZWxkIik7CisgICAgZGVsZXRl IHBhZ2U7CisKKyAgICBRV2ViU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCktPnNldENTU01lZGlh VHlwZSgic2NyZWVuIik7CisgICAgcGFnZSA9IG5ldyBUZXN0UGFnZSgpOworICAgIHBhZ2UtPm1h aW5GcmFtZSgpLT5zZXRIdG1sKHRlc3RIdG1sKTsKKyAgICBRVGVzdDo6cVdhaXQoNTAwKTsKKyAg ICBRVkVSSUZZKHBhZ2UtPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFTY3JpcHQoIndpbmRvdy5t YXRjaE1lZGlhKCdzY3JlZW4nKS5tYXRjaGVzID09IHRydWUiKS50b0Jvb2woKSk7CisgICAgUVZF UklGWShRV2ViU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCktPmNzc01lZGlhVHlwZSgpID09ICJz Y3JlZW4iKTsKKyAgICBkZWxldGUgcGFnZTsKKworICAgIC8vIFRlc3QgYnkgc2V0dGluZyB2aWEg cGFnZSBzcGVjaWZpYyBzZXR0aW5ncygpCisgICAgcGFnZSA9IG5ldyBUZXN0UGFnZSgpOworICAg IHBhZ2UtPnNldHRpbmdzKCktPnNldENTU01lZGlhVHlwZSgidHYiKTsKKyAgICBwYWdlLT5tYWlu RnJhbWUoKS0+c2V0SHRtbCh0ZXN0SHRtbCk7CisgICAgUVRlc3Q6OnFXYWl0KDUwMCk7CisgICAg UVZFUklGWShwYWdlLT5tYWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0KCJ3aW5kb3cubWF0 Y2hNZWRpYSgndHYnKS5tYXRjaGVzID09IHRydWUiKS50b0Jvb2woKSk7CisgICAgUVZFUklGWShw YWdlLT5zZXR0aW5ncygpLT5jc3NNZWRpYVR5cGUoKSA9PSAidHYiKTsgCisgICAgZGVsZXRlIHBh Z2U7CisKKyAgICBwYWdlID0gbmV3IFRlc3RQYWdlKCk7CisgICAgcGFnZS0+c2V0dGluZ3MoKS0+ c2V0Q1NTTWVkaWFUeXBlKCJoYW5kaGVsZCIpOworICAgIHBhZ2UtPm1haW5GcmFtZSgpLT5zZXRI dG1sKHRlc3RIdG1sKTsKKyAgICBRVGVzdDo6cVdhaXQoNTAwKTsKKyAgICBRVkVSSUZZKHBhZ2Ut Pm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFTY3JpcHQoIndpbmRvdy5tYXRjaE1lZGlhKCdoYW5k aGVsZCcpLm1hdGNoZXMgPT0gdHJ1ZSIpLnRvQm9vbCgpKTsKKyAgICBRVkVSSUZZKHBhZ2UtPnNl dHRpbmdzKCktPmNzc01lZGlhVHlwZSgpID09ICJoYW5kaGVsZCIpOworICAgIGRlbGV0ZSBwYWdl OworCisgICAgcGFnZSA9IG5ldyBUZXN0UGFnZSgpOworICAgIHBhZ2UtPnNldHRpbmdzKCktPnNl dENTU01lZGlhVHlwZSgic2NyZWVuIik7CisgICAgcGFnZS0+bWFpbkZyYW1lKCktPnNldEh0bWwo dGVzdEh0bWwpOworICAgIFFUZXN0OjpxV2FpdCg1MDApOworICAgIFFWRVJJRlkocGFnZS0+bWFp bkZyYW1lKCktPmV2YWx1YXRlSmF2YVNjcmlwdCgid2luZG93Lm1hdGNoTWVkaWEoJ3NjcmVlbicp Lm1hdGNoZXMgPT0gdHJ1ZSIpLnRvQm9vbCgpKTsKKyAgICBRVkVSSUZZKHBhZ2UtPnNldHRpbmdz KCktPmNzc01lZGlhVHlwZSgpID09ICJzY3JlZW4iKTsgCisgICAgZGVsZXRlIHBhZ2U7Cit9CisK IFFURVNUX01BSU4odHN0X1FXZWJQYWdlKQogI2luY2x1ZGUgInRzdF9xd2VicGFnZS5tb2MiCg== 197249 2013-04-10 05:14:20 -0700 2013-04-10 08:08:38 -0700 Patch bug-113853-20130410173745.patch text/plain 7782 jose.lejin SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNDgwOTApCisrKyBTb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDEzLTA0LTEwICBK b3NlIExlamluIFBKICA8am9zZS5sZWppbkBnbWFpbC5jb20+CisKKyAgICAgICAgW1F0XSBBZGQg QVBJIGluIFFXZWJTZXR0aW5ncyBmb3Igc2V0dGluZyB0aGUgQ1NTIG1lZGlhIHR5cGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzg1MworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQXBpL3F3ZWJzZXR0 aW5ncy5jcHA6CisgICAgICAgIChRV2ViU2V0dGluZ3NQcml2YXRlKToKKyAgICAgICAgKFFXZWJT ZXR0aW5nc1ByaXZhdGU6OmFwcGx5KToKKyAgICAgICAgKFFXZWJTZXR0aW5nczo6c2V0Q1NTTWVk aWFUeXBlKToKKyAgICAgICAgKFFXZWJTZXR0aW5nczo6Y3NzTWVkaWFUeXBlKToKKyAgICAgICAg KiBBcGkvcXdlYnNldHRpbmdzLmg6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2Fk ZXJDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0Ojpv dmVycmlkZU1lZGlhVHlwZSk6CisgICAgICAgICogdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdl LmNwcDoKKyAgICAgICAgKHRzdF9RV2ViUGFnZSk6CisgICAgICAgICh0c3RfUVdlYlBhZ2U6OmNz c01lZGlhVHlwZUdsb2JhbFNldHRpbmcpOgorICAgICAgICAodHN0X1FXZWJQYWdlOjpjc3NNZWRp YVR5cGVQYWdlU2V0dGluZyk6CisKIDIwMTMtMDQtMDkgIFJhZmFlbCBCcmFuZGFvICA8cmFmYWVs LmxvYm9Ab3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBbQ29vcmRpbmF0ZWRHcmFwaGljc10gc2Vy dmljZVNjcmlwdGVkQW5pbWF0aW9ucyBleHBlY3RzIHRpbWUgaW4gc2Vjb25kcwpJbmRleDogU291 cmNlL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCShyZXZpc2lvbiAxNDc2MTIpCisrKyBTb3Vy Y2UvV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03OSw2 ICs3OSw3IEBAIHB1YmxpYzoKICAgICBRU3RyaW5nIGRlZmF1bHRUZXh0RW5jb2Rpbmc7CiAgICAg UVN0cmluZyBsb2NhbFN0b3JhZ2VQYXRoOwogICAgIFFTdHJpbmcgb2ZmbGluZVdlYkFwcGxpY2F0 aW9uQ2FjaGVQYXRoOworICAgIFFTdHJpbmcgbWVkaWFUeXBlOwogICAgIHFpbnQ2NCBvZmZsaW5l U3RvcmFnZURlZmF1bHRRdW90YTsKICAgICBRV2ViU2V0dGluZ3M6OlRoaXJkUGFydHlDb29raWVQ b2xpY3kgdGhpcmRQYXJ0eUNvb2tpZVBvbGljeTsKICAgICB2b2lkIGFwcGx5KCk7CkBAIC0yMzgs NiArMjM5LDkgQEAgdm9pZCBRV2ViU2V0dGluZ3NQcml2YXRlOjphcHBseSgpCiAgICAgICAgIFFT dHJpbmcgc3RvcmFnZVBhdGggPSAhbG9jYWxTdG9yYWdlUGF0aC5pc0VtcHR5KCkgPyBsb2NhbFN0 b3JhZ2VQYXRoIDogZ2xvYmFsLT5sb2NhbFN0b3JhZ2VQYXRoOwogICAgICAgICBzZXR0aW5ncy0+ c2V0TG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoKHN0b3JhZ2VQYXRoKTsKIAorICAgICAgICBpZiAo bWVkaWFUeXBlLmlzRW1wdHkoKSkKKyAgICAgICAgICAgIG1lZGlhVHlwZSA9IGdsb2JhbC0+bWVk aWFUeXBlOworCiAgICAgICAgIHZhbHVlID0gYXR0cmlidXRlcy52YWx1ZShRV2ViU2V0dGluZ3M6 OlByaW50RWxlbWVudEJhY2tncm91bmRzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBnbG9iYWwtPmF0dHJpYnV0ZXMudmFsdWUoUVdlYlNldHRpbmdzOjpQcmludEVsZW1l bnRCYWNrZ3JvdW5kcykpOwogICAgICAgICBzZXR0aW5ncy0+c2V0U2hvdWxkUHJpbnRCYWNrZ3Jv dW5kcyh2YWx1ZSk7CkBAIC05MzEsNiArOTM1LDI5IEBAIFFXZWJTZXR0aW5nczo6VGhpcmRQYXJ0 eUNvb2tpZVBvbGljeSBRV2UKIH0KIAogLyohCisgICAgU2V0cyB0aGUgQ1NTIG1lZGlhIHR5cGUg dG8gXGEgdHlwZS4KKyAgICAKKyAgICBTZXR0aW5nIHRoaXMgd2lsbCBvdmVycmlkZSB0aGUgbm9y bWFsIHZhbHVlIG9mIHRoZSBDU1MgbWVkaWEgcHJvcGVydHkuCisgICAgCisgICAgXG5vdGUgU2V0 dGluZyB0aGUgdmFsdWUgdG8gbnVsbCBRU3RyaW5nIHdpbGwgcmVzdG9yZSB0aGUgZGVmYXVsdCB2 YWx1ZS4KKyovCit2b2lkIFFXZWJTZXR0aW5nczo6c2V0Q1NTTWVkaWFUeXBlKGNvbnN0IFFTdHJp bmcmIHR5cGUpCit7CisgICAgZC0+bWVkaWFUeXBlID0gdHlwZTsKKyAgICBkLT5hcHBseSgpOwor fQorCisvKiEKKyAgICBSZXR1cm5zIHRoZSBjdXJyZW50IENTUyBtZWRpYSB0eXBlLgorICAgIAor ICAgIFxub3RlIEl0IHdpbGwgb25seSByZXR1cm4gdGhlIHZhbHVlIHNldCB0aHJvdWdoIHNldENT U01lZGlhVHlwZSBhbmQgbm90IHRoZSBvbmUgdXNlZCBpbnRlcm5hbGx5LgorKi8KK1FTdHJpbmcg UVdlYlNldHRpbmdzOjpjc3NNZWRpYVR5cGUoKSBjb25zdAoreworICAgIHJldHVybiBkLT5tZWRp YVR5cGU7Cit9CisKKy8qIQogICAgIFNldHMgdGhlIGFjdHVhbCBmb250IGZhbWlseSB0byBcYSBm YW1pbHkgZm9yIHRoZSBzcGVjaWZpZWQgZ2VuZXJpYyBmYW1pbHksCiAgICAgXGEgd2hpY2guCiAq LwpJbmRleDogU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmgJKHJldmlzaW9uIDE0NzYxMikK KysrIFNvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5oCSh3b3JraW5nIGNvcHkpCkBA IC0xNjQsNiArMTY0LDkgQEAgcHVibGljOgogICAgIHZvaWQgc2V0VGhpcmRQYXJ0eUNvb2tpZVBv bGljeShUaGlyZFBhcnR5Q29va2llUG9saWN5KTsKICAgICBRV2ViU2V0dGluZ3M6OlRoaXJkUGFy dHlDb29raWVQb2xpY3kgdGhpcmRQYXJ0eUNvb2tpZVBvbGljeSgpIGNvbnN0OwogCisgICAgdm9p ZCBzZXRDU1NNZWRpYVR5cGUoY29uc3QgUVN0cmluZyYpOworICAgIFFTdHJpbmcgY3NzTWVkaWFU eXBlKCkgY29uc3Q7CisKICAgICBpbmxpbmUgUVdlYlNldHRpbmdzUHJpdmF0ZSogaGFuZGxlKCkg Y29uc3QgeyByZXR1cm4gZDsgfQogCiBwcml2YXRlOgpJbmRleDogU291cmNlL1dlYktpdC9xdC9X ZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCShyZXZp c2lvbiAxNDc2MTIpCisrKyBTb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9h ZGVyQ2xpZW50UXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03OCw2ICs3OCw3IEBACiAjaW5jbHVk ZSAicXdlYmhpc3RvcnlfcC5oIgogI2luY2x1ZGUgInF3ZWJoaXN0b3J5aW50ZXJmYWNlLmgiCiAj aW5jbHVkZSAicXdlYnBsdWdpbmZhY3RvcnkuaCIKKyNpbmNsdWRlICJxd2Vic2V0dGluZ3MuaCIK IAogI2luY2x1ZGUgPFFDb3JlQXBwbGljYXRpb24+CiAjaW5jbHVkZSA8UURlYnVnPgpAQCAtMTU2 Myw2ICsxNTY0LDkgQEAgUGFzc1JlZlB0cjxXaWRnZXQ+IEZyYW1lTG9hZGVyQ2xpZW50UXQ6Ogog CiBTdHJpbmcgRnJhbWVMb2FkZXJDbGllbnRRdDo6b3ZlcnJpZGVNZWRpYVR5cGUoKSBjb25zdAog eworICAgIGlmIChtX3dlYkZyYW1lICYmIG1fd2ViRnJhbWUtPnBhZ2VBZGFwdGVyICYmIG1fd2Vi RnJhbWUtPnBhZ2VBZGFwdGVyLT5zZXR0aW5ncykKKyAgICAgICAgcmV0dXJuIG1fd2ViRnJhbWUt PnBhZ2VBZGFwdGVyLT5zZXR0aW5ncy0+Y3NzTWVkaWFUeXBlKCk7CisKICAgICByZXR1cm4gU3Ry aW5nKCk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3 ZWJwYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdl L3RzdF9xd2VicGFnZS5jcHAJKHJldmlzaW9uIDE0NzYxMikKKysrIFNvdXJjZS9XZWJLaXQvcXQv dGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTg3LDYg KzE4Nyw4IEBAIHByaXZhdGUgUV9TTE9UUzoKICAgICB2b2lkIGxvYWRTaWduYWxzT3JkZXJfZGF0 YSgpOwogICAgIHZvaWQgbG9hZFNpZ25hbHNPcmRlcigpOwogICAgIHZvaWQgb3BlbldpbmRvd0Rl ZmF1bHRTaXplKCk7CisgICAgdm9pZCBjc3NNZWRpYVR5cGVHbG9iYWxTZXR0aW5nKCk7CisgICAg dm9pZCBjc3NNZWRpYVR5cGVQYWdlU2V0dGluZygpOwogCiAjaWZkZWYgUV9PU19NQUMKICAgICB2 b2lkIG1hY0NvcHlVbmljb2RlVG9DbGlwYm9hcmQoKTsKQEAgLTMyODYsNSArMzI4OCw1OSBAQCB2 b2lkIHRzdF9RV2ViUGFnZTo6b3BlbldpbmRvd0RlZmF1bHRTaXplCiAgICAgUVZFUklGWShyZXF1 ZXN0ZWRHZW9tZXRyeS5oZWlnaHQoKSA9PSAxMDApOwogfQogCit2b2lkIHRzdF9RV2ViUGFnZTo6 Y3NzTWVkaWFUeXBlR2xvYmFsU2V0dGluZygpCit7CisgICAgUVN0cmluZyB0ZXN0SHRtbCgiPHN0 eWxlPkBtZWRpYSB0diB7Ym9keXtiYWNrZ3JvdW5kLWNvbG9yOnJlZDt9fUBtZWRpYSBoYW5kaGVs ZCB7Ym9keXtiYWNrZ3JvdW5kLWNvbG9yOmdyZWVuO319QG1lZGlhIHNjcmVlbiB7Ym9keXtiYWNr Z3JvdW5kLWNvbG9yOmJsdWU7fX08L3N0eWxlPiIpOworICAgIFFTaWduYWxTcHkgbG9hZFNweSht X3ZpZXcsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpKTsKKworICAgIFFXZWJTZXR0aW5nczo6 Z2xvYmFsU2V0dGluZ3MoKS0+c2V0Q1NTTWVkaWFUeXBlKCJ0diIpOworICAgIC8vIENsZWFyIHBh Z2Ugc3BlY2lmaWMgc2V0dGluZyB0byByZWFkIGZyb20gZ2xvYmFsIHNldHRpbmcKKyAgICBtX3Zp ZXctPnBhZ2UoKS0+c2V0dGluZ3MoKS0+c2V0Q1NTTWVkaWFUeXBlKFFTdHJpbmcoKSk7CisgICAg bV92aWV3LT5zZXRIdG1sKHRlc3RIdG1sKTsKKyAgICBRVFJZX0NPTVBBUkUobG9hZFNweS5jb3Vu dCgpLCAxKTsKKyAgICBRVkVSSUZZKG1fdmlldy0+cGFnZSgpLT5tYWluRnJhbWUoKS0+ZXZhbHVh dGVKYXZhU2NyaXB0KCJ3aW5kb3cubWF0Y2hNZWRpYSgndHYnKS5tYXRjaGVzID09IHRydWUiKS50 b0Jvb2woKSk7IAorICAgIFFWRVJJRlkoUVdlYlNldHRpbmdzOjpnbG9iYWxTZXR0aW5ncygpLT5j c3NNZWRpYVR5cGUoKSA9PSAidHYiKTsKKworICAgIFFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0dGlu Z3MoKS0+c2V0Q1NTTWVkaWFUeXBlKCJoYW5kaGVsZCIpOworICAgIC8vIENsZWFyIHBhZ2Ugc3Bl Y2lmaWMgc2V0dGluZyB0byByZWFkIGZyb20gZ2xvYmFsIHNldHRpbmcKKyAgICBtX3ZpZXctPnBh Z2UoKS0+c2V0dGluZ3MoKS0+c2V0Q1NTTWVkaWFUeXBlKFFTdHJpbmcoKSk7CisgICAgbV92aWV3 LT5zZXRIdG1sKHRlc3RIdG1sKTsKKyAgICBRVFJZX0NPTVBBUkUobG9hZFNweS5jb3VudCgpLCAy KTsKKyAgICBRVkVSSUZZKG1fdmlldy0+cGFnZSgpLT5tYWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZh U2NyaXB0KCJ3aW5kb3cubWF0Y2hNZWRpYSgnaGFuZGhlbGQnKS5tYXRjaGVzID09IHRydWUiKS50 b0Jvb2woKSk7CisgICAgUVZFUklGWShRV2ViU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCktPmNz c01lZGlhVHlwZSgpID09ICJoYW5kaGVsZCIpOworCisgICAgUVdlYlNldHRpbmdzOjpnbG9iYWxT ZXR0aW5ncygpLT5zZXRDU1NNZWRpYVR5cGUoInNjcmVlbiIpOworICAgIC8vIENsZWFyIHBhZ2Ug c3BlY2lmaWMgc2V0dGluZyB0byByZWFkIGZyb20gZ2xvYmFsIHNldHRpbmcKKyAgICBtX3ZpZXct PnBhZ2UoKS0+c2V0dGluZ3MoKS0+c2V0Q1NTTWVkaWFUeXBlKFFTdHJpbmcoKSk7CisgICAgbV92 aWV3LT5zZXRIdG1sKHRlc3RIdG1sKTsKKyAgICBRVFJZX0NPTVBBUkUobG9hZFNweS5jb3VudCgp LCAzKTsKKyAgICBRVkVSSUZZKG1fdmlldy0+cGFnZSgpLT5tYWluRnJhbWUoKS0+ZXZhbHVhdGVK YXZhU2NyaXB0KCJ3aW5kb3cubWF0Y2hNZWRpYSgnc2NyZWVuJykubWF0Y2hlcyA9PSB0cnVlIiku dG9Cb29sKCkpOyAKKyAgICBRVkVSSUZZKFFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKS0+ Y3NzTWVkaWFUeXBlKCkgPT0gInNjcmVlbiIpOyAKK30KKwordm9pZCB0c3RfUVdlYlBhZ2U6OmNz c01lZGlhVHlwZVBhZ2VTZXR0aW5nKCkKK3sKKyAgICBRU3RyaW5nIHRlc3RIdG1sKCI8c3R5bGU+ QG1lZGlhIHR2IHtib2R5e2JhY2tncm91bmQtY29sb3I6cmVkO319QG1lZGlhIGhhbmRoZWxkIHti b2R5e2JhY2tncm91bmQtY29sb3I6Z3JlZW47fX1AbWVkaWEgc2NyZWVuIHtib2R5e2JhY2tncm91 bmQtY29sb3I6Ymx1ZTt9fTwvc3R5bGU+Iik7CisgICAgUVNpZ25hbFNweSBsb2FkU3B5KG1fdmll dywgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSkpOworCisgICAgbV92aWV3LT5wYWdlKCktPnNl dHRpbmdzKCktPnNldENTU01lZGlhVHlwZSgidHYiKTsKKyAgICBtX3ZpZXctPnNldEh0bWwodGVz dEh0bWwpOworICAgIFFUUllfQ09NUEFSRShsb2FkU3B5LmNvdW50KCksIDEpOworICAgIFFWRVJJ RlkobV92aWV3LT5wYWdlKCktPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFTY3JpcHQoIndpbmRv dy5tYXRjaE1lZGlhKCd0dicpLm1hdGNoZXMgPT0gdHJ1ZSIpLnRvQm9vbCgpKTsgCisgICAgUVZF UklGWShtX3ZpZXctPnBhZ2UoKS0+c2V0dGluZ3MoKS0+Y3NzTWVkaWFUeXBlKCkgPT0gInR2Iik7 IAorCisgICAgbV92aWV3LT5wYWdlKCktPnNldHRpbmdzKCktPnNldENTU01lZGlhVHlwZSgiaGFu ZGhlbGQiKTsKKyAgICBtX3ZpZXctPnNldEh0bWwodGVzdEh0bWwpOworICAgIFFUUllfQ09NUEFS RShsb2FkU3B5LmNvdW50KCksIDIpOworICAgIFFWRVJJRlkobV92aWV3LT5wYWdlKCktPm1haW5G cmFtZSgpLT5ldmFsdWF0ZUphdmFTY3JpcHQoIndpbmRvdy5tYXRjaE1lZGlhKCdoYW5kaGVsZCcp Lm1hdGNoZXMgPT0gdHJ1ZSIpLnRvQm9vbCgpKTsKKyAgICBRVkVSSUZZKG1fdmlldy0+cGFnZSgp LT5zZXR0aW5ncygpLT5jc3NNZWRpYVR5cGUoKSA9PSAiaGFuZGhlbGQiKTsKKworICAgIG1fdmll dy0+cGFnZSgpLT5zZXR0aW5ncygpLT5zZXRDU1NNZWRpYVR5cGUoInNjcmVlbiIpOworICAgIG1f dmlldy0+c2V0SHRtbCh0ZXN0SHRtbCk7CisgICAgUVRSWV9DT01QQVJFKGxvYWRTcHkuY291bnQo KSwgMyk7CisgICAgUVZFUklGWShtX3ZpZXctPnBhZ2UoKS0+bWFpbkZyYW1lKCktPmV2YWx1YXRl SmF2YVNjcmlwdCgid2luZG93Lm1hdGNoTWVkaWEoJ3NjcmVlbicpLm1hdGNoZXMgPT0gdHJ1ZSIp LnRvQm9vbCgpKTsgCisgICAgUVZFUklGWShtX3ZpZXctPnBhZ2UoKS0+c2V0dGluZ3MoKS0+Y3Nz TWVkaWFUeXBlKCkgPT0gInNjcmVlbiIpOyAKK30KKwogUVRFU1RfTUFJTih0c3RfUVdlYlBhZ2Up CiAjaW5jbHVkZSAidHN0X3F3ZWJwYWdlLm1vYyIK