mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-30 02:54:47 +01:00
122397acfc
Changes to the CEF public API: - Add base::Bind, base::Callback, base::Lock, base::WeakPtr, scoped_refptr, scoped_ptr and supporting types. - Add include/wrapper/cef_closure_task.h helpers for converting a base::Closure to a CefTask. - Change CefRefPtr to extend scoped_refptr. -- Change CefBase method signatures to match RefCountedThreadSafeBase. - Change IMPLEMENT_REFCOUNTING to use base::AtomicRefCount*. -- Remove the CefAtomic* functions. -- IMPLEMENT_REFCOUNTING now enforces via a compile-time error that the correct class name was passed to the macro. - Change IMPLEMENT_LOCKING to use base::Lock. -- Remove the CefCriticalSection class. -- Deprecate the IMPLEMENT_LOCKING macro. -- base::Lock will DCHECK() in Debug builds if lock usage is reentrant. - Move include/internal/cef_tuple.h to include/base/cef_tuple.h. - Allow an empty |callback| parameter passed to CefBeginTracing. Changes to the CEF implementation: - Fix incorrect names passed to the IMPLEMENT_REFCOUNTING macro. - Fix instances of reentrant locking in the CefXmlObject and CefRequest implementations. - Remove use of the IMPLEMENT_LOCKING macro. Changes to cef_unittests: - Add tests/unittests/chromium_includes.h and always include it first from unit test .cc files to avoid name conflicts with Chromium types. - Fix wrong header include ordering. - Remove use of the IMPLEMENT_LOCKING macro. Changes to cefclient and cefsimple: - Use base::Bind and cef_closure_task.h instead of NewCefRunnable*. - Remove use of the IMPEMENT_LOCKING macro. - Fix incorrect/unnecessary locking. - Add additional runtime thread checks. - Windows: Perform actions on the UI thread instead of the main thread when running in multi-threaded-message-loop mode to avoid excessive locking. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1769 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
74 lines
2.6 KiB
C++
74 lines
2.6 KiB
C++
// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
|
|
// reserved. Use of this source code is governed by a BSD-style license that
|
|
// can be found in the LICENSE file.
|
|
|
|
#ifndef CEF_LIBCEF_BROWSER_XML_READER_IMPL_H_
|
|
#define CEF_LIBCEF_BROWSER_XML_READER_IMPL_H_
|
|
#pragma once
|
|
|
|
#include <libxml/xmlreader.h>
|
|
#include <sstream>
|
|
|
|
#include "include/cef_xml_reader.h"
|
|
#include "base/threading/platform_thread.h"
|
|
|
|
// Implementation of CefXmlReader
|
|
class CefXmlReaderImpl : public CefXmlReader {
|
|
public:
|
|
CefXmlReaderImpl();
|
|
~CefXmlReaderImpl();
|
|
|
|
// Initialize the reader context.
|
|
bool Initialize(CefRefPtr<CefStreamReader> stream,
|
|
EncodingType encodingType, const CefString& URI);
|
|
|
|
virtual bool MoveToNextNode() OVERRIDE;
|
|
virtual bool Close() OVERRIDE;
|
|
virtual bool HasError() OVERRIDE;
|
|
virtual CefString GetError() OVERRIDE;
|
|
virtual NodeType GetType() OVERRIDE;
|
|
virtual int GetDepth() OVERRIDE;
|
|
virtual CefString GetLocalName() OVERRIDE;
|
|
virtual CefString GetPrefix() OVERRIDE;
|
|
virtual CefString GetQualifiedName() OVERRIDE;
|
|
virtual CefString GetNamespaceURI() OVERRIDE;
|
|
virtual CefString GetBaseURI() OVERRIDE;
|
|
virtual CefString GetXmlLang() OVERRIDE;
|
|
virtual bool IsEmptyElement() OVERRIDE;
|
|
virtual bool HasValue() OVERRIDE;
|
|
virtual CefString GetValue() OVERRIDE;
|
|
virtual bool HasAttributes() OVERRIDE;
|
|
virtual size_t GetAttributeCount() OVERRIDE;
|
|
virtual CefString GetAttribute(int index) OVERRIDE;
|
|
virtual CefString GetAttribute(const CefString& qualifiedName) OVERRIDE;
|
|
virtual CefString GetAttribute(const CefString& localName,
|
|
const CefString& namespaceURI) OVERRIDE;
|
|
virtual CefString GetInnerXml() OVERRIDE;
|
|
virtual CefString GetOuterXml() OVERRIDE;
|
|
virtual int GetLineNumber() OVERRIDE;
|
|
virtual bool MoveToAttribute(int index) OVERRIDE;
|
|
virtual bool MoveToAttribute(const CefString& qualifiedName) OVERRIDE;
|
|
virtual bool MoveToAttribute(const CefString& localName,
|
|
const CefString& namespaceURI) OVERRIDE;
|
|
virtual bool MoveToFirstAttribute() OVERRIDE;
|
|
virtual bool MoveToNextAttribute() OVERRIDE;
|
|
virtual bool MoveToCarryingElement() OVERRIDE;
|
|
|
|
// Add another line to the error string.
|
|
void AppendError(const CefString& error_str);
|
|
|
|
// Verify that the reader exists and is being accessed from the correct
|
|
// thread.
|
|
bool VerifyContext();
|
|
|
|
protected:
|
|
base::PlatformThreadId supported_thread_id_;
|
|
CefRefPtr<CefStreamReader> stream_;
|
|
xmlTextReaderPtr reader_;
|
|
std::stringstream error_buf_;
|
|
|
|
IMPLEMENT_REFCOUNTING(CefXmlReaderImpl);
|
|
};
|
|
|
|
#endif // CEF_LIBCEF_BROWSER_XML_READER_IMPL_H_
|