[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:17:20 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 74d89940fb6feb0eb6ee1fe9ca1e9191b53fed67
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jun 7 15:56:05 2002 +0000
Try to make Jersey work again.
* kwq/KWQInvisibleButton.h: Simplify includes.
* kwq/KWQInvisibleButton.mm: Simplify includes.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1288 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index e547db7..2c3cdbb 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-06-07 Darin Adler <darin at apple.com>
+
+ Try to make Jersey work again.
+
+ * kwq/KWQInvisibleButton.h: Simplify includes.
+ * kwq/KWQInvisibleButton.mm: Simplify includes.
+
2002-06-05 Darin Adler <darin at apple.com>
Some fixes to speed up the citibank.com page, and other related changes.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e547db7..2c3cdbb 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-06-07 Darin Adler <darin at apple.com>
+
+ Try to make Jersey work again.
+
+ * kwq/KWQInvisibleButton.h: Simplify includes.
+ * kwq/KWQInvisibleButton.mm: Simplify includes.
+
2002-06-05 Darin Adler <darin at apple.com>
Some fixes to speed up the citibank.com page, and other related changes.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e547db7..2c3cdbb 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-06-07 Darin Adler <darin at apple.com>
+
+ Try to make Jersey work again.
+
+ * kwq/KWQInvisibleButton.h: Simplify includes.
+ * kwq/KWQInvisibleButton.mm: Simplify includes.
+
2002-06-05 Darin Adler <darin at apple.com>
Some fixes to speed up the citibank.com page, and other related changes.
diff --git a/WebCore/kwq/KWQInvisibleButton.h b/WebCore/kwq/KWQInvisibleButton.h
index 86089d5..0e5529b 100644
--- a/WebCore/kwq/KWQInvisibleButton.h
+++ b/WebCore/kwq/KWQInvisibleButton.h
@@ -1,57 +1,53 @@
+/*
+ * Copyright (C) 2001, 2002 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
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
#ifndef KWQINVISIBLEBUTTON_H_
#define KWQINVISIBLEBUTTON_H_
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-#import <Cocoa/Cocoa.h>
+#ifdef __OBJC__
+ at class InvisibleButtonView;
+#else
+class InvisibleButtonView;
#endif
-#include <qptrlist.h>
-#include "rendering/render_replaced.h"
-#include "rendering/render_image.h"
-#include "rendering/render_flow.h"
-#include "rendering/render_form.h"
-#include "html/html_formimpl.h"
-
-namespace DOM {
- class HTMLGenericFormElementImpl;
-};
+class KHTMLView;
namespace khtml {
class RenderImageButton;
}
-// class KWQInvisibleButton ================================================================
-
class KWQInvisibleButton {
public:
-
- // structs -----------------------------------------------------------------
- // typedefs ----------------------------------------------------------------
-
- KWQInvisibleButton(khtml::RenderImageButton *theImageButton);
+ KWQInvisibleButton(khtml::RenderImageButton *);
~KWQInvisibleButton();
- // member functions --------------------------------------------------------
-
- void setFrameInView(int x, int y, int w, int h, KHTMLView *khtmlview);
-
- // operators ---------------------------------------------------------------
-
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
+ void setFrameInView(int x, int y, int w, int h, KHTMLView *);
private:
khtml::RenderImageButton *imageButton;
-#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
- id buttonView;
-#else
- void *buttonView;
-#endif
-
-}; // class KWQInvisibleButton =============================================================
+ InvisibleButtonView *buttonView;
+};
#endif
diff --git a/WebCore/kwq/KWQInvisibleButton.mm b/WebCore/kwq/KWQInvisibleButton.mm
index 3a8eaf2..e8666b7 100644
--- a/WebCore/kwq/KWQInvisibleButton.mm
+++ b/WebCore/kwq/KWQInvisibleButton.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 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
@@ -22,12 +22,14 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <KWQInvisibleButton.h>
-#include <kwqdebug.h>
-#include <qevent.h>
-#include <khtmlview.h>
-#include <xml/dom2_eventsimpl.h>
+#import <KWQInvisibleButton.h>
+
+#import <kwqdebug.h>
+#import <qevent.h>
+#import <khtmlview.h>
+#import <rendering/render_form.h>
+#import <xml/dom2_eventsimpl.h>
@interface InvisibleButtonView : NSView
{
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list