Changeset 81230 in webkit

Timestamp:

Mar 16, 2011 1:58:30 AM (13 years ago)

Author:

abarth@webkit.org

Message:

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSMainThreadExecState.h (modified) (1 diff)
• bindings/js/ScheduledAction.h (modified) (1 diff)
• css/CSSPrimitiveValueCache.cpp (modified) (1 diff)
• gyp/WebCore.gyp (modified) (4 diffs)
• platform/KillRingNone.cpp (modified) (1 diff)
• platform/graphics/ContextShadow.h (modified) (1 diff)
• platform/graphics/gpu/LoopBlinnPathProcessor.cpp (modified) (3 diffs)
• platform/graphics/gpu/PODRedBlackTree.h (modified) (2 diffs)
• platform/graphics/opengl/TextureMapperGL.cpp (modified) (1 diff)
• platform/graphics/opengl/TextureMapperGL.h (modified) (1 diff)
• platform/graphics/texmap/TextureMapper.h (modified) (3 diffs)
• platform/graphics/texmap/TextureMapperNode.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/bindings/js/JSMainThreadExecState.h

@@ -27 +27 @@
 #define JSMainThreadExecState_h
 
-#include <JSDOMBinding.h>
+#include "JSDOMBinding.h"
 #ifndef NDEBUG
 #include <wtf/MainThread.h>

trunk/Source/WebCore/bindings/js/ScheduledAction.h

@@ -21 +21 @@
 #define ScheduledAction_h
 
+#include "JSDOMBinding.h"
 #include "PlatformString.h"
-#include <JSDOMBinding.h>
 #include <collector/handles/Global.h>
 #include <runtime/JSCell.h>

trunk/Source/WebCore/css/CSSPrimitiveValueCache.cpp

@@ -24 +24 @@
  */
 
-#include <config.h>
+#include "config.h"
 #include "CSSPrimitiveValueCache.h"
 

trunk/Source/WebCore/gyp/WebCore.gyp

@@ -17 +17 @@
       ],
       'include_dirs': [
+        '<(DEPTH)/WebCore',
         '<(DEPTH)/WebCore/icu',
         '<(DEPTH)/WebCore/ForwardingHeaders',
@@ -61 +62 @@
         ['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/[^/]+/'],
@@ -68 +73 @@
         # ['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$'],
@@ -119 +137 @@
             'GCC_PREFIX_HEADER': '<(DEPTH)/WebCore/WebCorePrefix.h',
             'INFOPLIST_FILE': '<(DEPTH)/WebCore/Info.plist',
+            'ALWAYS_SEARCH_USER_PATHS': 'NO',
           },
         }],

trunk/Source/WebCore/platform/KillRingNone.cpp

@@ -29 +29 @@
 namespace WebCore {
 
-void KillRing::append(const String& string)
+void KillRing::append(const String&)
 {
 }
 
-void KillRing::prepend(const String& string)
+void KillRing::prepend(const String&)
 {
 }

trunk/Source/WebCore/platform/graphics/ContextShadow.h

@@ -33 +33 @@
 #include "FloatRect.h"
 #include "IntRect.h"
-#include "RefCounted.h"
+#include <wtf/RefCounted.h>
 
 #if PLATFORM(CAIRO)

trunk/Source/WebCore/platform/graphics/gpu/LoopBlinnPathProcessor.cpp

@@ -43 +43 @@
 #include <wtf/Assertions.h>
 #include <wtf/FastMalloc.h>
+#include <wtf/UnusedParam.h>
+
 
 #if USE(SKIA)
@@ -702 +704 @@
     } while (verb != SkPath::kDone_Verb);
 #else // !USE(SKIA)
+    UNUSED_PARAM(path);
     // Must port to your platform.
     ASSERT_NOT_REACHED();
@@ -1146 +1149 @@
                             void* polygonData)
 {
+    UNUSED_PARAM(vertexData);
+    UNUSED_PARAM(weight);
     TessellationState* state = static_cast<TessellationState*>(polygonData);
     GLdouble* outVertex = static_cast<GLdouble*>(fastMalloc(3 * sizeof(GLdouble)));

trunk/Source/WebCore/platform/graphics/gpu/PODRedBlackTree.h

@@ -258 +258 @@
     // 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; }
 
     //----------------------------------------------------------------------
@@ -714 +714 @@
 
 #ifdef NDEBUG
-    void logIfVerbose(const char* output) const { }
+    void logIfVerbose(const char*) const { }
 #else
     void logIfVerbose(const char* output) const

trunk/Source/WebCore/platform/graphics/opengl/TextureMapperGL.cpp

@@ -22 +22 @@
 
 #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)

trunk/Source/WebCore/platform/graphics/opengl/TextureMapperGL.h

@@ -25 +25 @@
 #include "FloatQuad.h"
 #include "IntSize.h"
+#include "TextureMapper.h"
 #include "TransformationMatrix.h"
-#include "texmap/TextureMapper.h"
 
 namespace WebCore {

trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h

@@ -32 +32 @@
 #include "IntSize.h"
 #include "TransformationMatrix.h"
+#include <wtf/UnusedParam.h>
 
 /*
@@ -69 +70 @@
     }
     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; }
@@ -102 +103 @@
     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);
     }

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperNode.h

@@ -21 +21 @@
 #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"
@@ -34 +31 @@
 #include "TranslateTransformOperation.h"
 #include "UnitBezier.h"
+#include <wtf/CurrentTime.h>
+#include <wtf/HashMap.h>
+#include <wtf/RefCounted.h>
 
 namespace WebCore {