2011-03-16 Adam Barth <abarth@webkit.org>
Reviewed by Eric Seidel.
WebCore GYP build should build platform/
https://bugs.webkit.org/show_bug.cgi?id=56430
Adding platform/ to the GYP build required disabling
ALWAYS_SEARCH_USER_PATHS, which in turn required fixing some latent
style issues. I suspect we'll end up excluding some of these files
from the build in the final analysis, but we might as well fix the
style errors while we're here.
* bindings/js/JSMainThreadExecState.h:
* bindings/js/ScheduledAction.h:
* css/CSSPrimitiveValueCache.cpp:
* gyp/WebCore.gyp:
* platform/KillRingNone.cpp:
(WebCore::KillRing::append):
(WebCore::KillRing::prepend):
* platform/graphics/ContextShadow.h:
* platform/graphics/gpu/LoopBlinnPathProcessor.cpp:
(WebCore::LoopBlinnPathProcessor::buildContours):
(WebCore::TessellationState::combineCallback):
* platform/graphics/gpu/PODRedBlackTree.h:
(WebCore::PODRedBlackTree::updateNode):
(WebCore::PODRedBlackTree::logIfVerbose):
* platform/graphics/opengl/TextureMapperGL.cpp:
* platform/graphics/opengl/TextureMapperGL.h:
* platform/graphics/texmap/TextureMapper.h:
(WebCore::BitmapTexture::save):
(WebCore::TextureMapper::paintToTarget):
* platform/graphics/texmap/TextureMapperNode.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@81230 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 5a4fb0b..792eae1 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,37 @@
+2011-03-16 Adam Barth <abarth@webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ WebCore GYP build should build platform/
+ https://bugs.webkit.org/show_bug.cgi?id=56430
+
+ Adding platform/ to the GYP build required disabling
+ ALWAYS_SEARCH_USER_PATHS, which in turn required fixing some latent
+ style issues. I suspect we'll end up excluding some of these files
+ from the build in the final analysis, but we might as well fix the
+ style errors while we're here.
+
+ * bindings/js/JSMainThreadExecState.h:
+ * bindings/js/ScheduledAction.h:
+ * css/CSSPrimitiveValueCache.cpp:
+ * gyp/WebCore.gyp:
+ * platform/KillRingNone.cpp:
+ (WebCore::KillRing::append):
+ (WebCore::KillRing::prepend):
+ * platform/graphics/ContextShadow.h:
+ * platform/graphics/gpu/LoopBlinnPathProcessor.cpp:
+ (WebCore::LoopBlinnPathProcessor::buildContours):
+ (WebCore::TessellationState::combineCallback):
+ * platform/graphics/gpu/PODRedBlackTree.h:
+ (WebCore::PODRedBlackTree::updateNode):
+ (WebCore::PODRedBlackTree::logIfVerbose):
+ * platform/graphics/opengl/TextureMapperGL.cpp:
+ * platform/graphics/opengl/TextureMapperGL.h:
+ * platform/graphics/texmap/TextureMapper.h:
+ (WebCore::BitmapTexture::save):
+ (WebCore::TextureMapper::paintToTarget):
+ * platform/graphics/texmap/TextureMapperNode.h:
+
2011-03-15 Philippe Normand <pnormand@igalia.com>
Reviewed by Eric Carlson.
diff --git a/Source/WebCore/bindings/js/JSMainThreadExecState.h b/Source/WebCore/bindings/js/JSMainThreadExecState.h
index fb01000..436de5e 100644
--- a/Source/WebCore/bindings/js/JSMainThreadExecState.h
+++ b/Source/WebCore/bindings/js/JSMainThreadExecState.h
@@ -26,7 +26,7 @@
#ifndef JSMainThreadExecState_h
#define JSMainThreadExecState_h
-#include <JSDOMBinding.h>
+#include "JSDOMBinding.h"
#ifndef NDEBUG
#include <wtf/MainThread.h>
#endif
diff --git a/Source/WebCore/bindings/js/ScheduledAction.h b/Source/WebCore/bindings/js/ScheduledAction.h
index c4b3edf..3adc185 100644
--- a/Source/WebCore/bindings/js/ScheduledAction.h
+++ b/Source/WebCore/bindings/js/ScheduledAction.h
@@ -20,8 +20,8 @@
#ifndef ScheduledAction_h
#define ScheduledAction_h
+#include "JSDOMBinding.h"
#include "PlatformString.h"
-#include <JSDOMBinding.h>
#include <collector/handles/Global.h>
#include <runtime/JSCell.h>
#include <wtf/PassOwnPtr.h>
diff --git a/Source/WebCore/css/CSSPrimitiveValueCache.cpp b/Source/WebCore/css/CSSPrimitiveValueCache.cpp
index 6b3eebe..5c7a4c0 100644
--- a/Source/WebCore/css/CSSPrimitiveValueCache.cpp
+++ b/Source/WebCore/css/CSSPrimitiveValueCache.cpp
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <config.h>
+#include "config.h"
#include "CSSPrimitiveValueCache.h"
namespace WebCore {
diff --git a/Source/WebCore/gyp/WebCore.gyp b/Source/WebCore/gyp/WebCore.gyp
index 81adb48..fc59307 100644
--- a/Source/WebCore/gyp/WebCore.gyp
+++ b/Source/WebCore/gyp/WebCore.gyp
@@ -16,6 +16,7 @@
# FIXME: Add 'Copy Inspector Resources',
],
'include_dirs': [
+ '<(DEPTH)/WebCore',
'<(DEPTH)/WebCore/icu',
'<(DEPTH)/WebCore/ForwardingHeaders',
'<(PRODUCT_DIR)/usr/local/include',
@@ -60,6 +61,10 @@
['include', 'mathml/'],
['include', 'notifications/'],
['include', 'page/'],
+ ['include', 'platform/'],
+ # FIXME: Figure out how to build these mm files.
+ ['exclude', 'page/mac/[^/]+.mm$'],
+ ['exclude', 'platform/mac/[^/]+.mm$'],
['exclude', 'bindings/[^/]+/'],
['include', 'bindings/generic/'],
@@ -67,12 +72,25 @@
# FIXME: Build bindings/objc/
# ['include', 'bindings/objc/'],
['exclude', 'bindings/js/ScriptControllerMac\\.mm$'],
+ ['include', 'bindings/objc/DOMInternal\\.h$'],
# FIXME: Figure out how to store these patterns in a variable.
- ['exclude', '(android|brew|cairo|ca|chromium|curl|efl|freetype|fftw|gstreamer|gtk|haiku|linux|mac|mkl|opengl|openvg|opentype|pango|posix|qt|soup|symbian|texmap|iphone|win|wince|wx)/'],
+ ['exclude', '(android|brew|cairo|chromium|curl|efl|freetype|fftw|gstreamer|gtk|haiku|linux|mkl|openvg|pango|posix|qt|skia|soup|symbian|texmap|iphone|win|wince|wx)/'],
['exclude', '(Android|Brew|Cairo|CF|CG|Curl|Chromium|Efl|Haiku|Gtk|JSC|Linux|OpenType|POSIX|Posix|Qt|Safari|Soup|Symbian|V8|Win|WinCE|Wx)\\.(cpp|mm?)$'],
+ ['exclude', 'platform/image-decoders/'],
+ ['exclude', 'platform/image-encoders/'],
+
+ ['exclude', 'platform/KillRingNone\\.cpp$'],
['exclude', 'platform/graphics/cg/FontPlatformData\\.h$'],
+ # FIXME: Consider excluding GL as a suffix.
+ ['exclude', 'platform/graphics/opengl/TextureMapperGL\\.cpp$'],
+ ['exclude', 'platform/graphics/opentype/OpenTypeUtilities\\.(cpp|h)$'],
+ ['exclude', 'platform/graphics/ImageSource\\.cpp$'],
+ ['exclude', 'platform/text/LocalizedNumberICU\\.cpp$'],
+ ['exclude', 'platform/text/LocalizedNumberNone\\.cpp$'],
+ ['exclude', 'platform/text/TextEncodingDetectorNone\\.cpp$'],
+ ['exclude', 'platform/text/Hyphenation\\.cpp$'],
['exclude', 'AllInOne\\.cpp$'],
],
@@ -118,6 +136,7 @@
# used only by this project.
'GCC_PREFIX_HEADER': '<(DEPTH)/WebCore/WebCorePrefix.h',
'INFOPLIST_FILE': '<(DEPTH)/WebCore/Info.plist',
+ 'ALWAYS_SEARCH_USER_PATHS': 'NO',
},
}],
],
diff --git a/Source/WebCore/platform/KillRingNone.cpp b/Source/WebCore/platform/KillRingNone.cpp
index 35098aa..310aa08 100644
--- a/Source/WebCore/platform/KillRingNone.cpp
+++ b/Source/WebCore/platform/KillRingNone.cpp
@@ -28,11 +28,11 @@
namespace WebCore {
-void KillRing::append(const String& string)
+void KillRing::append(const String&)
{
}
-void KillRing::prepend(const String& string)
+void KillRing::prepend(const String&)
{
}
diff --git a/Source/WebCore/platform/graphics/ContextShadow.h b/Source/WebCore/platform/graphics/ContextShadow.h
index c0571f0..850d489 100644
--- a/Source/WebCore/platform/graphics/ContextShadow.h
+++ b/Source/WebCore/platform/graphics/ContextShadow.h
@@ -32,7 +32,7 @@
#include "Color.h"
#include "FloatRect.h"
#include "IntRect.h"
-#include "RefCounted.h"
+#include <wtf/RefCounted.h>
#if PLATFORM(CAIRO)
typedef struct _cairo cairo_t;
diff --git a/Source/WebCore/platform/graphics/gpu/LoopBlinnPathProcessor.cpp b/Source/WebCore/platform/graphics/gpu/LoopBlinnPathProcessor.cpp
index 5439885..a96213c 100644
--- a/Source/WebCore/platform/graphics/gpu/LoopBlinnPathProcessor.cpp
+++ b/Source/WebCore/platform/graphics/gpu/LoopBlinnPathProcessor.cpp
@@ -42,6 +42,8 @@
#include <algorithm>
#include <wtf/Assertions.h>
#include <wtf/FastMalloc.h>
+#include <wtf/UnusedParam.h>
+
#if USE(SKIA)
#include "SkGeometry.h"
@@ -701,6 +703,7 @@
}
} while (verb != SkPath::kDone_Verb);
#else // !USE(SKIA)
+ UNUSED_PARAM(path);
// Must port to your platform.
ASSERT_NOT_REACHED();
#endif
@@ -1145,6 +1148,8 @@
GLfloat weight[4], void** outData,
void* polygonData)
{
+ UNUSED_PARAM(vertexData);
+ UNUSED_PARAM(weight);
TessellationState* state = static_cast<TessellationState*>(polygonData);
GLdouble* outVertex = static_cast<GLdouble*>(fastMalloc(3 * sizeof(GLdouble)));
state->allocatedPointers.append(outVertex);
diff --git a/Source/WebCore/platform/graphics/gpu/PODRedBlackTree.h b/Source/WebCore/platform/graphics/gpu/PODRedBlackTree.h
index bd08988..7dd9ddd 100644
--- a/Source/WebCore/platform/graphics/gpu/PODRedBlackTree.h
+++ b/Source/WebCore/platform/graphics/gpu/PODRedBlackTree.h
@@ -257,7 +257,7 @@
// properly update such summary information based only on the values
// in the left and right children. This method should return true if
// the node's summary information changed.
- virtual bool updateNode(Node* node) { return false; }
+ virtual bool updateNode(Node*) { return false; }
//----------------------------------------------------------------------
// Generic binary search tree operations
@@ -713,7 +713,7 @@
}
#ifdef NDEBUG
- void logIfVerbose(const char* output) const { }
+ void logIfVerbose(const char*) const { }
#else
void logIfVerbose(const char* output) const
{
diff --git a/Source/WebCore/platform/graphics/opengl/TextureMapperGL.cpp b/Source/WebCore/platform/graphics/opengl/TextureMapperGL.cpp
index 2e2082d..9765937 100644
--- a/Source/WebCore/platform/graphics/opengl/TextureMapperGL.cpp
+++ b/Source/WebCore/platform/graphics/opengl/TextureMapperGL.cpp
@@ -21,11 +21,11 @@
#include "TextureMapperGL.h"
#include "GraphicsContext.h"
-#include "HashMap.h"
#include "Image.h"
-#include "PassRefPtr.h"
-#include "RefCounted.h"
#include "Timer.h"
+#include <wtf/HashMap.h>
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefCounted.h>
#if defined(TEXMAP_OPENGL_ES_2)
#include <GLES2/gl2.h>
diff --git a/Source/WebCore/platform/graphics/opengl/TextureMapperGL.h b/Source/WebCore/platform/graphics/opengl/TextureMapperGL.h
index 8035abf..92c5198 100644
--- a/Source/WebCore/platform/graphics/opengl/TextureMapperGL.h
+++ b/Source/WebCore/platform/graphics/opengl/TextureMapperGL.h
@@ -24,8 +24,8 @@
#include "FloatQuad.h"
#include "IntSize.h"
+#include "TextureMapper.h"
#include "TransformationMatrix.h"
-#include "texmap/TextureMapper.h"
namespace WebCore {
diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapper.h b/Source/WebCore/platform/graphics/texmap/TextureMapper.h
index 589fda1..8e46e3c 100644
--- a/Source/WebCore/platform/graphics/texmap/TextureMapper.h
+++ b/Source/WebCore/platform/graphics/texmap/TextureMapper.h
@@ -31,6 +31,7 @@
#include "IntRect.h"
#include "IntSize.h"
#include "TransformationMatrix.h"
+#include <wtf/UnusedParam.h>
/*
TextureMapper is a mechanism that enables hardware acceleration of CSS animations (accelerated compositing) without
@@ -68,7 +69,7 @@
return beginPaint(IntRect(0, 0, size().width(), size().height()));
}
virtual void setContentsToImage(Image*) = 0;
- virtual bool save(const String& filename) { return false; }
+ virtual bool save(const String&) { return false; }
inline void lock() { ++m_lockCount; }
inline void unlock() { --m_lockCount; }
@@ -101,6 +102,7 @@
virtual void bindSurface(BitmapTexture* surface) = 0;
virtual void paintToTarget(const BitmapTexture& texture, const IntSize&, const TransformationMatrix& matrix, float opacity, const IntRect& visibleRect)
{
+ UNUSED_PARAM(visibleRect);
drawTexture(texture, IntRect(0, 0, texture.contentSize().width(), texture.contentSize().height()), matrix, opacity, 0);
}
diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperNode.h b/Source/WebCore/platform/graphics/texmap/TextureMapperNode.h
index 9694043..86de532 100644
--- a/Source/WebCore/platform/graphics/texmap/TextureMapperNode.h
+++ b/Source/WebCore/platform/graphics/texmap/TextureMapperNode.h
@@ -20,19 +20,19 @@
#ifndef TextureMapperNode_h
#define TextureMapperNode_h
-#include "CurrentTime.h"
#include "FloatRect.h"
#include "GraphicsContext.h"
#include "GraphicsLayer.h"
-#include "HashMap.h"
#include "Image.h"
-#include "RefCounted.h"
#include "TextureMapper.h"
#include "TextureMapperPlatformLayer.h"
#include "Timer.h"
#include "TransformOperations.h"
#include "TranslateTransformOperation.h"
#include "UnitBezier.h"
+#include <wtf/CurrentTime.h>
+#include <wtf/HashMap.h>
+#include <wtf/RefCounted.h>
namespace WebCore {
