diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-22 15:37:06 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-07-27 10:20:25 +0100 |
| commit | 967717af5423377c967781471ee106e2bb4e11c8 (patch) | |
| tree | 1e701dc0a12f7f07cce1df4a7681717de77a211b /WebCore/platform/graphics/win | |
| parent | dcc30a9fca45f634b1d3a12b276d3a0ccce99fc3 (diff) | |
| download | external_webkit-967717af5423377c967781471ee106e2bb4e11c8.zip external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.gz external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.bz2 | |
Merge WebKit at r63859 : Initial merge by git.
Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
Diffstat (limited to 'WebCore/platform/graphics/win')
| -rw-r--r-- | WebCore/platform/graphics/win/GraphicsLayerCACF.cpp | 2 | ||||
| -rw-r--r-- | WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/win/GraphicsLayerCACF.cpp b/WebCore/platform/graphics/win/GraphicsLayerCACF.cpp index 20d76ef..96ac0c1 100644 --- a/WebCore/platform/graphics/win/GraphicsLayerCACF.cpp +++ b/WebCore/platform/graphics/win/GraphicsLayerCACF.cpp @@ -669,7 +669,7 @@ void GraphicsLayerCACF::updateLayerDrawsContent() if (m_drawsContent) m_layer->setNeedsDisplay(); else - m_layer->setContents(nil); + m_layer->setContents(0); updateDebugIndicators(); } diff --git a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp index aa7bdd4..e0ecf78 100644 --- a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp +++ b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp @@ -46,6 +46,7 @@ #include "StringHash.h" #include "TimeRanges.h" #include "Timer.h" +#include <AssertMacros.h> #include <CoreGraphics/CGContext.h> #include <Wininet.h> #include <wtf/CurrentTime.h> |