42943 2010-07-24 22:19:04 -0700 WebKit fails to compile when building with WML support enabled 2010-12-25 13:57:17 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dbates webkit-unassigned abarth charles.wei eric gustavo joone peter.rybin ryuan.choi staikos webkit.review.bot xan.lopez yichao.yin zimmermann oldest_to_newest 255793 0 dbates 2010-07-24 22:19:04 -0700 I get the following compile-time errors when building WebKit with WML support enabled: /Users/dbates/Desktop/WebKit/WebCore/wml/WMLCardElement.cpp: In static member function 'static WebCore::WMLCardElement* WebCore::WMLCardElement::findNamedCardInDocument(WebCore::Document*, const WebCore::String&)': /Users/dbates/Desktop/WebKit/WebCore/wml/WMLCardElement.cpp:290: error: 'class WebCore::WMLCardElement' has no member named 'getIDAttribute' /Users/dbates/Desktop/WebKit/WebCore/wml/WMLDocument.cpp: In constructor 'WebCore::WMLDocument::WMLDocument(WebCore::Frame*)': /Users/dbates/Desktop/WebKit/WebCore/wml/WMLDocument.cpp:39: error: no matching function for call to 'WebCore::Document::Document(WebCore::Frame*&, bool, bool)' /Users/dbates/Desktop/WebKit/WebCore/dom/Document.h:1009: note: candidates are: WebCore::Document::Document(WebCore::Frame*, const WebCore::KURL&, bool, bool) /Users/dbates/Desktop/WebKit/WebCore/dom/Document.h:189: note: WebCore::Document::Document(const WebCore::Document&) /Users/dbates/Desktop/WebKit/WebCore/wml/WMLDocument.cpp: In member function 'virtual void WebCore::WMLDocument::finishedParsing()': /Users/dbates/Desktop/WebKit/WebCore/wml/WMLDocument.cpp:51: error: 'class WebCore::DocumentParser' has no member named 'wellFormed' The following errors are related to Bug #41186: /Users/dbates/Desktop/WebKit/WebCore/dom/XMLDocumentParser.h: In function 'void WebCore::reportWMLError(WebCore::Document*, WebCore::WMLErrorCode)': /Users/dbates/Desktop/WebKit/WebCore/dom/XMLDocumentParser.h:103: error: 'virtual bool WebCore::XMLDocumentParser::wellFormed() const' is private /Users/dbates/Desktop/WebKit/WebCore/wml/WMLErrorHandling.cpp:48: error: within this context /Users/dbates/Desktop/WebKit/WebCore/dom/XMLDocumentParser.h:104: error: 'virtual int WebCore::XMLDocumentParser::lineNumber() const' is private /Users/dbates/Desktop/WebKit/WebCore/wml/WMLErrorHandling.cpp:51: error: within this context /Users/dbates/Desktop/WebKit/WebCore/dom/XMLDocumentParser.h:105: error: 'virtual int WebCore::XMLDocumentParser::columnNumber() const' is private /Users/dbates/Desktop/WebKit/WebCore/wml/WMLErrorHandling.cpp:51: error: within this context /Users/dbates/Desktop/WebKit/WebCore/wml/WMLGoElement.cpp: In member function 'void WebCore::WMLGoElement::preparePOSTRequest(WebCore::ResourceRequest&, bool, const WebCore::String&)': /Users/dbates/Desktop/WebKit/WebCore/wml/WMLGoElement.cpp:158: error: 'FormDataBuilder' has not been declared /Users/dbates/Desktop/WebKit/WebCore/wml/WMLGoElement.cpp: In member function 'WTF::PassRefPtr<WebCore::FormData> WebCore::WMLGoElement::createFormData(const WTF::CString&)': /Users/dbates/Desktop/WebKit/WebCore/wml/WMLGoElement.cpp:191: error: 'FormDataBuilder' has not been declared /Users/dbates/Desktop/WebKit/WebCore/wml/WMLGoElement.cpp:202: error: 'FormDataBuilder' has not been declared /Users/dbates/Desktop/WebKit/WebCore/wml/WMLGoElement.cpp:203: error: 'FormDataBuilder' has not been declared /Users/dbates/Desktop/WebKit/WebCore/wml/WMLGoElement.cpp:211: error: 'FormDataBuilder' has not been declared /Users/dbates/Desktop/WebKit/WebCore/wml/WMLGoElement.cpp:215: error: 'FormDataBuilder' has not been declared /Users/dbates/Desktop/WebKit/WebCore/wml/WMLInputElement.cpp:140: warning: unused parameter 'sendChangeEvent' /Users/dbates/Desktop/WebKit/WebCore/wml/WMLInputElement.cpp:159: warning: unused parameter 'value' 318829 1 joone 2010-12-08 09:34:41 -0800 Now, it still failed to compile with WML as follows, CXX WebCore/dom/libwebkitgtk_1_0_la-Document.lo CXX WebCore/dom/libwebkitgtk_1_0_la-DocumentFragment.lo CXX WebCore/dom/libwebkitgtk_1_0_la-ProcessingInstruction.lo CXX WebCore/dom/libwebkitgtk_1_0_la-XMLDocumentParser.lo CXX WebCore/dom/libwebkitgtk_1_0_la-XMLDocumentParserLibxml2.lo CXX WebCore/loader/libwebkitgtk_1_0_la-FrameLoader.lo CXX WebCore/svg/libwebkitgtk_1_0_la-SVGUseElement.lo CXX WebCore/wml/libwebkitgtk_1_0_la-WMLErrorHandling.lo ../../WebCore/dom/XMLDocumentParser.h: In function ‘void WebCore::reportWMLError(WebCore::Document*, WebCore::WMLErrorCode)’: ../../WebCore/dom/XMLDocumentParser.h:132: error: ‘int WebCore::XMLDocumentParser::columnNumber() const’ is private ../../WebCore/wml/WMLErrorHandling.cpp:51: error: within this context make[1]: *** [WebCore/wml/libwebkitgtk_1_0_la-WMLErrorHandling.lo] Error 1 318831 2 75915 joone 2010-12-08 09:37:37 -0800 Created attachment 75915 Proposed Patch It fixes this build error. 320766 3 75915 eric 2010-12-12 02:08:44 -0800 Comment on attachment 75915 Proposed Patch OK. 320767 4 75915 eric 2010-12-12 02:10:23 -0800 Comment on attachment 75915 Proposed Patch Actually... Why is this needed? 320768 5 eric 2010-12-12 02:12:13 -0800 TextPosition is the new way to do this: http://trac.webkit.org/browser/trunk/WebCore/dom/ScriptableDocumentParser.h 320822 6 joone 2010-12-12 04:28:21 -0800 (In reply to comment #5) > TextPosition is the new way to do this: > http://trac.webkit.org/browser/trunk/WebCore/dom/ScriptableDocumentParser.h It doesn't fix this problem. 320858 7 eric 2010-12-12 10:28:04 -0800 Can you elaborate? 320884 8 76335 joone 2010-12-12 14:43:07 -0800 Created attachment 76335 Proposed Patch2 I'm not sure if I use TextPosition in a right way. 320982 9 76335 eric 2010-12-13 01:34:32 -0800 Comment on attachment 76335 Proposed Patch2 I'm confused why you're moving lineNumber and columnNumber? Neither of these need to be public anymore. textPosition is the new way to do this all I believe. 320983 10 eric 2010-12-13 01:35:14 -0800 Peter added the TextPosition stuff. 321116 11 peter.rybin 2010-12-13 07:52:26 -0800 (In reply to comment #10) > Peter added the TextPosition stuff. The idea behind TextPosition is to keep line/column pair together and what's more important to take care of 0-based/1-based numbers. Incidentally, such issue seems to be hidden in "Patch2": actual arguments of handleError are explicitly 0-based, while this method treats them as 1-based numbers (in user messages all numbers are expected to be 1-based I believe). I propose we adding TextPosition to handleError signature. Let me prepare a patch about this real soon. 321161 12 76395 peter.rybin 2010-12-13 09:36:12 -0800 Created attachment 76395 extending handleError signature -- not a regular patch I propose this additional patch -- switches handleError method to TextPosition1. This patch does not fix the bug itself, only helps. Joone, could you please try if it works for you? If it works, you can merge it with your change. I guess you will also need to convert your TextPosition0 (zero-based value) to TextPosition1 (one-based value expected in handleError), WTF::toOneBasedTextPosition can be used for this. Peter 321437 13 joone 2010-12-13 14:37:48 -0800 (In reply to comment #9) > (From update of attachment 76335 [details]) > I'm confused why you're moving lineNumber and columnNumber? Neither of these need to be public anymore. textPosition is the new way to do this all I believe. Yes, I know. I made them private as follows, private: XMLDocumentParser(Document*, FrameView* = 0); XMLDocumentParser(DocumentFragment*, Element*, FragmentScriptingPermission); // From DocumentParser virtual void insert(const SegmentedString&); virtual void append(const SegmentedString&); virtual void finish(); virtual bool finishWasCalled(); virtual bool isWaitingForScripts() const; virtual void stopParsing(); virtual void detach(); virtual int lineNumber() const; int columnNumber() const; 321440 14 76335 eric 2010-12-13 14:41:14 -0800 Comment on attachment 76335 Proposed Patch2 This seems OK. Peter's fix is definitely better, and it would be good to follow up with a patch which does peter's proposed refactoring. 321481 15 webkit.review.bot 2010-12-13 15:19:14 -0800 The commit-queue encountered the following flaky tests while processing attachment 76335: inspector/elements-panel-styles.html bug 50987 (author: pfeldman@chromium.org) The commit-queue is continuing to process your patch. 321483 16 76335 webkit.review.bot 2010-12-13 15:21:15 -0800 Comment on attachment 76335 Proposed Patch2 Clearing flags on attachment: 76335 Committed r73975: <http://trac.webkit.org/changeset/73975> 321484 17 webkit.review.bot 2010-12-13 15:21:22 -0800 All reviewed patches have been landed. Closing bug. 323449 18 joone 2010-12-16 15:10:09 -0800 (In reply to comment #12) > Created an attachment (id=76395) [details] > extending handleError signature -- not a regular patch > > I propose this additional patch -- switches handleError method to TextPosition1. This patch does not fix the bug itself, only helps. > > Joone, could you please try if it works for you? If it works, you can merge it with your change. I guess you will also need to convert your TextPosition0 (zero-based value) to TextPosition1 (one-based value expected in handleError), WTF::toOneBasedTextPosition can be used for this. > > Peter I tried to use TextPosition1 as follows, parser->handleError(XMLDocumentParser::fatal, errorMessage.latin1().data(), toOneBasedTextPosition(parser->textPosition()).m_line.oneBasedInt(), toOneBasedTextPosition(parser->textPosition()).m_column.oneBasedInt()); It gives us wrong error report. For example, 16 <card id="card2" title="Answer"> *17 <p>You selected: $($$name)</p> 18 </card> 19 </wml 17 line has an error, so if we use TextPosition1, it reports the following error, "This page contains the following errors: error on line 18 at column 36: A variable reference uses invalid syntax. Below is a rendering of the page up to the first error." I guess that the error should be on line 17 at column 26. If we use TextPosition0, it reports, "This page contains the following errors: error on line 17 at column 35: A variable reference uses invalid syntax. Below is a rendering of the page up to the first error." It seems right except the column number, but actually, is line 16 right if we use TextPosition0? 323484 19 peter.rybin 2010-12-16 15:43:56 -0800 Oh, I see. I gets a little more complicated that I thought. I remember I didn't quite complete with refactoring in XML parser because I noticed an inconsistency around lineNumber/columnNumber methods: in some cases their result was used as 0-based, in other cases it was clearly used as 1-based. The problem was I didn't know which is correct. So I put TextPosition there, but I retained inconsistency by adding an explicit casting code. What I did was the following: XMLDocumentParser::textPosition method expects lineNumber/columnNumber works as a wrapper for lineNumber/columnNumber methods. Since most of the code expected lineNumber/columnNumber to return 0-based values, textPosition method takes them as 0-based. Now I remember I had to add a helper method textPositionOneBased(). It returns same numbers, but treats them as 1-based; probably it should work for you. Also it would be of a great help if you could tell what XMLDocumentParser::lineNumber/XMLDocumentParser::columnNumber result actually is: 0-based or 1-based. Please add a comment in this case. However it's a bit complicated by the fact there are 2 different implementations of the parser: "XMLDocumentParserQT.cpp" and "XMLDocumentParserLibxml2.cpp" Adding annotation to at least one of these files will help fixing it in the future. > I tried to use TextPosition1 as follows, > > parser->handleError(XMLDocumentParser::fatal, errorMessage.latin1().data(), toOneBasedTextPosition(parser->textPosition()).m_line.oneBasedInt(), toOneBasedTextPosition(parser->textPosition()).m_column.oneBasedInt()); > > It gives us wrong error report. > > For example, > > 16 <card id="card2" title="Answer"> > *17 <p>You selected: $($$name)</p> > 18 </card> > 19 </wml > > 17 line has an error, so if we use TextPosition1, it reports the following error, > > "This page contains the following errors: > error on line 18 at column 36: A variable reference uses invalid syntax. > Below is a rendering of the page up to the first error." > > I guess that the error should be on line 17 at column 26. > > If we use TextPosition0, it reports, > > "This page contains the following errors: > error on line 17 at column 35: A variable reference uses invalid syntax. > Below is a rendering of the page up to the first error." > > It seems right except the column number, but actually, is line 16 right if we use TextPosition0? Column number looks quite weird, I have no idea about it. You are right, TextPosition0 should contain 16. This is because of inconsistency that I retained to keep refactoring accurate. 323486 20 peter.rybin 2010-12-16 15:46:18 -0800 > What I did was the following: > XMLDocumentParser::textPosition method expects lineNumber/columnNumber works as a wrapper for lineNumber/columnNumber methods. Since most of the code expected lineNumber/columnNumber to return 0-based values, textPosition method takes them as 0-based. Sorry, I meant: "XMLDocumentParser::textPosition method works as a wrapper for lineNumber/columnNumber methods." And thank you for your investigation. Peter 326784 21 joone 2010-12-24 17:45:52 -0800 (In reply to comment #19) > Also it would be of a great help if you could tell what XMLDocumentParser::lineNumber/XMLDocumentParser::columnNumber result actually is: 0-based or 1-based. Please add a comment in this case. However it's a bit complicated by the fact there are 2 different implementations of the parser: "XMLDocumentParserQT.cpp" and "XMLDocumentParserLibxml2.cpp" > > Adding annotation to at least one of these files will help fixing it in the future. XMLDocumentParser uses 1-based values, so I filed a new bug https://bugs.webkit.org/show_bug.cgi?id=5160 326785 22 joone 2010-12-24 17:46:29 -0800 (In reply to comment #21) > (In reply to comment #19) > > > Also it would be of a great help if you could tell what XMLDocumentParser::lineNumber/XMLDocumentParser::columnNumber result actually is: 0-based or 1-based. Please add a comment in this case. However it's a bit complicated by the fact there are 2 different implementations of the parser: "XMLDocumentParserQT.cpp" and "XMLDocumentParserLibxml2.cpp" > > > > Adding annotation to at least one of these files will help fixing it in the future. > > XMLDocumentParser uses 1-based values, so I filed a new bug https://bugs.webkit.org/show_bug.cgi?id=5160 https://bugs.webkit.org/show_bug.cgi?id=51601 326828 23 peter.rybin 2010-12-25 13:57:17 -0800 >> complicated by the fact there are 2 different implementations of the parser: >> "XMLDocumentParserQT.cpp" and "XMLDocumentParserLibxml2.cpp" > XMLDocumentParser uses 1-based values, so I filed a new bug https://bugs.webkit.org/show_bug.cgi?id=5160 To me your patch is fine. Thank you for checking with XML parser; however, to be accurate I need to know, whether it was "Libxml2" or "QT" version. (The brutal way to check would be to spoil both "XMLDocumentParserQT.cpp" and "XMLDocumentParserLibxml2.cpp" and see which one emits compile error in your build configuration). 75915 2010-12-08 09:37:37 -0800 2010-12-12 14:43:07 -0800 Proposed Patch wml.diff text/plain 1459 joone ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDQ4N2YyNi4uNzEzOWRhZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0xMi0wOCAgSm9vbmUgSHVyICA8 am9vbmVAa2xkcC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgV2ViS2l0IGZhaWxzIHRvIGNvbXBpbGUgd2hlbiBidWlsZGluZyB3aXRoIFdNTCBz dXBwb3J0IGVuYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTQyOTQzCisKKyAgICAgICAgTWFrZSBYTUxEb2N1bWVudFBhcnNlcjo6Y29sdW1uTnVt YmVyIHB1YmxpYyBmb3IgV01MRXJyb3JIYW5kbGluZy4KKworICAgICAgICBObyBuZXcgdGVzdHMg YXJlIGFkZGVkLCBiZWNhdXNlIHRoaXMgaXMganVzdCBhIGJ1aWxkIGZpeC4KKworICAgICAgICAq IGRvbS9YTUxEb2N1bWVudFBhcnNlci5oOiBNYWtlIGNvbHVtbk51bWJlcigpIHB1YmxpYy4KKwog MjAxMC0xMi0wNiAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBOb3QgcmV2aWV3ZWQuIFJvbGxpbmcgb3V0IHI3Mjk4OCBmb3IgYnJlYWtpbmcgaWZyYW1l cy4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL1hNTERvY3VtZW50UGFyc2VyLmggYi9XZWJDb3Jl L2RvbS9YTUxEb2N1bWVudFBhcnNlci5oCmluZGV4IGUzZDNjYzIuLjUwM2Q5ODMgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvZG9tL1hNTERvY3VtZW50UGFyc2VyLmgKKysrIGIvV2ViQ29yZS9kb20vWE1M RG9jdW1lbnRQYXJzZXIuaApAQCAtMTAzLDYgKzEwMyw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK ICAgICAgICAgdmlydHVhbCBib29sIHdlbGxGb3JtZWQoKSBjb25zdCB7IHJldHVybiAhbV9zYXdF cnJvcjsgfQogICAgICAgICB2aXJ0dWFsIGludCBsaW5lTnVtYmVyKCkgY29uc3Q7CiAgICAgICAg IFRleHRQb3NpdGlvbjAgdGV4dFBvc2l0aW9uKCkgY29uc3Q7CisgICAgICAgIGludCBjb2x1bW5O dW1iZXIoKSBjb25zdDsKIAogICAgICAgICBzdGF0aWMgYm9vbCBzdXBwb3J0c1hNTFZlcnNpb24o Y29uc3QgU3RyaW5nJik7CiAKQEAgLTEyOSw3ICsxMzAsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKICAgICAgICAgYm9vbCBhcHBlbmRGcmFnbWVudFNvdXJjZShjb25zdCBTdHJpbmcmKTsKIAot ICAgICAgICBpbnQgY29sdW1uTnVtYmVyKCkgY29uc3Q7CiAKICAgICAgICAgLy8gVGhpcyBtZXRo b2QgaXMgaW50cm9kdWNlZCB0byB0ZW1wb3JhcnkgbGVnYWxpemUgZXhpc3RpbmcgbGluZS9jb2x1 bW4KICAgICAgICAgLy8gY29vcmRpbmF0ZSBidWc6IGl0IGlzIGJlbGlldmVkIHRoYXQgbnVtYmVy cyB0aGF0IG9yaWdpbmFsbHkgd2VyZSB6ZXJvLWJhc2VkCg== 76335 2010-12-12 14:43:07 -0800 2010-12-13 15:21:15 -0800 Proposed Patch2 wml2.diff text/plain 2608 joone ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTUzZDA5Yi4uODc1ZDU4NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0xMi0xMiAgSm9vbmUgSHVyICA8 am9vbmVAa2xkcC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgV2ViS2l0IGZhaWxzIHRvIGNvbXBpbGUgd2hlbiBidWlsZGluZyB3aXRoIFdNTCBz dXBwb3J0IGVuYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTQyOTQzCisKKyAgICAgICAgVXNlIFRleHRQb3NpdGlvbiBpbnN0ZWFkIG9mIGxpbmVO dW1iZXIoKSBhbmQgY29sdW1OdW1iZXIoKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgYXJlIGFk ZGVkLCBiZWNhdXNlIHRoaXMgaXMganVzdCBhIGJ1aWxkIGZpeC4KKworICAgICAgICAqIGRvbS9Y TUxEb2N1bWVudFBhcnNlci5oOiBNYWtlIGxpbmVOdW1iZXIoKSBwcml2YXRlLgorICAgICAgICAq IHdtbC9XTUxFcnJvckhhbmRsaW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnJlcG9ydFdNTEVy cm9yKTogVXNlIFRleHRQb3NpdGlvbiBpbnN0ZWFkIG9mIGxpbmVOdW1iZXIoKSBhbmQgY29sdW1u TnVtYmVyKCkuCisKIDIwMTAtMTItMTIgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFhhbiBMb3Blei4KZGlmZiAtLWdpdCBhL1dl YkNvcmUvZG9tL1hNTERvY3VtZW50UGFyc2VyLmggYi9XZWJDb3JlL2RvbS9YTUxEb2N1bWVudFBh cnNlci5oCmluZGV4IGUzZDNjYzIuLjExMzcwZmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL1hN TERvY3VtZW50UGFyc2VyLmgKKysrIGIvV2ViQ29yZS9kb20vWE1MRG9jdW1lbnRQYXJzZXIuaApA QCAtMTAxLDcgKzEwMSw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICAvLyBXTUxF cnJvckhhbmRsaW5nIHVzZXMgdGhlc2UgZnVuY3Rpb25zLgogICAgICAgICB2aXJ0dWFsIGJvb2wg d2VsbEZvcm1lZCgpIGNvbnN0IHsgcmV0dXJuICFtX3Nhd0Vycm9yOyB9Ci0gICAgICAgIHZpcnR1 YWwgaW50IGxpbmVOdW1iZXIoKSBjb25zdDsKICAgICAgICAgVGV4dFBvc2l0aW9uMCB0ZXh0UG9z aXRpb24oKSBjb25zdDsKIAogICAgICAgICBzdGF0aWMgYm9vbCBzdXBwb3J0c1hNTFZlcnNpb24o Y29uc3QgU3RyaW5nJik7CkBAIC0xMTgsNiArMTE3LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog ICAgICAgICB2aXJ0dWFsIGJvb2wgaXNXYWl0aW5nRm9yU2NyaXB0cygpIGNvbnN0OwogICAgICAg ICB2aXJ0dWFsIHZvaWQgc3RvcFBhcnNpbmcoKTsKICAgICAgICAgdmlydHVhbCB2b2lkIGRldGFj aCgpOworICAgICAgICB2aXJ0dWFsIGludCBsaW5lTnVtYmVyKCkgY29uc3Q7CisgICAgICAgIGlu dCBjb2x1bW5OdW1iZXIoKSBjb25zdDsKIAogICAgICAgICAvLyBmcm9tIENhY2hlZFJlc291cmNl Q2xpZW50CiAgICAgICAgIHZpcnR1YWwgdm9pZCBub3RpZnlGaW5pc2hlZChDYWNoZWRSZXNvdXJj ZSopOwpAQCAtMTI5LDcgKzEzMCw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICBi b29sIGFwcGVuZEZyYWdtZW50U291cmNlKGNvbnN0IFN0cmluZyYpOwogCi0gICAgICAgIGludCBj b2x1bW5OdW1iZXIoKSBjb25zdDsKIAogICAgICAgICAvLyBUaGlzIG1ldGhvZCBpcyBpbnRyb2R1 Y2VkIHRvIHRlbXBvcmFyeSBsZWdhbGl6ZSBleGlzdGluZyBsaW5lL2NvbHVtbgogICAgICAgICAv LyBjb29yZGluYXRlIGJ1ZzogaXQgaXMgYmVsaWV2ZWQgdGhhdCBudW1iZXJzIHRoYXQgb3JpZ2lu YWxseSB3ZXJlIHplcm8tYmFzZWQKZGlmZiAtLWdpdCBhL1dlYkNvcmUvd21sL1dNTEVycm9ySGFu ZGxpbmcuY3BwIGIvV2ViQ29yZS93bWwvV01MRXJyb3JIYW5kbGluZy5jcHAKaW5kZXggODUzMjgy Mi4uZGMwYjhkZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS93bWwvV01MRXJyb3JIYW5kbGluZy5jcHAK KysrIGIvV2ViQ29yZS93bWwvV01MRXJyb3JIYW5kbGluZy5jcHAKQEAgLTQ4LDcgKzQ4LDcgQEAg dm9pZCByZXBvcnRXTUxFcnJvcihEb2N1bWVudCogZG9jLCBXTUxFcnJvckNvZGUgZXJyb3IpCiAg ICAgICAgIGlmICghcGFyc2VyLT53ZWxsRm9ybWVkKCkpCiAgICAgICAgICAgICByZXR1cm47CiAK LSAgICAgICAgcGFyc2VyLT5oYW5kbGVFcnJvcihYTUxEb2N1bWVudFBhcnNlcjo6ZmF0YWwsIGVy cm9yTWVzc2FnZS5sYXRpbjEoKS5kYXRhKCksIHBhcnNlci0+bGluZU51bWJlcigpLCBwYXJzZXIt PmNvbHVtbk51bWJlcigpKTsKKyAgICAgICAgcGFyc2VyLT5oYW5kbGVFcnJvcihYTUxEb2N1bWVu dFBhcnNlcjo6ZmF0YWwsIGVycm9yTWVzc2FnZS5sYXRpbjEoKS5kYXRhKCksIHBhcnNlci0+dGV4 dFBvc2l0aW9uKCkubV9saW5lLnplcm9CYXNlZEludCgpLCBwYXJzZXItPnRleHRQb3NpdGlvbigp Lm1fY29sdW1uLnplcm9CYXNlZEludCgpKTsKICAgICB9IGVsc2UgewogICAgICAgICBGcmFtZSog ZnJhbWUgPSBkb2MtPmZyYW1lKCk7CiAgICAgICAgIGlmICghZnJhbWUpCg== 76395 2010-12-13 09:36:12 -0800 2010-12-13 09:36:12 -0800 extending handleError signature -- not a regular patch extend.handleError.patch text/plain 6316 peter.rybin ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL3d0Zi90ZXh0L1RleHRQb3NpdGlvbi5oIGIvSmF2 YVNjcmlwdENvcmUvd3RmL3RleHQvVGV4dFBvc2l0aW9uLmgKaW5kZXggNjNkYzU5NC4uZTQ3YTNi YSAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvd3RmL3RleHQvVGV4dFBvc2l0aW9uLmgKKysr IGIvSmF2YVNjcmlwdENvcmUvd3RmL3RleHQvVGV4dFBvc2l0aW9uLmgKQEAgLTY2LDYgKzY2LDkg QEAgcHVibGljOgogICAgIH0KICAgICBUZXh0UG9zaXRpb24oKSB7fQogCisgICAgYm9vbCBvcGVy YXRvcj09KGNvbnN0IFRleHRQb3NpdGlvbiYgb3RoZXIpIHsgcmV0dXJuIG1fbGluZSA9PSBvdGhl ci5tX2xpbmUgJiYgbV9jb2x1bW4gPT0gb3RoZXIubV9jb2x1bW47IH0KKyAgICBib29sIG9wZXJh dG9yIT0oY29uc3QgVGV4dFBvc2l0aW9uJiBvdGhlcikgeyByZXR1cm4gISgoKnRoaXMpID09IG90 aGVyKTsgfQorCiAgICAgLy8gQSAnbWluaW11bScgdmFsdWUgb2YgcG9zaXRpb24sIHVzZWQgYXMg YSBkZWZhdWx0IHZhbHVlLgogICAgIHN0YXRpYyBUZXh0UG9zaXRpb248TlVNQkVSPiBtaW5pbXVt UG9zaXRpb24oKSB7IHJldHVybiBUZXh0UG9zaXRpb248TlVNQkVSPihOVU1CRVI6OmJhc2UoKSwg TlVNQkVSOjpiYXNlKCkpOyB9CiAKQEAgLTg5LDYgKzkyLDkgQEAgcHVibGljOgogCiAgICAgT25l QmFzZWROdW1iZXIgY29udmVydFRvT25lQmFzZWQoKSBjb25zdDsKIAorICAgIGJvb2wgb3BlcmF0 b3I9PShaZXJvQmFzZWROdW1iZXIgb3RoZXIpIHsgcmV0dXJuIG1fdmFsdWUgPT0gb3RoZXIubV92 YWx1ZTsgfQorICAgIGJvb2wgb3BlcmF0b3IhPShaZXJvQmFzZWROdW1iZXIgb3RoZXIpIHsgcmV0 dXJuICEoKCp0aGlzKSA9PSBvdGhlcik7IH0KKwogICAgIHN0YXRpYyBaZXJvQmFzZWROdW1iZXIg YmFzZSgpIHsgcmV0dXJuIDA7IH0KICAgICBzdGF0aWMgWmVyb0Jhc2VkTnVtYmVyIGJlbG93QmFz ZSgpIHsgcmV0dXJuIC0xOyB9CiAKQEAgLTEwNyw2ICsxMTMsOSBAQCBwdWJsaWM6CiAgICAgaW50 IGNvbnZlcnRBc1plcm9CYXNlZEludCgpIGNvbnN0IHsgcmV0dXJuIG1fdmFsdWUgLSAxOyB9CiAg ICAgWmVyb0Jhc2VkTnVtYmVyIGNvbnZlcnRUb1plcm9CYXNlZCgpIGNvbnN0IHsgcmV0dXJuIFpl cm9CYXNlZE51bWJlcjo6ZnJvbVplcm9CYXNlZEludChtX3ZhbHVlIC0gMSk7IH0KIAorICAgIGJv b2wgb3BlcmF0b3I9PShPbmVCYXNlZE51bWJlciBvdGhlcikgeyByZXR1cm4gbV92YWx1ZSA9PSBv dGhlci5tX3ZhbHVlOyB9CisgICAgYm9vbCBvcGVyYXRvciE9KE9uZUJhc2VkTnVtYmVyIG90aGVy KSB7IHJldHVybiAhKCgqdGhpcykgPT0gb3RoZXIpOyB9CisKICAgICBzdGF0aWMgT25lQmFzZWRO dW1iZXIgYmFzZSgpIHsgcmV0dXJuIDE7IH0KICAgICBzdGF0aWMgT25lQmFzZWROdW1iZXIgYmVs b3dCYXNlKCkgeyByZXR1cm4gMDsgfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9YTUxEb2N1 bWVudFBhcnNlci5jcHAgYi9XZWJDb3JlL2RvbS9YTUxEb2N1bWVudFBhcnNlci5jcHAKaW5kZXgg MjdiMGZkNC4uZTc0Mjc5MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9kb20vWE1MRG9jdW1lbnRQYXJz ZXIuY3BwCisrKyBiL1dlYkNvcmUvZG9tL1hNTERvY3VtZW50UGFyc2VyLmNwcApAQCAtMTQ4LDE4 ICsxNDgsMjIgQEAgdm9pZCBYTUxEb2N1bWVudFBhcnNlcjo6YXBwZW5kKGNvbnN0IFNlZ21lbnRl ZFN0cmluZyYgcykKIAogdm9pZCBYTUxEb2N1bWVudFBhcnNlcjo6aGFuZGxlRXJyb3IoRXJyb3JU eXBlIHR5cGUsIGNvbnN0IGNoYXIqIG0sIGludCBsaW5lTnVtYmVyLCBpbnQgY29sdW1uTnVtYmVy KQogewotICAgIGlmICh0eXBlID09IGZhdGFsIHx8IChtX2Vycm9yQ291bnQgPCBtYXhFcnJvcnMg JiYgbV9sYXN0RXJyb3JMaW5lICE9IGxpbmVOdW1iZXIgJiYgbV9sYXN0RXJyb3JDb2x1bW4gIT0g Y29sdW1uTnVtYmVyKSkgeworICAgIGhhbmRsZUVycm9yKHR5cGUsIG0sIFRleHRQb3NpdGlvbjEo V1RGOjpPbmVCYXNlZE51bWJlcjo6ZnJvbU9uZUJhc2VkSW50KGxpbmVOdW1iZXIpLCBXVEY6Ok9u ZUJhc2VkTnVtYmVyOjpmcm9tT25lQmFzZWRJbnQoY29sdW1uTnVtYmVyKSkpOworfQorCit2b2lk IFhNTERvY3VtZW50UGFyc2VyOjpoYW5kbGVFcnJvcihFcnJvclR5cGUgdHlwZSwgY29uc3QgY2hh ciogbSwgVGV4dFBvc2l0aW9uMSBwb3NpdGlvbikKK3sKKyAgICBpZiAodHlwZSA9PSBmYXRhbCB8 fCAobV9lcnJvckNvdW50IDwgbWF4RXJyb3JzICYmIG1fbGFzdEVycm9yUG9zaXRpb24gIT0gcG9z aXRpb24pKSB7CiAgICAgICAgIHN3aXRjaCAodHlwZSkgewogICAgICAgICAgICAgY2FzZSB3YXJu aW5nOgotICAgICAgICAgICAgICAgIG1fZXJyb3JNZXNzYWdlcyArPSBtYWtlU3RyaW5nKCJ3YXJu aW5nIG9uIGxpbmUgIiwgU3RyaW5nOjpudW1iZXIobGluZU51bWJlciksICIgYXQgY29sdW1uICIs IFN0cmluZzo6bnVtYmVyKGNvbHVtbk51bWJlciksICI6ICIsIG0pOworICAgICAgICAgICAgICAg IG1fZXJyb3JNZXNzYWdlcyArPSBtYWtlU3RyaW5nKCJ3YXJuaW5nIG9uIGxpbmUgIiwgU3RyaW5n OjpudW1iZXIocG9zaXRpb24ubV9saW5lLm9uZUJhc2VkSW50KCkpLCAiIGF0IGNvbHVtbiAiLCBT dHJpbmc6Om51bWJlcihwb3NpdGlvbi5tX2NvbHVtbi5vbmVCYXNlZEludCgpKSwgIjogIiwgbSk7 CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBjYXNlIGZhdGFsOgogICAgICAg ICAgICAgY2FzZSBub25GYXRhbDoKLSAgICAgICAgICAgICAgICBtX2Vycm9yTWVzc2FnZXMgKz0g bWFrZVN0cmluZygiZXJyb3Igb24gbGluZSAiLCBTdHJpbmc6Om51bWJlcihsaW5lTnVtYmVyKSwg IiBhdCBjb2x1bW4gIiwgU3RyaW5nOjpudW1iZXIoY29sdW1uTnVtYmVyKSwgIjogIiwgbSk7Cisg ICAgICAgICAgICAgICAgbV9lcnJvck1lc3NhZ2VzICs9IG1ha2VTdHJpbmcoImVycm9yIG9uIGxp bmUgIiwgU3RyaW5nOjpudW1iZXIocG9zaXRpb24ubV9saW5lLm9uZUJhc2VkSW50KCkpLCAiIGF0 IGNvbHVtbiAiLCBTdHJpbmc6Om51bWJlcihwb3NpdGlvbi5tX2NvbHVtbi5vbmVCYXNlZEludCgp KSwgIjogIiwgbSk7CiAgICAgICAgIH0KIAotICAgICAgICBtX2xhc3RFcnJvckxpbmUgPSBsaW5l TnVtYmVyOwotICAgICAgICBtX2xhc3RFcnJvckNvbHVtbiA9IGNvbHVtbk51bWJlcjsKKyAgICAg ICAgbV9sYXN0RXJyb3JQb3NpdGlvbiA9IHBvc2l0aW9uOwogICAgICAgICArK21fZXJyb3JDb3Vu dDsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL1hNTERvY3VtZW50UGFyc2VyLmgg Yi9XZWJDb3JlL2RvbS9YTUxEb2N1bWVudFBhcnNlci5oCmluZGV4IGUzZDNjYzIuLmE0YjM2OGEg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL1hNTERvY3VtZW50UGFyc2VyLmgKKysrIGIvV2ViQ29y ZS9kb20vWE1MRG9jdW1lbnRQYXJzZXIuaApAQCAtODYsNiArODYsNyBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAgICAgICAgIC8vIEV4cG9zZWQgZm9yIGNhbGxiYWNrczoKICAgICAgICAgZW51bSBF cnJvclR5cGUgeyB3YXJuaW5nLCBub25GYXRhbCwgZmF0YWwgfTsKICAgICAgICAgdm9pZCBoYW5k bGVFcnJvcihFcnJvclR5cGUsIGNvbnN0IGNoYXIqIG1lc3NhZ2UsIGludCBsaW5lTnVtYmVyLCBp bnQgY29sdW1uTnVtYmVyKTsKKyAgICAgICAgdm9pZCBoYW5kbGVFcnJvcihFcnJvclR5cGUsIGNv bnN0IGNoYXIqIG1lc3NhZ2UsIFRleHRQb3NpdGlvbjEgcG9zaXRpb24pOwogCiAgICAgICAgIHZv aWQgc2V0SXNYSFRNTERvY3VtZW50KGJvb2wgaXNYSFRNTCkgeyBtX2lzWEhUTUxEb2N1bWVudCA9 IGlzWEhUTUw7IH0KICAgICAgICAgYm9vbCBpc1hIVE1MRG9jdW1lbnQoKSBjb25zdCB7IHJldHVy biBtX2lzWEhUTUxEb2N1bWVudDsgfQpAQCAtMjEwLDggKzIxMSw3IEBAIHB1YmxpYzoKICAgICAg ICAgYm9vbCBtX2ZpbmlzaENhbGxlZDsKIAogICAgICAgICBpbnQgbV9lcnJvckNvdW50OwotICAg ICAgICBpbnQgbV9sYXN0RXJyb3JMaW5lOwotICAgICAgICBpbnQgbV9sYXN0RXJyb3JDb2x1bW47 CisgICAgICAgIFRleHRQb3NpdGlvbjEgbV9sYXN0RXJyb3JQb3NpdGlvbjsKICAgICAgICAgU3Ry aW5nIG1fZXJyb3JNZXNzYWdlczsKIAogICAgICAgICBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNo ZWRTY3JpcHQ+IG1fcGVuZGluZ1NjcmlwdDsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL1hNTERv Y3VtZW50UGFyc2VyTGlieG1sMi5jcHAgYi9XZWJDb3JlL2RvbS9YTUxEb2N1bWVudFBhcnNlckxp YnhtbDIuY3BwCmluZGV4IDIzZjk4ODMuLjBmNmI0YjQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9t L1hNTERvY3VtZW50UGFyc2VyTGlieG1sMi5jcHAKKysrIGIvV2ViQ29yZS9kb20vWE1MRG9jdW1l bnRQYXJzZXJMaWJ4bWwyLmNwcApAQCAtNTU3LDggKzU1Nyw3IEBAIFhNTERvY3VtZW50UGFyc2Vy OjpYTUxEb2N1bWVudFBhcnNlcihEb2N1bWVudCogZG9jdW1lbnQsIEZyYW1lVmlldyogZnJhbWVW aWV3KQogICAgICwgbV9yZXF1ZXN0aW5nU2NyaXB0KGZhbHNlKQogICAgICwgbV9maW5pc2hDYWxs ZWQoZmFsc2UpCiAgICAgLCBtX2Vycm9yQ291bnQoMCkKLSAgICAsIG1fbGFzdEVycm9yTGluZSgw KQotICAgICwgbV9sYXN0RXJyb3JDb2x1bW4oMCkKKyAgICAsIG1fbGFzdEVycm9yUG9zaXRpb24o VGV4dFBvc2l0aW9uMTo6YmVsb3dSYW5nZVBvc2l0aW9uKCkpCiAgICAgLCBtX3BlbmRpbmdTY3Jp cHQoMCkKICAgICAsIG1fc2NyaXB0U3RhcnRQb3NpdGlvbihUZXh0UG9zaXRpb24xOjpiZWxvd1Jh bmdlUG9zaXRpb24oKSkKICAgICAsIG1fcGFyc2luZ0ZyYWdtZW50KGZhbHNlKQpAQCAtNTg0LDgg KzU4Myw3IEBAIFhNTERvY3VtZW50UGFyc2VyOjpYTUxEb2N1bWVudFBhcnNlcihEb2N1bWVudEZy YWdtZW50KiBmcmFnbWVudCwgRWxlbWVudCogcGFyZW50CiAgICAgLCBtX3JlcXVlc3RpbmdTY3Jp cHQoZmFsc2UpCiAgICAgLCBtX2ZpbmlzaENhbGxlZChmYWxzZSkKICAgICAsIG1fZXJyb3JDb3Vu dCgwKQotICAgICwgbV9sYXN0RXJyb3JMaW5lKDApCi0gICAgLCBtX2xhc3RFcnJvckNvbHVtbigw KQorICAgICwgbV9sYXN0RXJyb3JQb3NpdGlvbihUZXh0UG9zaXRpb24xOjpiZWxvd1JhbmdlUG9z aXRpb24oKSkKICAgICAsIG1fcGVuZGluZ1NjcmlwdCgwKQogICAgICwgbV9zY3JpcHRTdGFydFBv c2l0aW9uKFRleHRQb3NpdGlvbjE6OmJlbG93UmFuZ2VQb3NpdGlvbigpKQogICAgICwgbV9wYXJz aW5nRnJhZ21lbnQodHJ1ZSkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL1hNTERvY3VtZW50UGFy c2VyUXQuY3BwIGIvV2ViQ29yZS9kb20vWE1MRG9jdW1lbnRQYXJzZXJRdC5jcHAKaW5kZXggZTkw NWUzMS4uZDBiZjg4ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9kb20vWE1MRG9jdW1lbnRQYXJzZXJR dC5jcHAKKysrIGIvV2ViQ29yZS9kb20vWE1MRG9jdW1lbnRQYXJzZXJRdC5jcHAKQEAgLTEwMiw4 ICsxMDIsNyBAQCBYTUxEb2N1bWVudFBhcnNlcjo6WE1MRG9jdW1lbnRQYXJzZXIoRG9jdW1lbnQq IGRvY3VtZW50LCBGcmFtZVZpZXcqIGZyYW1lVmlldykKICAgICAsIG1fcmVxdWVzdGluZ1Njcmlw dChmYWxzZSkKICAgICAsIG1fZmluaXNoQ2FsbGVkKGZhbHNlKQogICAgICwgbV9lcnJvckNvdW50 KDApCi0gICAgLCBtX2xhc3RFcnJvckxpbmUoMCkKLSAgICAsIG1fbGFzdEVycm9yQ29sdW1uKDAp CisgICAgLCBtX2xhc3RFcnJvclBvc2l0aW9uKFRleHRQb3NpdGlvbjE6OmJlbG93UmFuZ2VQb3Np dGlvbigpKQogICAgICwgbV9wZW5kaW5nU2NyaXB0KDApCiAgICAgLCBtX3NjcmlwdFN0YXJ0UG9z aXRpb24oVGV4dFBvc2l0aW9uMTo6YmVsb3dSYW5nZVBvc2l0aW9uKCkpCiAgICAgLCBtX3BhcnNp bmdGcmFnbWVudChmYWxzZSkKQEAgLTEyOSw4ICsxMjgsNyBAQCBYTUxEb2N1bWVudFBhcnNlcjo6 WE1MRG9jdW1lbnRQYXJzZXIoRG9jdW1lbnRGcmFnbWVudCogZnJhZ21lbnQsIEVsZW1lbnQqIHBh cmVudAogICAgICwgbV9yZXF1ZXN0aW5nU2NyaXB0KGZhbHNlKQogICAgICwgbV9maW5pc2hDYWxs ZWQoZmFsc2UpCiAgICAgLCBtX2Vycm9yQ291bnQoMCkKLSAgICAsIG1fbGFzdEVycm9yTGluZSgw KQotICAgICwgbV9sYXN0RXJyb3JDb2x1bW4oMCkKKyAgICAsIG1fbGFzdEVycm9yUG9zaXRpb24o VGV4dFBvc2l0aW9uMTo6YmVsb3dSYW5nZVBvc2l0aW9uKCkpCiAgICAgLCBtX3BlbmRpbmdTY3Jp cHQoMCkKICAgICAsIG1fc2NyaXB0U3RhcnRQb3NpdGlvbihUZXh0UG9zaXRpb24xOjpiZWxvd1Jh bmdlUG9zaXRpb24oKSkKICAgICAsIG1fcGFyc2luZ0ZyYWdtZW50KHRydWUpCg==