Changeset 70239 in webkit


Ignore:
Timestamp:
Oct 21, 2010 9:21:29 AM (13 years ago)
Author:
ddkilzer@apple.com
Message:

<http://webkit.org/b/48047> Fix warnings found by check-Xcode-source-file-types

Reviewed by Adam Roben.

WebCore:

Fixes the following warning:

WARNING: Unknown file type 'sourcecode' for file 'CSSPrimitiveValue.idl'.
1 issues found for WebCore/WebCore.xcodeproj/project.pbxproj.

  • WebCore.xcodeproj/project.pbxproj: Removed explicit file type

for CSSPrimitiveValue.idl to make it match other IDL files.

WebKit:

Fixes the following warning:

WARNING: Incorrect file type 'sourcecode.cpp.objcpp' for file 'WebStringTruncator.h'.
1 issues found for WebKit/WebKit.xcodeproj/project.pbxproj.

  • WebKit.xcodeproj/project.pbxproj: Removed explicit file type

for WebStringTruncator.h to make it match other header files.

WebKitTools:

Fixes the following warnings:

WARNING: Incorrect file type 'sourcecode.cpp.objcpp' for file 'PixelDumpSupport.cpp'.
WARNING: Incorrect file type 'sourcecode.cpp.objcpp' for file 'LayoutTestController.cpp'.
WARNING: Incorrect file type 'sourcecode.cpp.objcpp' for file 'WorkQueue.cpp'.
WARNING: Incorrect file type 'sourcecode.cpp.objcpp' for file 'cg/PixelDumpSupportCG.cpp'.
WARNING: Incorrect file type 'sourcecode.cpp.objcpp' for file 'GCController.cpp'.
5 issues found for WebKitTools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj.

  • DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:

Removed explicit file type for *.cpp files above to make them
match other C++ source files. This exposed the fact that
DumpRenderTreeMac.h was not safe to include in C++ source, which
caused PixelDumpSupport.cpp and PixelDumpSupportCG.cpp to fail
to build.

  • DumpRenderTree/PixelDumpSupport.cpp: Adjusted header order.
  • DumpRenderTree/mac/DumpRenderTreeMac.h: Made safe to include

in C++ source files. Included CoreFoundation/CoreFoundation.h
to make sure all CF types were defined. Removed CFStringRef
typedef.

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r70235 r70239  
     12010-10-21  David Kilzer  <ddkilzer@apple.com>
     2
     3        <http://webkit.org/b/48047> Fix warnings found by check-Xcode-source-file-types
     4
     5        Reviewed by Adam Roben.
     6
     7        Fixes the following warning:
     8
     9            WARNING: Unknown file type 'sourcecode' for file 'CSSPrimitiveValue.idl'.
     10            1 issues found for WebCore/WebCore.xcodeproj/project.pbxproj.
     11
     12        * WebCore.xcodeproj/project.pbxproj: Removed explicit file type
     13        for CSSPrimitiveValue.idl to make it match other IDL files.
     14
    1152010-10-21  Yury Semikhatsky  <yurys@chromium.org>
    216
  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r70235 r70239  
    86738673                9302B0BE0D79F82C00C7EE83 /* PageGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageGroup.h; sourceTree = "<group>"; };
    86748674                9305B24C098F1B6B00C28855 /* Timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Timer.h; sourceTree = "<group>"; };
    8675                 9307059009E0C75800B17FE4 /* CSSPrimitiveValue.idl */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 4; path = CSSPrimitiveValue.idl; sourceTree = "<group>"; };
     8675                9307059009E0C75800B17FE4 /* CSSPrimitiveValue.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CSSPrimitiveValue.idl; sourceTree = "<group>"; };
    86768676                930705C709E0C95F00B17FE4 /* Counter.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Counter.idl; sourceTree = "<group>"; };
    86778677                930705D709E0C9B700B17FE4 /* JSCounter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCounter.cpp; sourceTree = "<group>"; };
  • trunk/WebKit/ChangeLog

    r70142 r70239  
     12010-10-21  David Kilzer  <ddkilzer@apple.com>
     2
     3        <http://webkit.org/b/48047> Fix warnings found by check-Xcode-source-file-types
     4
     5        Reviewed by Adam Roben.
     6
     7        Fixes the following warning:
     8
     9            WARNING: Incorrect file type 'sourcecode.cpp.objcpp' for file 'WebStringTruncator.h'.
     10            1 issues found for WebKit/WebKit.xcodeproj/project.pbxproj.
     11
     12        * WebKit.xcodeproj/project.pbxproj: Removed explicit file type
     13        for WebStringTruncator.h to make it match other header files.
     14
    1152010-10-20  Nikolas Zimmermann  <nzimmermann@rim.com>
    216
  • trunk/WebKit/WebKit.xcodeproj/project.pbxproj

    r70069 r70239  
    718718                F53444D202E87D4B018635CA /* WebKitStatisticsPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebKitStatisticsPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    719719                F5927D4E02D26C5E01CA2DBB /* WebKitErrors.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebKitErrors.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    720                 F59668C802AD2923018635CA /* WebStringTruncator.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; indentWidth = 4; path = WebStringTruncator.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     720                F59668C802AD2923018635CA /* WebStringTruncator.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebStringTruncator.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    721721                F59668C902AD2923018635CA /* WebStringTruncator.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; indentWidth = 4; path = WebStringTruncator.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    722722                F59EAE3E0253C7EE018635CA /* WebCoreStatistics.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreStatistics.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
  • trunk/WebKitTools/ChangeLog

    r70238 r70239  
     12010-10-21  David Kilzer  <ddkilzer@apple.com>
     2
     3        <http://webkit.org/b/48047> Fix warnings found by check-Xcode-source-file-types
     4
     5        Reviewed by Adam Roben.
     6
     7        Fixes the following warnings:
     8
     9            WARNING: Incorrect file type 'sourcecode.cpp.objcpp' for file 'PixelDumpSupport.cpp'.
     10            WARNING: Incorrect file type 'sourcecode.cpp.objcpp' for file 'LayoutTestController.cpp'.
     11            WARNING: Incorrect file type 'sourcecode.cpp.objcpp' for file 'WorkQueue.cpp'.
     12            WARNING: Incorrect file type 'sourcecode.cpp.objcpp' for file 'cg/PixelDumpSupportCG.cpp'.
     13            WARNING: Incorrect file type 'sourcecode.cpp.objcpp' for file 'GCController.cpp'.
     14            5 issues found for WebKitTools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj.
     15
     16        * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
     17        Removed explicit file type for *.cpp files above to make them
     18        match other C++ source files.  This exposed the fact that
     19        DumpRenderTreeMac.h was not safe to include in C++ source, which
     20        caused PixelDumpSupport.cpp and PixelDumpSupportCG.cpp to fail
     21        to build.
     22        * DumpRenderTree/PixelDumpSupport.cpp: Adjusted header order.
     23        * DumpRenderTree/mac/DumpRenderTreeMac.h: Made safe to include
     24        in C++ source files.  Included CoreFoundation/CoreFoundation.h
     25        to make sure all CF types were defined.  Removed CFStringRef
     26        typedef.
     27
    1282010-10-21  Adam Roben  <aroben@apple.com>
    229
  • trunk/WebKitTools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj

    r70190 r70239  
    228228                5185F69E10714A57007AA393 /* HistoryDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HistoryDelegate.h; path = mac/HistoryDelegate.h; sourceTree = "<group>"; };
    229229                5185F69F10714A57007AA393 /* HistoryDelegate.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = HistoryDelegate.mm; path = mac/HistoryDelegate.mm; sourceTree = "<group>"; };
    230                 8465E2C60FFA8DF2003B8342 /* PixelDumpSupport.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = PixelDumpSupport.cpp; sourceTree = "<group>"; };
     230                8465E2C60FFA8DF2003B8342 /* PixelDumpSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PixelDumpSupport.cpp; sourceTree = "<group>"; };
    231231                9335435F03D75502008635CE /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
    232232                933BF5A90F93FA5C000F0441 /* PlainTextController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlainTextController.h; path = mac/PlainTextController.h; sourceTree = "<group>"; };
     
    248248                B5A7526708AF4A4A00138E45 /* ImageDiff */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ImageDiff; sourceTree = BUILT_PRODUCTS_DIR; };
    249249                B5A752A108AF5D1F00138E45 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = "<absolute>"; };
    250                 BC0131D80C9772010087317D /* LayoutTestController.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = LayoutTestController.cpp; sourceTree = "<group>"; };
     250                BC0131D80C9772010087317D /* LayoutTestController.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutTestController.cpp; sourceTree = "<group>"; };
    251251                BC0131D90C9772010087317D /* LayoutTestController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LayoutTestController.h; sourceTree = "<group>"; };
    252252                BC0E24DE0E2D9451001B6BC2 /* AccessibilityUIElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityUIElement.h; sourceTree = "<group>"; };
     
    255255                BC4741290D038A4C0072B006 /* JavaScriptThreading.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaScriptThreading.h; sourceTree = "<group>"; };
    256256                BC4741400D038A570072B006 /* JavaScriptThreadingPthreads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JavaScriptThreadingPthreads.cpp; path = pthreads/JavaScriptThreadingPthreads.cpp; sourceTree = "<group>"; };
    257                 BC9D90210C97472D0099A4A3 /* WorkQueue.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = WorkQueue.cpp; sourceTree = "<group>"; };
     257                BC9D90210C97472D0099A4A3 /* WorkQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = WorkQueue.cpp; sourceTree = "<group>"; };
    258258                BC9D90220C97472E0099A4A3 /* WorkQueue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WorkQueue.h; sourceTree = "<group>"; };
    259259                BC9D90230C97472E0099A4A3 /* WorkQueueItem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WorkQueueItem.h; sourceTree = "<group>"; };
     
    294294                BCB283D80CFA7AFD007E533E /* ImageDiff.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; name = ImageDiff.xcconfig; path = mac/Configurations/ImageDiff.xcconfig; sourceTree = "<group>"; };
    295295                BCB283DE0CFA7C20007E533E /* TestNetscapePlugIn.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; name = TestNetscapePlugIn.xcconfig; path = mac/Configurations/TestNetscapePlugIn.xcconfig; sourceTree = "<group>"; };
    296                 BCB284880CFA8202007E533E /* PixelDumpSupportCG.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; name = PixelDumpSupportCG.cpp; path = cg/PixelDumpSupportCG.cpp; sourceTree = "<group>"; };
     296                BCB284880CFA8202007E533E /* PixelDumpSupportCG.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = PixelDumpSupportCG.cpp; path = cg/PixelDumpSupportCG.cpp; sourceTree = "<group>"; };
    297297                BCB284890CFA8202007E533E /* PixelDumpSupportCG.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PixelDumpSupportCG.h; path = cg/PixelDumpSupportCG.h; sourceTree = "<group>"; };
    298298                BCB2848A0CFA820F007E533E /* PixelDumpSupport.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PixelDumpSupport.h; sourceTree = "<group>"; };
     
    303303                BCD08B390E1057EF00A7D0C1 /* AccessibilityController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityController.cpp; sourceTree = "<group>"; };
    304304                BCD08B700E1059D200A7D0C1 /* AccessibilityControllerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AccessibilityControllerMac.mm; path = mac/AccessibilityControllerMac.mm; sourceTree = "<group>"; };
    305                 BCF6C64F0C98E9C000AC063E /* GCController.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = GCController.cpp; sourceTree = "<group>"; };
     305                BCF6C64F0C98E9C000AC063E /* GCController.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = GCController.cpp; sourceTree = "<group>"; };
    306306                C06F9ABB1267A7060058E1F6 /* PassDifferentNPPStruct.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PassDifferentNPPStruct.cpp; sourceTree = "<group>"; };
    307307                E1B7808511AF1643007E1BC2 /* MockGeolocationProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MockGeolocationProvider.h; path = mac/MockGeolocationProvider.h; sourceTree = "<group>"; };
  • trunk/WebKitTools/DumpRenderTree/PixelDumpSupport.cpp

    r63525 r70239  
    2828
    2929#include "config.h"
     30#include "PixelDumpSupport.h"
     31
    3032#include "DumpRenderTree.h"
    3133#include "LayoutTestController.h"
    32 #include "PixelDumpSupport.h"
    3334#include <cstdio>
    3435#include <wtf/Assertions.h>
  • trunk/WebKitTools/DumpRenderTree/mac/DumpRenderTreeMac.h

    r52298 r70239  
    3030#define DumpRenderTreeMac_h
    3131
     32#include <CoreFoundation/CoreFoundation.h>
     33
    3234// FIXME: we should add a config.h file for DumpRenderTree.
    3335#define WTF_PLATFORM_CF 1
     
    4143#endif
    4244
     45#ifdef __OBJC__
    4346@class DumpRenderTreeDraggingInfo;
    4447@class NavigationController;
     
    4750@class WebScriptWorld;
    4851@class WebView;
    49 
    50 typedef const struct __CFString* CFStringRef;
     52#else
     53class DumpRenderTreeDraggingInfo;
     54class NavigationController;
     55class PolicyDelegate;
     56class WebFrame;
     57class WebScriptWorld;
     58class WebView;
     59#endif
    5160
    5261extern CFMutableArrayRef openWindowsRef;
Note: See TracChangeset for help on using the changeset viewer.