2006-02-27 Eric Seidel <eseidel@apple.com>

        Reviewed by hyatt.

        Fix a bunch more link errors in the win32 build, mostly by adding stubs.

        * WebCore.vcproj/WebCore/WebCore.vcproj: add JSXMLHttpRequest and PlugInInfoStore
        * WebCore.vcproj/WebCore/build-generated-files.sh: update for JSXMLHttpRequest
        * khtml/ecma/JSXMLHttpRequest.cpp:
        (KJS::JSXMLHttpRequest::getValueProperty): fix switch to compile
        * platform/PlugInInfoStore.h:
        * platform/mac/PlugInInfoStoreMac.mm:
        * platform/win/TemporaryLinkStubs.cpp: add a bunch of stubs.
        (WebCore::TransferJob::errorText):
        (WebCore::TransferJob::isErrorPage):
        (WebCore::Widget::hide):
        (PlugInInfoStore::createPluginInfoForPluginAtIndex):
        (PlugInInfoStore::pluginCount):
        (WebCore::refreshPlugins):
        (QFont::QFont):
        (QFont::~QFont):
        (QFont::italic):
        (QFont::weight):
        (QFontMetrics::QFontMetrics):
        (QFontMetrics::~QFontMetrics):
        (QFontMetrics::xHeight):
        (Widget::setActiveWindow):
        (WebCore::ScrollView::contentsX):
        (WebCore::ScrollView::contentsY):
        (WebCore::ScrollView::contentsHeight):
        (WebCore::ScrollView::contentsWidth):
        (WebCore::ScrollView::visibleHeight):
        (WebCore::ScrollView::visibleWidth):
        (WebCore::ScrollView::hScrollBarMode):
        (WebCore::ScrollView::vScrollBarMode):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13026 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 709d92897fed3a7cefb5a011f18e7c86c6b89b62..b85eb7544fa2847047ed9132d49f4ec98f7d7951 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,39 @@
+2006-02-27  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by hyatt.
+
+        Fix a bunch more link errors in the win32 build, mostly by adding stubs.
+
+        * WebCore.vcproj/WebCore/WebCore.vcproj: add JSXMLHttpRequest and PlugInInfoStore
+        * WebCore.vcproj/WebCore/build-generated-files.sh: update for JSXMLHttpRequest
+        * khtml/ecma/JSXMLHttpRequest.cpp:
+        (KJS::JSXMLHttpRequest::getValueProperty): fix switch to compile
+        * platform/PlugInInfoStore.h:
+        * platform/mac/PlugInInfoStoreMac.mm:
+        * platform/win/TemporaryLinkStubs.cpp: add a bunch of stubs.
+        (WebCore::TransferJob::errorText):
+        (WebCore::TransferJob::isErrorPage):
+        (WebCore::Widget::hide):
+        (PlugInInfoStore::createPluginInfoForPluginAtIndex):
+        (PlugInInfoStore::pluginCount):
+        (WebCore::refreshPlugins):
+        (QFont::QFont):
+        (QFont::~QFont):
+        (QFont::italic):
+        (QFont::weight):
+        (QFontMetrics::QFontMetrics):
+        (QFontMetrics::~QFontMetrics):
+        (QFontMetrics::xHeight):
+        (Widget::setActiveWindow):
+        (WebCore::ScrollView::contentsX):
+        (WebCore::ScrollView::contentsY):
+        (WebCore::ScrollView::contentsHeight):
+        (WebCore::ScrollView::contentsWidth):
+        (WebCore::ScrollView::visibleHeight):
+        (WebCore::ScrollView::visibleWidth):
+        (WebCore::ScrollView::hScrollBarMode):
+        (WebCore::ScrollView::vScrollBarMode):
+
 2006-02-27  Eric Seidel  <eseidel@apple.com>
 
         Reviewed by timo.

diff --git a/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
index ca5fd6d6c31b16dc6afc0f58a0ffd1f6220bd1cf..0871515c9753b898b41cc6fe7b9e321a8f0d944a 100644 (file)
--- a/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
@@ -1153,6 +1153,14 @@
                                        RelativePath="..\..\khtml\ecma\domparser.h"\r
                                        >\r
                                </File>\r
+                               <File\r
+                                       RelativePath="..\..\khtml\ecma\JSXMLHttpRequest.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\khtml\ecma\JSXMLHttpRequest.h"\r
+                                       >\r
+                               </File>\r
                                <File\r
                                        RelativePath="..\..\khtml\ecma\kjs_binding.cpp"\r
                                        >\r
@@ -1648,6 +1656,10 @@
                                RelativePath="..\..\platform\PlatformString.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\platform\PlugInInfoStore.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\platform\QString.cpp"\r
                                >\r

diff --git a/WebCore/WebCore.vcproj/WebCore/build-generated-files.sh b/WebCore/WebCore.vcproj/WebCore/build-generated-files.sh
index cd056ee1faf9d68e97a6518c98e5e78a37e06984..688f24fac17cfa35e20e445e3b8e9b9e20355df8 100755 (executable)
--- a/WebCore/WebCore.vcproj/WebCore/build-generated-files.sh
+++ b/WebCore/WebCore.vcproj/WebCore/build-generated-files.sh
@@ -122,6 +122,10 @@ if [ ../JavaScriptCore/kjs/create_hash_table -nt "$DerivedSourcesDir/XSLTProcess
   ../JavaScriptCore/kjs/create_hash_table khtml/ecma/XSLTProcessor.cpp > "$DerivedSourcesDir/XSLTProcessor.lut.h"
 fi
 
+if [ ../JavaScriptCore/kjs/create_hash_table -nt "$DerivedSourcesDir/JSXMLHttpRequest.lut.h" -o khtml/ecma/JSXMLHttpRequest.cpp -nt "$DerivedSourcesDir/JSXMLHttpRequest.lut.h" ]; then
+  ../JavaScriptCore/kjs/create_hash_table khtml/ecma/JSXMLHttpRequest.cpp > "$DerivedSourcesDir/JSXMLHttpRequest.lut.h"
+fi
+
 # Auto-generate bindings from .idl files
 echo "Auto-generating bindings from .idl files for the dom directory..."
 perl -I"$WebCoreSourceRoot/bindings/scripts" "$WebCoreSourceRoot/bindings/scripts/generate-bindings.pl" --generator JS --idldir "$WebCoreSourceRoot/dom" --outputdir "$DerivedSourcesDir"

diff --git a/WebCore/khtml/ecma/JSXMLHttpRequest.cpp b/WebCore/khtml/ecma/JSXMLHttpRequest.cpp
index 42dba948bbf236e94e448a324c453e0e3588444b..ee2acffef75d26e680e623f7ecb904f7bfbb40d8 100644 (file)
--- a/WebCore/khtml/ecma/JSXMLHttpRequest.cpp
+++ b/WebCore/khtml/ecma/JSXMLHttpRequest.cpp
@@ -101,9 +101,10 @@ JSValue* JSXMLHttpRequest::getValueProperty(ExecState *exec, int token) const
     if (DocumentImpl* responseXML = m_impl->getResponseXML())
       return getDOMNode(exec, responseXML);
     return jsUndefined();
-  case Status:
+  case Status: {
     int status = m_impl->getStatus();
     return status > 0 ? jsNumber(status) : jsUndefined();
+  }
   case StatusText:
     return jsStringOrUndefined(m_impl->getStatusText());
   case Onreadystatechange:

diff --git a/WebCore/platform/PlugInInfoStore.h b/WebCore/platform/PlugInInfoStore.h
index 3c0b820b415ee0d5222afddb907ed1f8b13cc394..622f1c68ce5fdb285b7f940dbba0a8ae862f1b7e 100644 (file)
--- a/WebCore/platform/PlugInInfoStore.h
+++ b/WebCore/platform/PlugInInfoStore.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2004, 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/WebCore/platform/mac/PlugInInfoStoreMac.mm b/WebCore/platform/mac/PlugInInfoStoreMac.mm
index ad350b567a2a410fe646bb9a3808c2b53d8dabbf..e5064913ed3bb4c9183dc5dc23642c6fbeba47e0 100644 (file)
--- a/WebCore/platform/mac/PlugInInfoStoreMac.mm
+++ b/WebCore/platform/mac/PlugInInfoStoreMac.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2004, 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/WebCore/platform/win/TemporaryLinkStubs.cpp b/WebCore/platform/win/TemporaryLinkStubs.cpp
index b95221dca7bf636123c79bf62c10d035a646fc52..151e418f55bd3ac9401f5bb8ee7e4f82ed8baee4 100644 (file)
--- a/WebCore/platform/win/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/win/TemporaryLinkStubs.cpp
@@ -31,6 +31,7 @@
 #include "Screen.h"
 #include "History.h"
 #include "KWQKLocale.h"
+#include "PlugInInfoStore.h"
 
 using namespace WebCore;
 
@@ -295,7 +296,35 @@ void WebCore::TransferJob::addMetaData(class QString const &,class QString const
 void WebCore::TransferJob::addMetaData(class KXMLCore::HashMap<class WebCore::String,class WebCore::String> const &) { notImplemented(); }
 class QString WebCore::TransferJob::queryMetaData(class QString const &)const { notImplemented(); return QString(); }
 int WebCore::TransferJob::error(void)const { notImplemented(); return 0; }
+QString WebCore::TransferJob::errorText(void)const { notImplemented(); return "Houston, we have a problem."; }
+bool WebCore::TransferJob::isErrorPage(void)const { notImplemented(); return 0; }
 WebCore::TransferJob::TransferJob(class WebCore::TransferJobClient *,class KURL const &) { notImplemented(); }
 WebCore::TransferJob::TransferJob(class WebCore::TransferJobClient *,class KURL const &,class WebCore::FormData const &) { notImplemented(); }
-void WebCore::Widget::hide(void) { }
+void WebCore::Widget::hide(void) { notImplemented(); }
 class QString KLocale::language(void) { return "en"; }
+PluginInfo *PlugInInfoStore::createPluginInfoForPluginAtIndex(unsigned) { notImplemented(); return 0;}
+unsigned PlugInInfoStore::pluginCount() const { notImplemented(); return 0; }
+void WebCore::refreshPlugins(bool) { notImplemented(); }
+int WebCore::screenDepth(class WebCore::Widget *) { notImplemented(); return 96; }
+QFont::QFont() { notImplemented(); }
+QFont::~QFont() { notImplemented(); }
+bool QFont::italic(void) const { notImplemented(); return false; }
+int QFont::weight() const { notImplemented(); return QFont::Normal; }
+static QFontMetrics localFontMetrics;
+QFontMetrics::QFontMetrics() { notImplemented(); }
+QFontMetrics::~QFontMetrics() { notImplemented(); }
+QFontMetrics::QFontMetrics(class QFontMetrics const &) { notImplemented(); }
+QFontMetrics& QFontMetrics::operator=(class QFontMetrics const &) { notImplemented(); return localFontMetrics; }
+float QFontMetrics::xHeight(void) const { notImplemented(); return 0; }
+IntRect WebCore::usableScreenRect(class WebCore::Widget *) { notImplemented(); return IntRect(0,0,800,600); }
+QFont& QFont::operator=(class QFont const &) { notImplemented(); return localFont; }
+void Widget::setActiveWindow(void) { notImplemented(); }
+bool KWQCheckIfReloading(class WebCore::DocLoader *) { notImplemented(); return false; }
+int WebCore::ScrollView::contentsX(void)const { notImplemented(); return 0; }
+int WebCore::ScrollView::contentsY(void)const { notImplemented(); return 0; }
+int WebCore::ScrollView::contentsHeight(void)const { notImplemented(); return 0; }
+int WebCore::ScrollView::contentsWidth(void)const { notImplemented(); return 0; }
+int WebCore::ScrollView::visibleHeight(void)const { notImplemented(); return 0; }
+int WebCore::ScrollView::visibleWidth(void)const { notImplemented(); return 0; }
+WebCore::ScrollBarMode WebCore::ScrollView::hScrollBarMode(void)const { notImplemented(); return ScrollBarAlwaysOff; }
+WebCore::ScrollBarMode WebCore::ScrollView::vScrollBarMode(void)const { notImplemented(); return ScrollBarAlwaysOff; }
\ No newline at end of file