c6c00b32da
Reason for revert: Breaks downstream gtest usage. Original issue's description: > Remove the rtc_relative_path GYP variable and similar defines > > This is a reland of https://codereview.webrtc.org/1903553003/ but with > the SRTP changes removed, since they're needed downstream. > > The defines that can be used to alter the include paths for Expat and gtest > are no longer needed in WebRTC or Chromium. Remove them to simplify GYP. > > Removed defines: > EXPAT_RELATIVE_PATH > GTEST_RELATIVE_PATH > > They're all set in the Chromium build so this shouldn't affect Chromium: > https://code.google.com/p/chromium/codesearch#chromium/src/third_party/libjingle/libjingle.gyp > > BUG=webrtc:4256 > NOTRY=True > NOPRESUBMIT=True > TBR=perkj@webrtc.org > > Committed: https://crrev.com/081254f2c62037d016f9fc961764c6f01cb095da > Cr-Commit-Position: refs/heads/master@{#12536} TBR=perkj@webrtc.org,kjellander@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:4256 Review-Url: https://codereview.webrtc.org/1945803003 Cr-Commit-Position: refs/heads/master@{#12622}
90 lines
2.0 KiB
C++
90 lines
2.0 KiB
C++
/*
|
|
* Copyright 2004 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/libjingle/xmpp/xmppstanzaparser.h"
|
|
|
|
#include "webrtc/libjingle/xmllite/xmlelement.h"
|
|
#include "webrtc/libjingle/xmpp/constants.h"
|
|
#include "webrtc/base/common.h"
|
|
#ifdef EXPAT_RELATIVE_PATH
|
|
#include "expat.h"
|
|
#else
|
|
#include "third_party/expat/v2_0_1/Source/lib/expat.h"
|
|
#endif
|
|
|
|
namespace buzz {
|
|
|
|
XmppStanzaParser::XmppStanzaParser(XmppStanzaParseHandler *psph) :
|
|
psph_(psph),
|
|
innerHandler_(this),
|
|
parser_(&innerHandler_),
|
|
depth_(0),
|
|
builder_() {
|
|
}
|
|
|
|
void
|
|
XmppStanzaParser::Reset() {
|
|
parser_.Reset();
|
|
depth_ = 0;
|
|
builder_.Reset();
|
|
}
|
|
|
|
void
|
|
XmppStanzaParser::IncomingStartElement(
|
|
XmlParseContext * pctx, const char * name, const char ** atts) {
|
|
if (depth_++ == 0) {
|
|
XmlElement * pelStream = XmlBuilder::BuildElement(pctx, name, atts);
|
|
if (pelStream == NULL) {
|
|
pctx->RaiseError(XML_ERROR_SYNTAX);
|
|
return;
|
|
}
|
|
psph_->StartStream(pelStream);
|
|
delete pelStream;
|
|
return;
|
|
}
|
|
|
|
builder_.StartElement(pctx, name, atts);
|
|
}
|
|
|
|
void
|
|
XmppStanzaParser::IncomingCharacterData(
|
|
XmlParseContext * pctx, const char * text, int len) {
|
|
if (depth_ > 1) {
|
|
builder_.CharacterData(pctx, text, len);
|
|
}
|
|
}
|
|
|
|
void
|
|
XmppStanzaParser::IncomingEndElement(
|
|
XmlParseContext * pctx, const char * name) {
|
|
if (--depth_ == 0) {
|
|
psph_->EndStream();
|
|
return;
|
|
}
|
|
|
|
builder_.EndElement(pctx, name);
|
|
|
|
if (depth_ == 1) {
|
|
XmlElement *element = builder_.CreateElement();
|
|
psph_->Stanza(element);
|
|
delete element;
|
|
}
|
|
}
|
|
|
|
void
|
|
XmppStanzaParser::IncomingError(
|
|
XmlParseContext * pctx, XML_Error errCode) {
|
|
RTC_UNUSED(pctx);
|
|
RTC_UNUSED(errCode);
|
|
psph_->XmlError();
|
|
}
|
|
|
|
}
|