--- a/webengine/osswebengine/WebCore/platform/symbian/FontSymbian.cpp Thu Aug 19 10:58:56 2010 +0300
+++ b/webengine/osswebengine/WebCore/platform/symbian/FontSymbian.cpp Tue Aug 31 16:17:46 2010 +0300
@@ -25,7 +25,7 @@
#include "IntRect.h"
#include "WebCoreGraphicsContext.h"
#include <e32std.h>
-#include <BITSTD.H>
+#include <bitstd.h>
#include <gdi.h>
#include "StaticObjectsContainer.h"
#include "PictographSymbian.h"
@@ -65,9 +65,8 @@
PlatformFontCache* cache = StaticObjectsContainer::instance()->fontCache();
CFont* font = cache->zoomedFont(m_fontDescription, cache->fontZoomFactor());
// RenderBlock::layoutColumns create a 0 platform context to do a faked paint
-
// during layout - weird stuff :)
- if (!graphicsContext || !graphicsContext->platformContext())
+ if (!graphicsContext->platformContext())
return;
CFbsBitGc& bitgc = graphicsContext->platformContext()->gc();