+2006-06-03 Rob Buis <buis@kde.org>
+
+ Reviewed by mjs. Tweaked and landed by ddkilzer.
+
+ http://bugzilla.opendarwin.org/show_bug.cgi?id=7281
+ With java disabled wrong information is displayed.
+
+ * fast/replaced/applet-rendering-java-disabled.html: Added.
+ * fast/replaced/applet-rendering-java-disabled-expected.checksum: Added.
+ * fast/replaced/applet-rendering-java-disabled-expected.html: Added.
+ * fast/replaced/applet-rendering-java-disabled-expected.png: Added.
+ * tables/mozilla_expected_failures/bugs/bug8499-expected.checksum: Changed after removing RenderEmptyApplet.
+ * tables/mozilla_expected_failures/bugs/bug8499-expected.png: Ditto.
+ * tables/mozilla_expected_failures/bugs/bug8499-expected.txt: Ditto.
+
2006-06-03 Mitz Pettel <opendarwin.org@mitzpettel.com>
Reviewed by Hyatt.
--- /dev/null
+b58f1f941c3983ca5ff322ba8f0bb806
\ No newline at end of file
--- /dev/null
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 53x18
+ text run at (0,0) width 53: "Test for "
+ RenderInline {A} at (0,0) size 343x18 [color=#0000EE]
+ RenderText {#text} at (53,0) size 343x18
+ text run at (53,0) width 343: "http://bugzilla.opendarwin.org/show_bug.cgi?id=7281"
+ RenderBlock {P} at (0,34) size 784x36
+ RenderText {#text} at (0,0) size 760x36
+ text run at (0,0) width 760: "This tests rendering of an applet element with Java disabled. If Java is disabled and Safari shows the content in the applet"
+ text run at (0,18) width 152: "tag, then the test passed."
+ RenderBlock (anonymous) at (0,86) size 784x18
+ RenderInline {APPLET} at (0,0) size 71x18
+ RenderText {#text} at (0,0) size 71x18
+ text run at (0,0) width 71: "SUCCESS"
+ RenderText {#text} at (0,0) size 0x0
--- /dev/null
+<p>Test for <a href="http://bugzilla.opendarwin.org/show_bug.cgi?id=7281">http://bugzilla.opendarwin.org/show_bug.cgi?id=7281</a></p>
+<p>This tests rendering of an applet element with Java disabled. If Java is disabled and Safari shows the content in the applet tag, then the test passed.</p>
+<applet code="">SUCCESS</applet>
-19855c2c1976ba211700d92c4668cd4f
\ No newline at end of file
+2a1494ec55d32d32613e07f77e1bc450
\ No newline at end of file
text run at (298,36) width 112: "original 'flavour'.)"
RenderBlock (anonymous) at (0,70) size 784x18
RenderBR {BR} at (0,0) size 0x18
- RenderTable {TABLE} at (0,88) size 780x167 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 778x165
- RenderTableRow {TR} at (0,2) size 778x161
- RenderTableCell {TD} at (2,2) size 774x161 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderTable {TABLE} at (2,2) size 770x157 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 768x155
- RenderTableRow {TR} at (0,2) size 768x95
- RenderTableCell {TD} at (2,2) size 764x95 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderTable {TABLE} at (156,2) size 452x39 [border: (2px outset #808080)]
- RenderTableSection {TBODY} at (2,2) size 448x35
- RenderTableRow {TR} at (0,2) size 448x31
- RenderTableCell {TD} at (2,2) size 444x31 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderEmptyApplet {APPLET} at (2,2) size 440x27
+ RenderTable {TABLE} at (0,88) size 780x140 [border: (1px outset #808080)]
+ RenderTableSection {TBODY} at (1,1) size 778x138
+ RenderTableRow {TR} at (0,2) size 778x134
+ RenderTableCell {TD} at (2,2) size 774x134 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+ RenderTable {TABLE} at (2,2) size 770x130 [border: (1px outset #808080)]
+ RenderTableSection {TBODY} at (1,1) size 768x128
+ RenderTableRow {TR} at (0,2) size 768x68
+ RenderTableCell {TD} at (2,2) size 764x68 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+ RenderTable {TABLE} at (376,2) size 12x12 [border: (2px outset #808080)]
+ RenderTableSection {TBODY} at (2,2) size 8x8
+ RenderTableRow {TR} at (0,2) size 8x4
+ RenderTableCell {TD} at (2,2) size 4x4 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+ RenderInline {APPLET} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock {P} at (2,57) size 760x36
+ RenderBlock {P} at (2,30) size 760x36
RenderText {#text} at (0,0) size 725x36
text run at (0,0) width 423: "The Porto Elounda Mare is built on the sea front, on a 110,000 m2 "
text run at (423,0) width 302: "plot of land with a 150 meter long private sandy"
text run at (0,18) width 143: "beach. The view from "
text run at (143,18) width 381: "decorated with antique and contemporary furniture and rugs."
- RenderTableRow {TR} at (0,99) size 768x54
- RenderTableCell {TD} at (2,99) size 764x54 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,72) size 768x54
+ RenderTableCell {TD} at (2,72) size 764x54 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
RenderTable {TABLE} at (2,2) size 760x50 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 758x48
RenderTableRow {TR} at (0,0) size 758x48
RenderTableCell {TD} at (669,9) size 89x30 [border: (1px inset #808080)] [r=0 c=4 rs=1 cs=1]
RenderText {#text} at (6,6) size 77x18
text run at (6,6) width 77: "17/07 - 27/8"
- RenderBlock (anonymous) at (0,255) size 784x18
+ RenderBlock (anonymous) at (0,228) size 784x18
RenderBR {BR} at (0,0) size 0x18
- RenderBlock {P} at (0,289) size 784x18
+ RenderBlock {P} at (0,262) size 784x18
RenderText {#text} at (0,0) size 537x18
text run at (0,0) width 416: "This table repeats the previous table, but removes the 'bad applet'. "
text run at (416,0) width 121: "Table lays out OK."
- RenderBlock (anonymous) at (0,323) size 784x18
+ RenderBlock (anonymous) at (0,296) size 784x18
RenderBR {BR} at (0,0) size 0x18
- RenderTable {TABLE} at (0,341) size 780x158 [border: (1px outset #808080)]
+ RenderTable {TABLE} at (0,314) size 780x158 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 778x156
RenderTableRow {TR} at (0,2) size 778x152
RenderTableCell {TD} at (2,2) size 774x152 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+2006-06-03 Rob Buis <buis@kde.org>
+
+ Reviewed by mjs. Tweaked and landed by ddkilzer.
+
+ http://bugzilla.opendarwin.org/show_bug.cgi?id=7281
+ With java disabled wrong information is displayed.
+
+ Test: fast/replaced/applet-rendering-java-disabled.html
+
+ Match WinIE, render applet content inline when java is
+ disabled.
+
+ * WebCore.vcproj/WebCore/WebCore.vcproj: Removed RenderEmptyApplet.cpp and RenderEmptyApplet.h.
+ * WebCore.xcodeproj/project.pbxproj: Ditto.
+ * WebCoreSources.bkl: Ditto.
+ * html/HTMLAppletElement.cpp:
+ (WebCore::HTMLAppletElement::createRenderer):
+ * rendering/RenderEmptyApplet.cpp: Removed.
+ * rendering/RenderEmptyApplet.h: Removed.
+
2006-06-03 Mitz Pettel <opendarwin.org@mitzpettel.com>
Reviewed by Hyatt.
RelativePath="..\..\rendering\RenderContainer.h"\r
>\r
</File>\r
- <File\r
- RelativePath="..\..\rendering\RenderEmptyApplet.cpp"\r
- >\r
- </File>\r
- <File\r
- RelativePath="..\..\rendering\RenderEmptyApplet.h"\r
- >\r
- </File>\r
<File\r
RelativePath="..\..\rendering\RenderFieldset.cpp"\r
>\r
93B70D7209EB0C7C009D8468 /* kjs_traversal.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B70D5609EB0C7C009D8468 /* kjs_traversal.h */; };
93B70D7509EB0C7C009D8468 /* kjs_window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B70D5909EB0C7C009D8468 /* kjs_window.cpp */; };
93B70D7609EB0C7C009D8468 /* kjs_window.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B70D5A09EB0C7C009D8468 /* kjs_window.h */; };
- 93B70EB209EEE5B5009D8468 /* RenderEmptyApplet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B70EB009EEE5B5009D8468 /* RenderEmptyApplet.cpp */; };
- 93B70EB309EEE5B5009D8468 /* RenderEmptyApplet.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B70EB109EEE5B5009D8468 /* RenderEmptyApplet.h */; };
93B780CA09B3B7FE00690162 /* WidgetClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B780C909B3B7FE00690162 /* WidgetClient.h */; };
93C841F809CE855C00DFF5E5 /* DOMImplementationFront.h in Headers */ = {isa = PBXBuildFile; fileRef = 93C841F709CE855C00DFF5E5 /* DOMImplementationFront.h */; };
93C841FF09CE858300DFF5E5 /* DOMImplementationFront.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93C841FE09CE858300DFF5E5 /* DOMImplementationFront.cpp */; };
93B70D5609EB0C7C009D8468 /* kjs_traversal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = kjs_traversal.h; sourceTree = "<group>"; };
93B70D5909EB0C7C009D8468 /* kjs_window.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = kjs_window.cpp; sourceTree = "<group>"; };
93B70D5A09EB0C7C009D8468 /* kjs_window.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = kjs_window.h; sourceTree = "<group>"; };
- 93B70EB009EEE5B5009D8468 /* RenderEmptyApplet.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderEmptyApplet.cpp; sourceTree = "<group>"; };
- 93B70EB109EEE5B5009D8468 /* RenderEmptyApplet.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderEmptyApplet.h; sourceTree = "<group>"; };
93B780C909B3B7FE00690162 /* WidgetClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WidgetClient.h; sourceTree = "<group>"; };
93C841F709CE855C00DFF5E5 /* DOMImplementationFront.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMImplementationFront.h; sourceTree = "<group>"; };
93C841FE09CE858300DFF5E5 /* DOMImplementationFront.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMImplementationFront.cpp; sourceTree = "<group>"; };
BCEA4829097D93020094C9E4 /* RenderView.h */,
BCEA482C097D93020094C9E4 /* RenderContainer.cpp */,
BCEA482D097D93020094C9E4 /* RenderContainer.h */,
- 93B70EB009EEE5B5009D8468 /* RenderEmptyApplet.cpp */,
- 93B70EB109EEE5B5009D8468 /* RenderEmptyApplet.h */,
A8EA73AF0A1900E300A8EF5F /* RenderFieldset.cpp */,
A8EA73B00A1900E300A8EF5F /* RenderFieldset.h */,
A8EA73B20A1900E300A8EF5F /* RenderFileButton.cpp */,
93B70D7009EB0C7C009D8468 /* kjs_proxy.h in Headers */,
93B70D7209EB0C7C009D8468 /* kjs_traversal.h in Headers */,
93B70D7609EB0C7C009D8468 /* kjs_window.h in Headers */,
- 93B70EB309EEE5B5009D8468 /* RenderEmptyApplet.h in Headers */,
1403B99709EB13AF00797C7F /* DOMWindow.h in Headers */,
1403BA0F09EB18F900797C7F /* JSDOMWindow.h in Headers */,
14CF78A609F58CD800EB3665 /* JSCSSValue.h in Headers */,
93B70D6F09EB0C7C009D8468 /* kjs_proxy.cpp in Sources */,
93B70D7109EB0C7C009D8468 /* kjs_traversal.cpp in Sources */,
93B70D7509EB0C7C009D8468 /* kjs_window.cpp in Sources */,
- 93B70EB209EEE5B5009D8468 /* RenderEmptyApplet.cpp in Sources */,
1403B99809EB13AF00797C7F /* DOMWindow.cpp in Sources */,
1403BA0C09EB18C700797C7F /* JSDOMWindow.cpp in Sources */,
14CF78A409F58CBF00EB3665 /* JSCSSValue.cpp in Sources */,
rendering/RenderBR.cpp
rendering/RenderCanvas.cpp
rendering/RenderContainer.cpp
- rendering/RenderEmptyApplet.cpp
rendering/RenderFlexibleBox.cpp
rendering/RenderFlow.cpp
rendering/RenderHTMLCanvas.cpp
#include "HTMLDocument.h"
#include "HTMLNames.h"
#include "RenderApplet.h"
-#include "RenderEmptyApplet.h"
+#include "RenderInline.h"
namespace WebCore {
return new (document()->renderArena()) RenderApplet(this, args);
}
- // ### remove me. we should never show an empty applet, instead
- // render the alternative content given by the webpage
- return new (document()->renderArena()) RenderEmptyApplet(this);
+ return new (document()->renderArena()) RenderInline(this);
}
#if __APPLE__
+++ /dev/null
-/**
- * This file is part of the HTML widget for KDE.
- *
- * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2003, 2006 Apple Computer, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#include "config.h"
-#include "RenderEmptyApplet.h"
-
-namespace WebCore {
-
-RenderEmptyApplet::RenderEmptyApplet(Node* node)
- : RenderWidget(node)
-{
- setInline(true);
- setIntrinsicWidth(150);
- setIntrinsicHeight(150);
-}
-
-void RenderEmptyApplet::layout()
-{
- KHTMLAssert(needsLayout());
- KHTMLAssert(minMaxKnown());
-
- calcWidth();
- calcHeight();
-
- setNeedsLayout(false);
-}
-
-}
+++ /dev/null
-/*
- * This file is part of the HTML widget for KDE.
- *
- * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2006 Apple Computer, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef RenderEmptyApplet_h
-#define RenderEmptyApplet_h
-
-#include "RenderWidget.h"
-
-namespace WebCore {
-
- class RenderEmptyApplet : public RenderWidget {
- public:
- RenderEmptyApplet(Node*);
- virtual const char* renderName() const { return "RenderEmptyApplet"; }
- virtual void layout();
- };
-
-}
-
-#endif
git://git.webkit.org / WebKit-https.git / commitdiff
