From cad810f21b803229eb11403f9209855525a25d57 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Fri, 6 May 2011 11:45:16 +0100
Subject: Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
---
 WebKit/chromium/README | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'WebKit/chromium/README')

diff --git a/WebKit/chromium/README b/WebKit/chromium/README
index 9173454..ecac503 100644
--- a/WebKit/chromium/README
+++ b/WebKit/chromium/README
@@ -27,6 +27,22 @@ DEFINES
   defined when building the 'src' directory, and it should also be defined by
   the consumer to ensure proper linkage to the shared library.
 
+  WEBKIT_API is defined for platforms (e.g., Windows) that require additional
+  annotations on functions and methods, which should be exported from WebKit
+  when it is built as a DLL.  In general, this includes all public methods
+  unless the methods are defined inline, marked pure virtual, or contained
+  within a WEBKIT_IMPLEMENTATION section.  Also, any private method called by a
+  public inline-defined method should be annotated with WEBKIT_API.  WEBKIT_API
+  is not used to export whole classes.
+
+  WEBKIT_USING_SKIA is defined when using Skia as the graphics library.
+
+  WEBKIT_USING_CG is defined when using CG as the graphics library.
+
+  WEBKIT_USING_V8 is defined when using V8 as the JavaScript library.
+
+  WEBKIT_USING_JSC is defined when using JSC as the JavaScript library.
+
 
 BASIC TYPES
 
-- 
cgit v1.1