Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2570)

Unified Diff: public/common/WebCString.h

Issue 15079005: Create a minimal webkit_common static library for use in browser process (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: public/common/WebCString.h
diff --git a/public/platform/WebCString.h b/public/common/WebCString.h
similarity index 82%
copy from public/platform/WebCString.h
copy to public/common/WebCString.h
index 7eb6fc1463a51890fd7f18561c77b01b1b067944..2e3fede28aeb6377b2eac4320e69aa488a927237 100644
--- a/public/platform/WebCString.h
+++ b/public/common/WebCString.h
@@ -31,12 +31,10 @@
#ifndef WebCString_h
#define WebCString_h
-#include "WebCommon.h"
+#include "WebCommonExport.h"
#include "WebPrivatePtr.h"
-#if WEBKIT_IMPLEMENTATION
-#include <wtf/Forward.h>
-#else
+#if !defined(INSIDE_WEBKIT)
#include <string>
#endif
@@ -49,7 +47,7 @@ namespace WebKit {
class WebString;
-// A single-byte string container with unspecified encoding. It is
+// A single-byte string container with unspecified encoding. It is
// inexpensive to copy a WebCString object.
//
// WARNING: It is not safe to pass a WebCString across threads!!!
@@ -76,24 +74,24 @@ public:
// Returns 0 if both strings are equals, a value greater than zero if the
// first character that does not match has a greater value in this string
// than in |other|, or a value less than zero to indicate the opposite.
- WEBKIT_EXPORT int compare(const WebCString& other) const;
+ BLINK_COMMON_EXPORT int compare(const WebCString& other) const;
- WEBKIT_EXPORT void reset();
- WEBKIT_EXPORT void assign(const WebCString&);
- WEBKIT_EXPORT void assign(const char* data, size_t len);
+ BLINK_COMMON_EXPORT void reset();
+ BLINK_COMMON_EXPORT void assign(const WebCString&);
+ BLINK_COMMON_EXPORT void assign(const char* data, size_t len);
- WEBKIT_EXPORT size_t length() const;
- WEBKIT_EXPORT const char* data() const;
+ BLINK_COMMON_EXPORT size_t length() const;
+ BLINK_COMMON_EXPORT const char* data() const;
bool isEmpty() const { return !length(); }
bool isNull() const { return m_private.isNull(); }
- WEBKIT_EXPORT WebString utf16() const;
+ BLINK_COMMON_EXPORT WebString utf16() const;
-#if WEBKIT_IMPLEMENTATION
- WebCString(const WTF::CString&);
- WebCString& operator=(const WTF::CString&);
- operator WTF::CString() const;
+#if defined(INSIDE_WEBKIT)
+ BLINK_COMMON_EXPORT WebCString(const WTF::CString&);
+ BLINK_COMMON_EXPORT WebCString& operator=(const WTF::CString&);
+ BLINK_COMMON_EXPORT operator WTF::CString() const;
#else
WebCString(const std::string& s)
{

Powered by Google App Engine
This is Rietveld 408576698