diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp b/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp index ea5b443..10a8dbf 100644 --- a/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp +++ b/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp @@ -23,12 +23,13 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#include "config.h" #include "DrawingArea.h" // Subclasses #include "ChunkedUpdateDrawingArea.h" -#ifdef __APPLE__ +#if PLATFORM(MAC) || PLATFORM(WIN) #include "DrawingAreaImpl.h" #endif @@ -52,7 +53,7 @@ PassRefPtr<DrawingArea> DrawingArea::create(WebPage* webPage, const WebPageCreat break; case DrawingAreaInfo::Impl: -#ifdef __APPLE__ +#if PLATFORM(MAC) || PLATFORM(WIN) return DrawingAreaImpl::create(webPage, parameters); #else return 0; |