Changeset 36120

Show
Ignore:
Timestamp:
09/05/08 15:17:56 (3 months ago)
Author:
eric@webkit.org
Message:

Reviewed by Darin Adler.

Try to make Chromium compile with ToT:

  • Wrap a few places which depend on KJS:: in #if USE(JSC)
  • Include some windows forward declarations
  • dom/Node.h:
  • page/Console.h:
  • page/animation/CompositeAnimation.h:
  • platform/FileSystem.h:
  • platform/graphics/Image.h:
  • platform/text/AtomicString.h:
  • platform/text/String.cpp:
  • rendering/style/RenderStyle.h:
Location:
trunk/WebCore
Files:
9 modified

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r36118 r36120  
     12008-09-05  Eric Seidel  <eric@webkit.org> 
     2 
     3        Reviewed by Darin Adler. 
     4 
     5        Try to make Chromium compile with ToT: 
     6        - Wrap a few places which depend on KJS:: in #if USE(JSC) 
     7        - Include some windows forward declarations 
     8 
     9        * dom/Node.h: 
     10        * page/Console.h: 
     11        * page/animation/CompositeAnimation.h: 
     12        * platform/FileSystem.h: 
     13        * platform/graphics/Image.h: 
     14        * platform/text/AtomicString.h: 
     15        * platform/text/String.cpp: 
     16        * rendering/style/RenderStyle.h: 
     17 
    1182008-09-05  Dave Hyatt  <hyatt@apple.com> 
    219 

  • trunk/WebCore/dom/Node.h

    r35860 r36120  
    481481    PassRefPtr<NodeList> getElementsByClassName(const String& classNames); 
    482482 
     483#if USE(JSC) 
    483484    PassRefPtr<Element> querySelector(const String& selectors, NSResolver*, ExceptionCode&, KJS::ExecState*); 
    484485    PassRefPtr<NodeList> querySelectorAll(const String& selectors, NSResolver*, ExceptionCode&, KJS::ExecState*); 
     486#endif 
    485487 
    486488    // For non-JS bindings. Silently ignores the JavaScript exception if any. 

  • trunk/WebCore/page/Console.h

    r36068 r36120  
    7373        void addMessage(MessageSource, MessageLevel, const String& message, unsigned lineNumber, const String& sourceURL); 
    7474 
     75#if USE(JSC) 
    7576        void debug(KJS::ExecState*, const KJS::ArgList&); 
    7677        void error(KJS::ExecState*, const KJS::ArgList&); 
    … …  
    9091        void reportException(KJS::ExecState*, KJS::JSValue*); 
    9192        void reportCurrentException(KJS::ExecState*); 
     93#endif 
    9294    private: 
    9395        inline Page* page() const; 

  • trunk/WebCore/page/animation/CompositeAnimation.h

    r36031 r36120  
    3030#define CompositeAnimation_h 
    3131 
    32 #include "wtf/Noncopyable.h" 
    3332#include "AtomicString.h" 
     33 
     34#include <wtf/HashMap.h> 
     35#include <wtf/Noncopyable.h> 
    3436 
    3537namespace WebCore { 

  • trunk/WebCore/platform/FileSystem.h

    r34999 r36120  
    5656 
    5757#if PLATFORM(WIN) 
     58typedef void *HANDLE; 
     59// Assuming STRICT 
     60typedef struct HINSTANCE__* HINSTANCE; 
     61typedef HINSTANCE HMODULE; 
     62 
    5863typedef HANDLE PlatformFileHandle; 
    5964typedef HMODULE PlatformModule; 

  • trunk/WebCore/platform/graphics/Image.h

    r35993 r36120  
    4848 
    4949#if PLATFORM(WIN) 
     50typedef struct tagSIZE SIZE; 
     51typedef SIZE* LPSIZE; 
    5052typedef struct HBITMAP__ *HBITMAP; 
    5153#endif 

  • trunk/WebCore/platform/text/AtomicString.h

    r36073 r36120  
    4343    AtomicString(const String& s) : m_string(add(s.impl())) { } 
    4444 
     45#if USE(JSC) 
    4546    static AtomicStringImpl* find(const KJS::Identifier&); 
     47#endif 
    4648 
    4749    operator const String&() const { return m_string; } 

  • trunk/WebCore/platform/text/String.cpp

    r36073 r36120  
    624624    m_impl = StringImpl::create(str.data(), str.size()); 
    625625} 
    626 #endif 
    627626 
    628627String::operator UString() const 
    … …  
    632631    return UString(m_impl->characters(), m_impl->length()); 
    633632} 
     633#endif 
    634634 
    635635// String Operations 

  • trunk/WebCore/rendering/style/RenderStyle.h

    r36109 r36120  
    5454#include "TextDirection.h" 
    5555#include <wtf/HashMap.h> 
     56#include <wtf/OwnPtr.h> 
    5657#include <wtf/RefCounted.h> 
    5758#include <wtf/Vector.h>