Nabble - khtml-cvs

KDE/kdelibs/khtml

2009-12-01T09:52:04Z

SVN commit 1057195 by dfaure:

Fix new tab being used when a new window should be used, i.e. when the option "open links in new tab" is unchecked in konq.
setNewTab() is for explicitely "open in new tab" actions; otherwise the browser is responsible for implementing createNewWindow
the way it prefers.

M +6 -4 html/html_inlineimpl.cpp
M +0 -1 khtml_part.cpp

--- trunk/KDE/kdelibs/khtml/html/html_inlineimpl.cpp #1057194:1057195
@@ -150,11 +150,13 @@
}

if (document()->part() && !isContentEditable()) {
- if (k)
+ if (k)
click();
- else
- document()->part()->
- urlSelected( url, button, state, utarget );
+ else {
+ KParts::OpenUrlArguments args;
+ args.setActionRequestedByUser(true);
+ document()->part()->urlSelected( url, button, state, utarget, args );
+ }
}
}
evt->setDefaultHandled();
--- trunk/KDE/kdelibs/khtml/khtml_part.cpp #1057194:1057195
@@ -3718,7 +3718,6 @@

if ( state & Qt::ControlModifier )
{
- browserArgs.setNewTab(true);
emit d->m_extension->createNewWindow( cURL, args, browserArgs );
return true;
}
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml

2009-11-29T21:06:23Z

SVN commit 1056420 by ggarand:

. convert the Selection's DOM offsets to Rendered offsets before using them
on the rendered string (#166241, #216092)
. use slow font width algorithm when drawing selection for more accurate
placement (#213246)

BUG: 166241
BUG: 216092
BUG: 213246

M +10 -7 khtml_part.cpp
M +3 -3 rendering/render_text.cpp

--- trunk/KDE/kdelibs/khtml/khtml_part.cpp #1056419:1056420
@@ -48,6 +48,7 @@
#include "rendering/render_text.h"
#include "rendering/render_frames.h"
#include "rendering/render_layer.h"
+#include "rendering/render_position.h"
#include "misc/htmlhashes.h"
#include "misc/loader.h"
#include "misc/khtml_partaccessor.h"
@@ -3112,13 +3113,15 @@
seenTDTag = false;
}
hasNewLine = false;
- if(n == sel.start().node() && n == sel.end().node())
- text = str.mid(sel.start().offset(), sel.end().offset() - sel.start().offset());
- else if(n == sel.start().node())
- text = str.mid(sel.start().offset());
- else if(n == sel.end().node())
- text += str.left(sel.end().offset());
- else
+ if(n == sel.start().node() && n == sel.end().node()) {
+ int s = khtml::RenderPosition::fromDOMPosition(sel.start()).renderedOffset();
+ int e = khtml::RenderPosition::fromDOMPosition(sel.end()).renderedOffset();
+ text = str.mid(s, e-s);
+ } else if(n == sel.start().node()) {
+ text = str.mid(khtml::RenderPosition::fromDOMPosition(sel.start()).renderedOffset());
+ } else if(n == sel.end().node()) {
+ text += str.left(khtml::RenderPosition::fromDOMPosition(sel.end()).renderedOffset());
+ } else
text += str;
}
}
--- trunk/KDE/kdelibs/khtml/rendering/render_text.cpp #1056419:1056420
@@ -246,11 +246,11 @@
if (needClipping) {
p->save();

- int visualSelectionStart = f->width(text->str->s, text->str->l, m_start, startPos, text->isSimpleText(), m_start, m_start + m_len, m_toAdd);
- int visualSelectionEnd = f->width(text->str->s, text->str->l, m_start, endPos, text->isSimpleText(), m_start, m_start + m_len, m_toAdd);
+ int visualSelectionStart = f->width(text->str->s, text->str->l, m_start, startPos, false, m_start, m_start + m_len, m_toAdd);
+ int visualSelectionEnd = f->width(text->str->s, text->str->l, m_start, endPos, false, m_start, m_start + m_len, m_toAdd);
int visualSelectionWidth = visualSelectionEnd - visualSelectionStart;
if (m_reversed) {
- visualSelectionStart = f->width(text->str->s, text->str->l, m_start, m_len, text->isSimpleText()) - visualSelectionEnd;
+ visualSelectionStart = f->width(text->str->s, text->str->l, m_start, m_len, false) - visualSelectionEnd;
}

QRect selectionRect(m_x + tx + visualSelectionStart, m_y + ty, visualSelectionWidth, height());
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml/rendering

2009-11-29T21:06:14Z

SVN commit 1056419 by ggarand:

refine this relative position offset code to properly handle
negative percents.

M +12 -10 render_box.cpp

--- trunk/KDE/kdelibs/khtml/rendering/render_box.cpp #1056418:1056419
@@ -1081,22 +1081,24 @@
tx += style()->left().width(containingBlockWidth());
} else if (!style()->right().isAuto())
tx -= style()->right().width(containingBlockWidth());
- if(!style()->top().isAuto())
- {
+ if(!style()->top().isAuto()) {
if (style()->top().isPercent()) {
- int ph = calcPercentageHeight(style()->top());
- if (ph != -1)
- ty += ph;
+ float p = style()->top().percent();
+ bool neg = p < 0.0;
+ int ph = calcPercentageHeight(Length((neg?-p:p), Percent));
+ if (ph != -1)
+ ty += neg?-ph:ph;
} else {
ty += style()->top().width(containingBlockHeight());
}
}
- else if(!style()->bottom().isAuto())
- {
- if (style()->top().isPercent()) {
- int ph = calcPercentageHeight(style()->top());
+ else if(!style()->bottom().isAuto()) {
+ if (style()->bottom().isPercent()) {
+ float p = style()->bottom().percent();
+ bool neg = p < 0.0;
+ int ph = calcPercentageHeight(Length((neg?-p:p), Percent));
if (ph != -1)
- ty -= ph;
+ ty -= neg?-ph:ph;
} else {
ty -= style()->bottom().width(containingBlockHeight());
}
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml/svg

2009-11-29T21:06:09Z

SVN commit 1056418 by ggarand:

"Null-test m_shadowTreeRootElement again, because the call to buildPendingResource() may not
actually initialize it."

patch by Simon Fraser <simon.fraser@...> WC/r51366/

M +3 -0 SVGUseElement.cpp

--- trunk/KDE/kdelibs/khtml/svg/SVGUseElement.cpp #1056417:1056418
@@ -408,6 +408,9 @@
if (!m_shadowTreeRootElement)
const_cast<SVGUseElement*>(this)->buildPendingResource();

+ if (!m_shadowTreeRootElement)
+ return Path();
+
Node* n = m_shadowTreeRootElement->firstChild();
if (n->isSVGElement() && static_cast<SVGElement*>(n)->isStyledTransformable()) {
if (!isDirectReference(n))
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/kjsembed/kjsembed

2009-11-29T09:16:48Z

SVN commit 1056226 by jlayt:

krazy fixes

M +1 -1 qobject_binding.cpp

--- trunk/KDE/kdelibs/kjsembed/kjsembed/qobject_binding.cpp #1056225:1056226
@@ -813,7 +813,7 @@
START_QOBJECT_METHOD( callParent, QObject )
//TODO it would be better, if each QObjectBinding remembers it's parent rather then
//creating a new instance each time. That wouldn't only be more logical, but also
- //does prevent losing of additional infos like e.g. the access-level.
+ //does prevent losing of additional information like e.g. the access-level.
if( imp->access() & QObjectBinding::GetParentObject )
{
QObject *parent = imp->object<QObject>()->parent();
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/kjs

2009-11-29T09:14:00Z

SVN commit 1056224 by jlayt:

krazy fixes

M +1 -1 bytecode/generator/driver.cpp
M +2 -2 bytecode/generator/parser.cpp
M +1 -1 bytecode/generator/tablebuilder.cpp
M +6 -4 bytecode/generator/types.cpp
M +1 -1 debugger.h
M +1 -1 internal.cpp
M +1 -1 nodes.h

--- trunk/KDE/kdelibs/kjs/bytecode/generator/driver.cpp #1056223:1056224
@@ -30,7 +30,7 @@
std::cerr << "Usage: icemaker <path>\n";
}

- std::string path = std::string(argv[1]) + "/";
+ std::string path = std::string(argv[1]) + "/"; // krazy:exclude=doublequote_chars

ifstream def;
def.open((path + "codes.def").c_str());
--- trunk/KDE/kdelibs/kjs/bytecode/generator/parser.cpp #1056223:1056224
@@ -174,13 +174,13 @@
string nativeName = matchIdentifier();

if (nativeName == "const")
- nativeName += " " + matchIdentifier();
+ nativeName += " " + matchIdentifier(); // krazy:exclude=doublequote_chars

while (check(Lexer::Scope))
nativeName += "::" + matchIdentifier();

if (check(Lexer::Star))
- nativeName += "*";
+ nativeName += "*"; // krazy:exclude=doublequote_chars

const Flag typeFlags[] = {
{"immediate", Type_HaveImm},
--- trunk/KDE/kdelibs/kjs/bytecode/generator/tablebuilder.cpp #1056223:1056224
@@ -276,7 +276,7 @@

string sig = op.name;
for (unsigned p = 0; p < numParams; ++p) {
- sig += "_";
+ sig += "_"; // krazy:exclude=doublequote_chars
sig += paramIsIm[p] ? "I" : "R";
sig += op.opParamTypes[p].name;
}
--- trunk/KDE/kdelibs/kjs/bytecode/generator/types.cpp #1056223:1056224
@@ -20,6 +20,9 @@
* Boston, MA 02110-1301, USA.
*
*/
+
+#include "types.h"
+
#include <stdlib.h>
#include <iostream>
#include "assert.h"
@@ -27,7 +30,6 @@
#include <cstdio>
#include <wtf/ASCIICType.h>

-#include "types.h"
#include "tablebuilder.h"

using namespace std;
@@ -170,7 +172,7 @@
item += "Cost_Checked";
else
item += CodePrinter::stringFromInt(reg ? inf.cost : 0);
- item += "}";
+ item += "}"; // krazy:exclude=doublequote_chars
} else {
item = "{Conv_NoConversion, Cost_NoConversion}";
}
@@ -213,8 +215,8 @@
int tileCost, int registerCost)
{
// Compute the conversion names. The register one (if any) would also create an operation.
- string immName = "I" + capitalized(from) + "_" + capitalized(to);
- string regName = "R" + capitalized(from) + "_" + capitalized(to);
+ string immName = "I" + capitalized(from) + "_" + capitalized(to); // krazy:exclude=doublequote_chars
+ string regName = "R" + capitalized(from) + "_" + capitalized(to); // krazy:exclude=doublequote_chars

// Register immediate conversion
conversionNames.push_back(immName);
--- trunk/KDE/kdelibs/kjs/debugger.h #1056223:1056224
@@ -46,7 +46,7 @@
* calls.
*
* WARNING: This interface is still a work in progress and is not yet
- * offically publicly available. It is likely to change in binary incompatible
+ * officially publicly available. It is likely to change in binary incompatible
* (and possibly source incompatible) ways in future versions. It is
* anticipated that at some stage the interface will be frozen and made
* available for general use.
--- trunk/KDE/kdelibs/kjs/internal.cpp #1056223:1056224
@@ -329,7 +329,7 @@

if ( obj->inherits(&ArrayInstance::info) )
arrayLength = obj->get(exec, exec->propertyNames().length)->toUInt32(exec);
- vString = "[object " + name + "]";
+ vString = "[object " + name + "]"; // krazy:exclude=doublequote_chars
break;
}
case GetterSetterType:
--- trunk/KDE/kdelibs/kjs/nodes.h #1056223:1056224
@@ -1228,7 +1228,7 @@
};

// important: these are also built when compiling things via the Function constructor
- // (see FunctionObjectImp::construct() and Parser::parseFunctionBody, so the existance
+ // (see FunctionObjectImp::construct() and Parser::parseFunctionBody, so the existence
// of this class rather than the bare FunctionBodyNode does not care much information.
class ProgramNode : public FunctionBodyNode {
public:
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml/html

2009-11-25T13:09:11Z

SVN commit 1054310 by carewolf:

Don't change copyrights on minor edits.

M +2 -2 HTMLMediaElement.cpp
M +2 -2 HTMLMediaElement.h

--- trunk/KDE/kdelibs/khtml/html/HTMLMediaElement.cpp #1054309:1054310
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2009 Michael Howell <mhowell123@...>.
- * Parts copyright (C) 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
+ * (C) 2009 Michael Howell <mhowell123@...>.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
--- trunk/KDE/kdelibs/khtml/html/HTMLMediaElement.h #1054309:1054310
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2009 Michael Howell <mhowell123@...>.
- * Parts copyright (C) 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
+ * (C) 2009 Michael Howell <mhowell123@...>.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml/rendering

2009-11-25T11:28:30Z

SVN commit 1054254 by teve:

build fix: media_controls.cpp:34:21: error: KDE/KIcon:No such file or directory. incude changed from KDE/KIcon -> kicon.h

M +1 -1 media_controls.cpp

--- trunk/KDE/kdelibs/khtml/rendering/media_controls.cpp #1054253:1054254
@@ -31,7 +31,7 @@
#include <phonon/mediaobject.h>
#include <rendering/render_media.h>
#include <phonon/videowidget.h>
-#include <KDE/KIcon>
+#include <kicon.h>
#include <ktogglefullscreenaction.h>
#include <kshortcut.h>
#include <kdebug.h>
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml/misc

2009-11-25T10:56:35Z

SVN commit 1054226 by ggarand:

Up the values for fractional allocation strategy as some mallocs have
a quite high mmap allocation ceil (e.g. 256kb).

Also don't forget to account for the freelist in the total allocated
memory.

M +8 -3 arena.cpp

--- trunk/KDE/kdelibs/khtml/misc/arena.cpp #1054225:1054226
@@ -70,7 +70,7 @@

#define FREELIST_MAX 50
#define LARGE_ALLOCATION_CEIL(pool) (pool)->arenasize * 256
-#define MAX_DISCRETE_ALLOCATION(pool) (pool)->arenasize * 32
+#define MAX_DISCRETE_ALLOCATION(pool) (pool)->arenasize * 64
static Arena *arena_freelist = 0;
static int freelist_count = 0;

@@ -112,7 +112,7 @@
pool->current = &pool->first;
pool->arenasize = size;
pool->largealloc = LARGE_ALLOCATION_CEIL(pool);
- pool->cumul = 0;
+ pool->cumul = freelist_count*size;
}

@@ -194,7 +194,10 @@
if (pool->cumul > pool->largealloc) {
// High memory pressure. Switch to a fractional allocation strategy
// so that malloc gets a chance to successfully trim us down when it's over.
- sz = qMin(pool->cumul/25, MAX_DISCRETE_ALLOCATION(pool));
+ sz = qMin(pool->cumul/12, MAX_DISCRETE_ALLOCATION(pool));
+#ifdef DEBUG_ARENA_MALLOC
+ printf("allocating %d bytes (fractional strategy)\n", sz);
+#endif
} else
#endif
sz = pool->arenasize > nb ? pool->arenasize : nb;
@@ -242,6 +245,8 @@
return;

#ifdef DEBUG_ARENA_MALLOC
+ printf("****** Freeing arena pool. Total allocated memory: %d\n", pool->cumul);
+
do {
assert(a->base <= a->avail && a->avail <= a->limit);
a->avail = a->base;
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml/rendering

2009-11-25T10:56:28Z

SVN commit 1054225 by ggarand:

make the layouting code actually work.

CCBUG: 145380

M +16 -13 render_media.cpp

--- trunk/KDE/kdelibs/khtml/rendering/render_media.cpp #1054224:1054225
@@ -57,6 +57,9 @@

void RenderMedia::layout()
{
+ calcWidth();
+ calcHeight();
+
RenderWidget::layout();

if (mediaElement()->controls() && widget()->layout()->count() == 1) {
@@ -67,19 +70,6 @@
else
toolbox->show();
}
-
- QApplication::processEvents();
-
- if (mediaElement()->isVideo()) {
- setIntrinsicWidth(player()->videoWidget()->sizeHint().width());
- setIntrinsicHeight(player()->videoWidget()->sizeHint().height());
- } else {
- setIntrinsicWidth(widget()->sizeHint().width());
- setIntrinsicHeight(widget()->sizeHint().height());
- player()->hide();
- }
-
- if (intrinsicWidth() != 1 && widget()) widget()->resize(intrinsicWidth(), intrinsicHeight());
}

bool RenderMedia::eventFilter(QObject* o, QEvent* e)
@@ -115,6 +105,19 @@

void RenderMedia::slotMetaDataChanged()
{
+ if (mediaElement()->isVideo()) {
+ if (player()->videoWidget()->sizeHint().isValid()) {
+ setIntrinsicWidth(player()->videoWidget()->sizeHint().width());
+ setIntrinsicHeight(player()->videoWidget()->sizeHint().height());
+ }
+ } else {
+ if (widget()->sizeHint().isValid()) {
+ setIntrinsicWidth(widget()->sizeHint().width());
+ setIntrinsicHeight(widget()->sizeHint().height());
+ }
+ player()->hide();
+ }
+
setNeedsLayoutAndMinMaxRecalc();
}

_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml/rendering

2009-11-25T10:56:21Z

SVN commit 1054224 by ggarand:

add fullscreen playback support to 'video'.

CCBUG: 145380

M +29 -1 media_controls.cpp
M +7 -1 media_controls.h
M +1 -1 render_media.cpp

--- trunk/KDE/kdelibs/khtml/rendering/media_controls.cpp #1054223:1054224
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2009 Michael Howell <mhowell123@...>.
+ * Copyright (C) 2009 Germain Garand <germain@...>
* Parts copyright (C) 2007, 2008 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -27,12 +28,21 @@
#include "media_controls.h"
#include <QtGui/QHBoxLayout>
#include <phonon/seekslider.h>
+#include <phonon/mediaobject.h>
+#include <rendering/render_media.h>
+#include <phonon/videowidget.h>
#include <KDE/KIcon>
+#include <ktogglefullscreenaction.h>
+#include <kshortcut.h>
+#include <kdebug.h>
+#include <klocale.h>

namespace khtml {

-MediaControls::MediaControls(Phonon::MediaObject* mediaObject, QWidget* parent) : QWidget(parent)
+MediaControls::MediaControls(MediaPlayer* mediaPlayer, QWidget* parent) : QWidget(parent)
{
+ m_mediaPlayer = mediaPlayer;
+ Phonon::MediaObject* mediaObject = m_mediaPlayer->mediaObject();
setLayout(new QHBoxLayout(this));
m_play = new QPushButton(KIcon("media-playback-start"), i18n("Play"), this);
connect(m_play, SIGNAL(clicked()), mediaObject, SLOT(play()));
@@ -41,11 +51,29 @@
connect(m_pause, SIGNAL(clicked()), mediaObject, SLOT(pause()));
layout()->addWidget(m_pause);
layout()->addWidget(new Phonon::SeekSlider(mediaObject, this));
+ KAction* fsac = new KToggleFullScreenAction(this);
+ fsac->setObjectName("KHTMLMediaPlayerFullScreenAction"); // needed for global shortcut activation.
+ m_fullscreen = new QToolButton(this);
+ m_fullscreen->setDefaultAction(fsac);
+ m_fullscreen->setCheckable(true);
+ connect(fsac, SIGNAL(toggled(bool)), this, SLOT(slotToggled(bool)));
+ layout()->addWidget(m_fullscreen);

slotStateChanged(mediaObject->state());
connect(mediaObject, SIGNAL(stateChanged(Phonon::State, Phonon::State)), SLOT(slotStateChanged(Phonon::State)));
}

+void MediaControls::slotToggled(bool t)
+{
+ if (t) {
+ m_mediaPlayer->videoWidget()->enterFullScreen();
+ static_cast<KAction*>(m_fullscreen->defaultAction())->setGlobalShortcut(KShortcut(Qt::Key_Escape));
+ } else {
+ m_mediaPlayer->videoWidget()->exitFullScreen();
+ static_cast<KAction*>(m_fullscreen->defaultAction())->forgetGlobalShortcut();
+ }
+}
+
void MediaControls::slotStateChanged(Phonon::State state)
{
if (state == Phonon::PlayingState) {
--- trunk/KDE/kdelibs/khtml/rendering/media_controls.h #1054223:1054224
@@ -30,20 +30,26 @@
#include <phonon/mediaobject.h>
#include <QWidget>
#include <QtGui/QPushButton>
+#include <QtGui/QToolButton>

namespace khtml {

+class MediaPlayer;
+
class MediaControls : public QWidget {
Q_OBJECT
public:
- MediaControls(Phonon::MediaObject* mobject, QWidget* parent = 0);
+ MediaControls(MediaPlayer* mediaPlayer, QWidget* parent = 0);

private Q_SLOTS:
void slotStateChanged(Phonon::State state);
+ void slotToggled(bool);

private:
QPushButton* m_play;
QPushButton* m_pause;
+ QToolButton* m_fullscreen;
+ MediaPlayer* m_mediaPlayer;
};

} //namespace
--- trunk/KDE/kdelibs/khtml/rendering/render_media.cpp #1054223:1054224
@@ -60,7 +60,7 @@
RenderWidget::layout();

if (mediaElement()->controls() && widget()->layout()->count() == 1) {
- MediaControls* toolbox = new MediaControls(player()->mediaObject(), widget());
+ MediaControls* toolbox = new MediaControls(player(), widget());
widget()->layout()->addWidget(toolbox);
if ((!widget()->underMouse()) && mediaElement()->isVideo())
toolbox->hide();
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml

2009-11-25T10:56:12Z

SVN commit 1054222 by ggarand:

start adding functionality to video and audio tags, via a Phonon player.

patch by Michael Howell <mhowell123@...>

(benignly modified and massaged in some ways)

M +2 -0 CMakeLists.txt
M +49 -9 html/HTMLMediaElement.cpp
M +10 -18 html/HTMLMediaElement.h
M +9 -2 html/HTMLVideoElement.cpp
M +2 -0 html/HTMLVideoElement.h
A rendering/media_controls.cpp html/HTMLVideoElement.h#1054221 [License: BSD]
A rendering/media_controls.h html/HTMLVideoElement.h#1054221 [License: BSD]
AM rendering/render_media.cpp [License: BSD]
AM rendering/render_media.h [License: BSD]
M +1 -0 rendering/render_object.h

--- trunk/KDE/kdelibs/khtml/CMakeLists.txt #1054221:1054222
@@ -342,6 +342,8 @@
${CMAKE_SOURCE_DIR}/khtml/rendering/counter_tree.cpp
${CMAKE_SOURCE_DIR}/khtml/rendering/render_canvasimage.cpp
${CMAKE_SOURCE_DIR}/khtml/rendering/render_position.cpp
+ ${CMAKE_SOURCE_DIR}/khtml/rendering/render_media.cpp
+ ${CMAKE_SOURCE_DIR}/khtml/rendering/media_controls.cpp
)

# khtml/css/Makefile.am: khtmlcss
--- trunk/KDE/kdelibs/khtml/html/HTMLMediaElement.cpp #1054221:1054222
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2009 Michael Howell <mhowell123@...>.
+ * Parts copyright (C) 2007, 2008 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -28,9 +29,14 @@
#include "HTMLMediaElement.h"
#include "HTMLDocument.h"
#include <misc/htmlhashes.h>
-#include <rendering/render_object.h>
#include "MediaError.h"
#include "TimeRanges.h"
+#include "css/cssstyleselector.h"
+#include "css/cssproperties.h"
+#include "css/cssvalues.h"
+#include "css/csshelper.h"
+#include <phonon/mediaobject.h>
+#include <rendering/render_media.h>

const double doubleMax = 999999999.8; // ### numeric_limits<double>::max()
const double doubleInf = 999999999.0; // ### numeric_limits<double>::infinity()
@@ -57,12 +63,37 @@
, m_previousProgressTime(doubleMax)
, m_sentStalledEvent(false)
, m_bufferingRate(0)
- , m_player(0)
+ , m_player(new MediaPlayer())
{
}

+void HTMLMediaElement::attach()
+{
+ assert(!attached());
+ assert(!m_render);
+ assert(parentNode());
+
+ RenderStyle* _style = document()->styleSelector()->styleForElement(this);
+ _style->ref();
+ if (parentNode()->renderer() && parentNode()->renderer()->childAllowed() &&
+ _style->display() != NONE)
+ {
+ m_render = new (document()->renderArena()) RenderMedia(this);
+ static_cast<RenderMedia*>(m_render)->setPlayer(m_player.data());
+ m_render->setStyle(_style);
+ parentNode()->renderer()->addChild(m_render, nextRenderer());
+ }
+ _style->deref();
+
+ NodeBaseImpl::attach();
+ if (m_render)
+ m_render->updateFromElement();
+ setRenderer(m_render);
+}
+
HTMLMediaElement::~HTMLMediaElement()
{
+ if (m_player) m_player->deleteLater();
}

void HTMLMediaElement::attributeChanged(NodeImpl::Id attrId)
@@ -75,10 +106,10 @@
if (inDocument() && m_networkState == EMPTY)
scheduleLoad();
} if (attrId == ATTR_CONTROLS) {
- if (!isVideo() && attached() && (controls() != (renderer() != 0))) {
+ /*if (!isVideo() && attached() && (controls() != (renderer() != 0))) {
detach();
attach();
- }
+ }*/
if (renderer())
renderer()->updateFromElement();
}
@@ -86,7 +117,7 @@

void HTMLMediaElement::scheduleLoad()
{
- // ###
+ kDebug() << "not implemented";
}

String serializeTimeOffset(float time)
@@ -204,7 +235,7 @@

float HTMLMediaElement::duration() const
{
- return m_player ? m_player->duration() : 0;
+ return m_player ? m_player->totalTime() : 0;
}

bool HTMLMediaElement::paused() const
@@ -231,11 +262,13 @@

float HTMLMediaElement::playbackRate() const
{
- return m_player ? m_player->rate() : 0;
+ return 0; // stub...
}

void HTMLMediaElement::setPlaybackRate(float rate, ExceptionCode& ec)
{
+ // stub
+ #if 0
if (rate == 0.0f) {
ec = DOMException::NOT_SUPPORTED_ERR;
return;
@@ -244,6 +277,7 @@
m_player->setRate(rate);
// ### dispatchEventAsync(ratechangeEvent);
}
+ #endif
}

bool HTMLMediaElement::ended() const
@@ -430,9 +464,12 @@
PassRefPtr<TimeRanges> HTMLMediaElement::buffered() const
{
// FIXME real ranges support
+ #if 0
if (!m_player || !m_player->maxTimeBuffered())
return new TimeRanges;
return new TimeRanges(0, m_player->maxTimeBuffered());
+ #endif
+ return new TimeRanges(0, 0.0f); // stub
}

PassRefPtr<TimeRanges> HTMLMediaElement::played() const
@@ -443,10 +480,13 @@

PassRefPtr<TimeRanges> HTMLMediaElement::seekable() const
{
+ #if 0
// FIXME real ranges support
if (!m_player || !m_player->maxTimeSeekable())
return new TimeRanges;
return new TimeRanges(0, m_player->maxTimeSeekable());
+ #endif
+ return new TimeRanges(0, 0.0f); // stub
}

bool HTMLMediaElement::endedPlayback() const
@@ -454,7 +494,7 @@
#if 0
return networkState() >= LOADED_METADATA && currentTime() >= effectiveEnd() && currentLoop() == playCount() - 1;
#endif
- return false;
+ return m_player->mediaObject()->remainingTime() == 0;
}

void HTMLMediaElement::updateVolume()
--- trunk/KDE/kdelibs/khtml/html/HTMLMediaElement.h #1054221:1054222
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2009 Michael Howell <mhowell123@...>.
+ * Parts copyright (C) 2007, 2008 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -28,37 +29,28 @@

#include "HTMLElement.h"
#include "ExceptionCode.h"
-#include <wtf/OwnPtr.h>
#include <wtf/PassRefPtr.h>
+#include <QPointer>

namespace khtml {

class MediaError;
class TimeRanges;
+class RenderMedia;
+class MediaPlayer;

-// dummy
-class MediaPlayer
-{
-public:
- QRect naturalSize() const { return QRect(); }
- float duration() const { return 0; }
- float rate() const { return 0; }
- void setRate(float) { }
- void setVolume(float) { }
- float currentTime() const { return 0; }
- float maxTimeSeekable() { return 0; }
- float maxTimeBuffered() { return 0; }
-};
-
class HTMLMediaElement : public HTMLElement {
public:
HTMLMediaElement(Document*);
virtual ~HTMLMediaElement();

+ virtual void attach();
+
+// virtual void parseAttribute(AttributeImpl *token);
virtual void attributeChanged(NodeImpl::Id attrId);

virtual bool isVideo() const { return false; }
-
+
void scheduleLoad();

// DOM API
@@ -160,7 +152,7 @@

float m_bufferingRate;

- OwnPtr<MediaPlayer> m_player;
+ QPointer<MediaPlayer> m_player;
};

} //namespace
--- trunk/KDE/kdelibs/khtml/html/HTMLVideoElement.cpp #1054221:1054222
@@ -27,6 +27,7 @@

#include "HTMLDocument.h"
#include <misc/htmlhashes.h>
+#include <rendering/render_media.h>

namespace khtml {

@@ -44,14 +45,20 @@
{
if (!m_player)
return 0;
- return m_player->naturalSize().width();
+ if (m_player->mediaObject()->hasVideo())
+ return m_player->videoWidget()->sizeHint().width();
+ else
+ return 0;
}

int HTMLVideoElement::videoHeight() const
{
if (!m_player)
return 0;
- return m_player->naturalSize().height();
+ if (m_player->mediaObject()->hasVideo())
+ return m_player->videoWidget()->sizeHint().height();
+ else
+ return 0;
}

int HTMLVideoElement::width() const
--- trunk/KDE/kdelibs/khtml/html/HTMLVideoElement.h #1054221:1054222
@@ -26,6 +26,8 @@
#ifndef HTMLVideoElement_h
#define HTMLVideoElement_h

+#include <phonon/mediaobject.h>
+#include <phonon/videowidget.h>
#include "HTMLMediaElement.h"

namespace khtml {
** trunk/KDE/kdelibs/khtml/rendering/render_media.cpp #property svn:eol-style
+ native
** trunk/KDE/kdelibs/khtml/rendering/render_media.h #property svn:eol-style
+ native
--- trunk/KDE/kdelibs/khtml/rendering/render_object.h #1054221:1054222
@@ -296,6 +296,7 @@
virtual bool isFormElement() const { return false; }
virtual bool isFrameSet() const { return false; }
virtual bool isApplet() const { return false; }
+ virtual bool isMedia() const { return false; }

virtual bool isEditable() const;

_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml/css

2009-11-25T10:55:55Z

SVN commit 1054220 by ggarand:

fix regression in test suite from the border:none on widgets change

M +1 -1 html4.css

--- trunk/KDE/kdelibs/khtml/css/html4.css #1054219:1054220
@@ -422,7 +422,7 @@
background-color: transparent;
}

-isindex { color: windowtext; font-size: small; }
+isindex { color: windowtext; font-size: small; border: 2px -khtml-native; }

option,
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/kjsembed/kjsembed

2009-11-23T08:35:06Z

SVN commit 1053209 by coles:

Proof-reading: fixed plural-form usage (or specifically, the lack thereof) in kjs warning.

M +4 -1 qobject_binding.cpp

--- trunk/KDE/kdelibs/kjsembed/kjsembed/qobject_binding.cpp #1053208:1053209
@@ -409,7 +409,10 @@

if ( types.size() <= idx )
{
- errorText = i18n("The slot asked for %1 arguments but there are only %2 arguments available.", idx, types.size());
+ const QString firstPart = i18np("The slot asked for %1 argument", "The slot asked for %1 arguments", idx);
+ const QString secondPart = i18np("but there is only %1 available", "but there are only %1 available", types.size());
+ errorText = i18nc("%1 is 'the slot asked for foo arguments', %2 is 'but there are only bar available'", "%1, %2.");
+
return 0;
}

_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml

2009-11-22T17:19:57Z

SVN commit 1053050 by coles:

Proof-read khtml messages, corrected one case of plural form usage.

M +1 -1 khtml_part.cpp
M +2 -2 khtml_printsettings.cpp
M +2 -2 test_regression_gui.ui

--- trunk/KDE/kdelibs/khtml/khtml_part.cpp #1053049:1053050
@@ -3593,7 +3593,7 @@
else if ( ok && S_ISREG( buff.st_mode ) )
{
if (buff.st_size < 1024)
- text = i18n("%2 (%1 bytes)", (long) buff.st_size, text2); // always put the URL last, in case it contains '%'
+ text = i18np("%2 (%1 byte)", "%2 (%1 bytes)", (long) buff.st_size, text2); // always put the URL last, in case it contains '%'
else
{
float d = (float) buff.st_size/1024.0;
--- trunk/KDE/kdelibs/khtml/khtml_printsettings.cpp #1053049:1053050
@@ -64,8 +64,8 @@
"If this checkbox is disabled, the printout of the HTML document will "
"happen in the original color settings as you see in your application. "
"This may result in areas of full-page color (or grayscale, if you use "
- "a black+white printer). Printout will possibly happen slower and will "
- "certainly use much more toner or ink."
+ "a black+white printer). Printout will possibly happen more slowly and "
+ "will probably use more toner or ink."
"</p>"
" </qt>" );
setWindowTitle(i18n("HTML Settings"));
--- trunk/KDE/kdelibs/khtml/test_regression_gui.ui #1053049:1053050
@@ -141,10 +141,10 @@
</size>
</property>
<property name="toolTip" >
- <string>You may select a file where the log content is stored, before the regression testing started.</string>
+ <string>You may select a file where the log content is stored, before the regression testing is started.</string>
</property>
<property name="whatsThis" >
- <string>You may select a file where the log content is stored, before the regression testing started.</string>
+ <string>You may select a file where the log content is stored, before the regression testing is started.</string>
</property>
<property name="text" >
<string>Output to File...</string>
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

branches/KDE/3.5/kdelibs/kjs

2009-11-20T11:37:47Z

SVN commit 1052104 by mueller:

fix array overrun (CVE-2009-0689)

M +1 -1 dtoa.cpp

--- branches/KDE/3.5/kdelibs/kjs/dtoa.cpp #1052103:1052104
@@ -487,7 +487,7 @@
#define FREE_DTOA_LOCK(n) /*nothing*/
#endif

-#define Kmax 15
+#define Kmax (sizeof(size_t) << 3)

struct
Bigint {
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

branches/KDE/4.1/kdelibs/kjs

2009-11-20T11:36:49Z

SVN commit 1052103 by mueller:

fix array overrun (CVE-2009-0689)

M +1 -1 dtoa.cpp

--- branches/KDE/4.1/kdelibs/kjs/dtoa.cpp #1052102:1052103
@@ -491,7 +491,7 @@
#define FREE_DTOA_LOCK(n) /*nothing*/
#endif

-#define Kmax 15
+#define Kmax (sizeof(size_t) << 3)

struct
Bigint {
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

branches/KDE/4.2/kdelibs/kjs

2009-11-20T11:36:19Z

SVN commit 1052102 by mueller:

fix array overrun (CVE-2009-0689)

M +1 -1 dtoa.cpp

--- branches/KDE/4.2/kdelibs/kjs/dtoa.cpp #1052101:1052102
@@ -457,7 +457,7 @@
#define FREE_DTOA_LOCK(n) /*nothing*/
#endif

-#define Kmax 15
+#define Kmax (sizeof(size_t) << 3)

struct
Bigint {
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/kjs

2009-11-20T11:35:49Z

SVN commit 1052101 by mueller:

fix array overrun (CVE-2009-0689)

M +1 -1 dtoa.cpp

--- trunk/KDE/kdelibs/kjs/dtoa.cpp #1052100:1052101
@@ -457,7 +457,7 @@
#define FREE_DTOA_LOCK(n) /*nothing*/
#endif

-#define Kmax 15
+#define Kmax (sizeof(size_t) << 3)

struct
Bigint {
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

branches/KDE/4.3/kdelibs/kjs

2009-11-20T11:35:01Z

SVN commit 1052100 by mueller:

fix array overrun (CVE-2009-0689)

M +1 -1 dtoa.cpp

--- branches/KDE/4.3/kdelibs/kjs/dtoa.cpp #1052099:1052100
@@ -457,7 +457,7 @@
#define FREE_DTOA_LOCK(n) /*nothing*/
#endif

-#define Kmax 15
+#define Kmax (sizeof(size_t) << 3)

struct
Bigint {
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml/xml

2009-11-18T12:11:53Z

SVN commit 1051076 by orlovich:

Fix assert fail when cloneNode is called on an entry with dirty
inline style information but no attribute map created yet
(happens e.g. on the dot)

BUG:214662
BUG:215115

M +2 -2 dom_elementimpl.cpp

--- trunk/KDE/kdelibs/khtml/xml/dom_elementimpl.cpp #1051075:1051076
@@ -5,7 +5,7 @@
* (C) 1999 Antti Koivisto (koivisto@...)
* (C) 2001 Peter Kelly (pmk@...)
* (C) 2001 Dirk Mueller (mueller@...)
- * (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
+ * (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
* (C) 2005, 2008 Maksim Orlovich (maksim@...)
* (C) 2006 Allan Sandfeld Jensen (kde@...)
*
@@ -586,7 +586,7 @@
void ElementImpl::finishCloneNode( ElementImpl* clone, bool deep )
{
// clone attributes
- if (namedAttrMap)
+ if (namedAttrMap || m_needsStyleAttributeUpdate)
clone->attributes()->copyAttributes(attributes(true));

assert( !m_needsStyleAttributeUpdate ); // ensured by previous line
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs

2009-11-17T12:56:26Z

SVN commit 1050659 by dfaure:

Document the meaning of setForcesNewWindow(true) more precisely, and use that
instead of the metaData()["forcesnewwindow"] hack for the case of "open frame in new window".
Made possible by 1050644.

M +3 -2 khtml/khtml_ext.cpp
M +16 -1 kparts/browserextension.h

--- trunk/KDE/kdelibs/khtml/khtml_ext.cpp #1050658:1050659
@@ -885,8 +885,9 @@
{
KParts::OpenUrlArguments args = d->m_khtml->arguments();
args.metaData()["referrer"] = d->m_khtml->pageReferrer();
- args.metaData()["forcenewwindow"] = "true";
- emit d->m_khtml->browserExtension()->createNewWindow( d->m_khtml->url(), args );
+ KParts::BrowserArguments browserArgs( d->m_khtml->browserExtension()->browserArguments() );
+ browserArgs.setForcesNewWindow(true);
+ emit d->m_khtml->browserExtension()->createNewWindow( d->m_khtml->url(), args, browserArgs );
}

void KHTMLPopupGUIClient::slotFrameInTop()
--- trunk/KDE/kdelibs/kparts/browserextension.h #1050658:1050659
@@ -154,7 +154,22 @@
void setRedirectedRequest(bool redirected);

/**
- * Set whether the URL specifies to be opened in a new window
+ * Set whether the URL specifies to be opened in a new window.
+ *
+ * When openUrlRequest is emitted:
+ * <ul>
+ * <li>normally the url would be opened in the current view.</li>
+ * <li>setForcesNewWindow(true) specifies that a new window or tab should be used:
+ * setNewTab(true) requests a tab specifically, otherwise the user-preference is followed.
+ * This is typically used for target="_blank" in web browsers.</li>
+ * </ul>
+ *
+ * When createNewWindow is emitted:
+ * <ul>
+ * <li>if setNewTab(true) was called, a tab is created.</li>
+ * <li>otherwise, if setForcesNewWindow(true) was called, a window is created.</li>
+ * <li>otherwise the user preference is followed.</li>
+ * </ul>
*/
void setForcesNewWindow( bool forcesNewWindow );

_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml

2009-11-16T18:00:18Z

SVN commit 1050279 by dfaure:

Clean up the old code for making "go back on rmb click" work with framesets too;
the new konqrmbeventfilter in konqueror handles all cases, no point in having the
feature split up between both codebases. (This reverts r167571, 2002-07-19)

M +1 -14 khtml_part.cpp
M +1 -5 khtml_settings.cpp
M +1 -0 khtml_settings.h
M +0 -1 khtmlpart_p.h

--- trunk/KDE/kdelibs/khtml/khtml_part.cpp #1050278:1050279
@@ -492,7 +492,6 @@

// set the default java(script) flags according to the current host.
d->m_bOpenMiddleClick = d->m_settings->isOpenMiddleClickEnabled();
- d->m_bBackRightClick = d->m_settings->isBackRightClickEnabled();
d->m_bJScriptEnabled = d->m_settings->isJavaScriptEnabled();
setDebugScript( d->m_settings->isJavaScriptDebugEnabled() );
d->m_bJavaEnabled = d->m_settings->isJavaEnabled();
@@ -5850,7 +5849,6 @@
d->m_doc->docLoader()->setShowAnimations( settings->showAnimations() );

d->m_bOpenMiddleClick = settings->isOpenMiddleClickEnabled();
- d->m_bBackRightClick = settings->isBackRightClickEnabled();
d->m_bJScriptEnabled = settings->isJavaScriptEnabled(url().host());
setDebugScript( settings->isJavaScriptDebugEnabled() );
d->m_bJavaEnabled = settings->isJavaEnabled(url().host());
@@ -6180,11 +6178,8 @@
#endif
}

- if ( _mouse->button() == Qt::RightButton && parentPart() != 0 && d->m_bBackRightClick )
+ if ( _mouse->button() == Qt::RightButton )
{
- d->m_bRightMousePressed = true;
- } else if ( _mouse->button() == Qt::RightButton )
- {
popupMenu( d->m_strSelectedURL );
// might be deleted, don't touch "this"
}
@@ -6426,14 +6421,6 @@
d->m_bMousePressed = false;

QMouseEvent *_mouse = event->qmouseEvent();
- if ( _mouse->button() == Qt::RightButton && parentPart() != 0 && d->m_bBackRightClick )
- {
- d->m_bRightMousePressed = false;
- KParts::BrowserInterface *tmp_iface = d->m_extension->browserInterface();
- if( tmp_iface ) {
- tmp_iface->callMethod( "goHistory", -1 );
- }
- }
#ifndef QT_NO_CLIPBOARD
if ((d->m_guiProfile == BrowserViewGUI) && (_mouse->button() == Qt::MidButton) && (event->url().isNull())) {
kDebug( 6050 ) << "MMB shouldOpen=" << d->m_bOpenMiddleClick;
--- trunk/KDE/kdelibs/khtml/khtml_settings.cpp #1050278:1050279
@@ -69,7 +69,6 @@
public:
bool m_bChangeCursor : 1;
bool m_bOpenMiddleClick : 1;
- bool m_bBackRightClick : 1;
bool m_underlineLink : 1;
bool m_hoverLink : 1;
bool m_bEnableJavaScriptDebug : 1;
@@ -311,9 +310,6 @@
{
if ( reset || cg.hasKey( "OpenMiddleClick" ) )
d->m_bOpenMiddleClick = cg.readEntry( "OpenMiddleClick", true );
-
- if ( reset || cg.hasKey( "BackRightClick" ) )
- d->m_bBackRightClick = cg.readEntry( "BackRightClick", false );
}

KConfigGroup cgAccess(config,"Access Keys" );
@@ -712,7 +708,7 @@

bool KHTMLSettings::isBackRightClickEnabled()
{
- return d->m_bBackRightClick;
+ return false; // ## the feature moved to konqueror
}

bool KHTMLSettings::accessKeysEnabled() const
--- trunk/KDE/kdelibs/khtml/khtml_settings.h #1050278:1050279
@@ -176,6 +176,7 @@
bool unfinishedImageFrame() const;

bool isOpenMiddleClickEnabled();
+ /// @deprecated do not use, feature was moved to be only in konqueror
bool isBackRightClickEnabled();

// Java and JavaScript
--- trunk/KDE/kdelibs/khtml/khtmlpart_p.h #1050278:1050279
@@ -298,7 +298,6 @@
#endif
int m_runningScripts;
bool m_bOpenMiddleClick;
- bool m_bBackRightClick;
bool m_bJScriptEnabled;
bool m_bJScriptDebugEnabled;
bool m_bJavaEnabled;
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml/imload/decoders

2009-11-10T14:58:34Z

SVN commit 1047308 by cfeck:

Fix loading of CMYK jpeg images

BUG: 135789
BUG: 189414
BUG: 193152

M +13 -0 jpegloader.cpp

--- trunk/KDE/kdelibs/khtml/imload/decoders/jpegloader.cpp #1047307:1047308
@@ -346,6 +346,9 @@
if ( cinfo.jpeg_color_space == JCS_YCbCr )
cinfo.out_color_space = JCS_RGB;

+ if ( cinfo.jpeg_color_space == JCS_YCCK )
+ cinfo.out_color_space = JCS_CMYK;
+
cinfo.do_fancy_upsampling = true;
cinfo.do_block_smoothing = false;
cinfo.quantize_colors = false;
@@ -432,6 +435,16 @@
in-=3;
out[i] = qRgb(in[0], in[1], in[2]);
}
+ } else if ( cinfo.out_color_space == JCS_CMYK ) {
+ uchar *in = scanline + cinfo.output_width * 4;
+ QRgb *out = (QRgb *) scanline;
+
+ for (uint i = cinfo.output_width; i--; )
+ {
+ in -= 4;
+ int k = in[3];
+ out[i] = qRgb(k * in[0] / 255, k * in[1] / 255, k * in[2] / 255);
+ }
}

owner->notifyScanline(passNum + 1, scanline);
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml

2009-11-08T11:29:06Z

SVN commit 1046457 by ggarand:

better design for |style| attribute synchronization : use a specific
class for inline styles (CSSInlineStyleDeclarationImpl) that knows better
when to mark its node.

cleaner that way, and solves the problem that the node used to be marked as
needing sync upon initial |style| attribute parsing.

M +20 -3 css/css_valueimpl.cpp
M +9 -1 css/css_valueimpl.h
M +1 -5 html/html_elementimpl.cpp
M +3 -3 xml/dom_elementimpl.cpp
M +8 -6 xml/dom_elementimpl.h

--- trunk/KDE/kdelibs/khtml/css/css_valueimpl.cpp #1046456:1046457
@@ -684,9 +684,6 @@
void CSSStyleDeclarationImpl::setChanged()
{
if (m_node) {
- if (m_node->nodeType() == Node::ELEMENT_NODE && (static_cast<ElementImpl*>(m_node)->inlineStyleDecls() == this)) {
- m_node->setNeedsStyleAttributeUpdate();
- }
m_node->setChanged();
return;
}
@@ -877,7 +874,27 @@
// ###
}

+// --------------------------------------------------------------------------------------

+void CSSInlineStyleDeclarationImpl::setChanged()
+{
+ if (m_node)
+ m_node->setNeedsStyleAttributeUpdate();
+ CSSStyleDeclarationImpl::setChanged();
+}
+
+void CSSInlineStyleDeclarationImpl::updateFromAttribute(const DOMString &value)
+{
+ if(!m_lstValues) {
+ m_lstValues = new QList<CSSProperty*>;
+ } else {
+ clear();
+ }
+ CSSParser parser( strictParsing );
+ parser.parseDeclaration( this, value );
+ CSSStyleDeclarationImpl::setChanged();
+}
+
// --------------------------------------------------------------------------------------

unsigned short CSSInheritedValueImpl::cssValueType() const
--- trunk/KDE/kdelibs/khtml/css/css_valueimpl.h #1046456:1046457
@@ -91,7 +91,7 @@
QList<CSSProperty*> *values() const { return m_lstValues; }
void setNode(NodeImpl *_node) { m_node = _node; }

- void setChanged();
+ virtual void setChanged();

void removeCSSHints();

@@ -109,6 +109,14 @@
CSSStyleDeclarationImpl(const CSSStyleDeclarationImpl& o);
};

+class CSSInlineStyleDeclarationImpl : public CSSStyleDeclarationImpl
+{
+public:
+ CSSInlineStyleDeclarationImpl(CSSRuleImpl *parentRule): CSSStyleDeclarationImpl(parentRule) {}
+ virtual void setChanged();
+ void updateFromAttribute(const DOMString &value);
+};
+
class CSSValueImpl : public StyleBaseImpl
{
public:
--- trunk/KDE/kdelibs/khtml/html/html_elementimpl.cpp #1046456:1046457
@@ -156,11 +156,7 @@
setContentEditable(attr);
break;
case ATTR_STYLE:
- if (inlineStyleDecls())
- inlineStyleDecls()->clear();
- else
- createInlineDecl();
- inlineStyleDecls()->setProperty(attr->value());
+ getInlineStyleDecls()->updateFromAttribute(attr->value());
setChanged();
break;
case ATTR_TABINDEX:
--- trunk/KDE/kdelibs/khtml/xml/dom_elementimpl.cpp #1046456:1046457
@@ -1098,7 +1098,7 @@
void ElementImpl::createNonCSSDecl()
{
assert(!m_hasCombinedStyle);
- CSSStyleDeclarationImpl *ild = m_style.inlineDecls;
+ CSSInlineStyleDeclarationImpl *ild = m_style.inlineDecls;
m_style.combinedDecls = new CombinedStyleDecl;
m_style.combinedDecls->inlineDecls = ild;
CSSStyleDeclarationImpl *ncd = new CSSStyleDeclarationImpl(0);
@@ -1110,7 +1110,7 @@
m_hasCombinedStyle = true;
}

-CSSStyleDeclarationImpl *ElementImpl::getInlineStyleDecls()
+CSSInlineStyleDeclarationImpl *ElementImpl::getInlineStyleDecls()
{
if (!inlineStyleDecls()) createInlineDecl();
return inlineStyleDecls();
@@ -1120,7 +1120,7 @@
{
assert( !m_style.inlineDecls || (m_hasCombinedStyle && !m_style.combinedDecls->inlineDecls) );

- CSSStyleDeclarationImpl *dcl = new CSSStyleDeclarationImpl(0);
+ CSSInlineStyleDeclarationImpl *dcl = new CSSInlineStyleDeclarationImpl(0);
dcl->ref();
dcl->setParent(document()->elementSheet());
dcl->setNode(this);
--- trunk/KDE/kdelibs/khtml/xml/dom_elementimpl.h #1046456:1046457
@@ -48,6 +48,7 @@
class DocumentImpl;
class NamedAttrMapImpl;
class ElementRareDataImpl;
+class CSSInlineStyleDeclarationImpl;

// Attr can have Text and EntityReference children
// therefore it has to be a fullblown Node. The plan
@@ -160,7 +161,7 @@

struct CombinedStyleDecl
{
- DOM::CSSStyleDeclarationImpl *inlineDecls;
+ DOM::CSSInlineStyleDeclarationImpl *inlineDecls;
DOM::CSSStyleDeclarationImpl *nonCSSDecls;
};

@@ -178,7 +179,7 @@
// stuff for WebCore DOM & SVG api compatibility
virtual bool hasTagName(const QualifiedName& name) const { return qualifiedName() == name;/*should be matches here*/ }
QualifiedName qualifiedName() const { return QualifiedName(id(), m_prefix); }
- CSSStyleDeclarationImpl* style() { return getInlineStyleDecls(); }
+ CSSInlineStyleDeclarationImpl* style() { return getInlineStyleDecls(); }
void setAttribute(const QualifiedName& name, const DOMString& value) {
setAttribute(name.id(), value); /* is it enough for SVG or should the full setAttribute() be called? */
}
@@ -313,9 +314,9 @@

virtual bool childAllowed( NodeImpl *newChild );
virtual bool childTypeAllowed( unsigned short type );
- DOM::CSSStyleDeclarationImpl *inlineStyleDecls() const { return m_hasCombinedStyle ? m_style.combinedDecls->inlineDecls : m_style.inlineDecls; }
+ DOM::CSSInlineStyleDeclarationImpl *inlineStyleDecls() const { return m_hasCombinedStyle ? m_style.combinedDecls->inlineDecls : m_style.inlineDecls; }
DOM::CSSStyleDeclarationImpl *nonCSSStyleDecls() const { return m_hasCombinedStyle ? m_style.combinedDecls->nonCSSDecls : 0; }
- DOM::CSSStyleDeclarationImpl *getInlineStyleDecls();
+ DOM::CSSInlineStyleDeclarationImpl *getInlineStyleDecls();

void dispatchAttrRemovalEvent(NodeImpl::Id id, DOMStringImpl *value);
void dispatchAttrAdditionEvent(NodeImpl::Id id, DOMStringImpl *value);
@@ -371,7 +372,7 @@
mutable NamedAttrMapImpl *namedAttrMap;

union {
- DOM::CSSStyleDeclarationImpl *inlineDecls;
+ DOM::CSSInlineStyleDeclarationImpl *inlineDecls;
CombinedStyleDecl *combinedDecls;
} m_style;
PrefixName m_prefix;
@@ -540,9 +541,10 @@
}
}

-// methods that could be very hot they are need to be inlined
+// methods that could be very hot and therefore need to be inlined
inline DOMStringImpl* ElementImpl::getAttributeImpl(NodeImpl::Id id, const PrefixName& prefix, bool nsAware) const
{
+ if (m_needsStyleAttributeUpdate && (id == ATTR_STYLE)) synchronizeStyleAttribute();
return namedAttrMap ? namedAttrMap->getValue(id, prefix, nsAware) : 0;
}

_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml

2009-11-08T11:28:58Z

SVN commit 1046456 by ggarand:

need to distinguish at least two types of CSS value lists : those that
use the comma as a separator when flattened to a string, and
those that use the space.

initial patch by Vincent Ricard <magic@...>, with input from
dfaure and SadEagle, extended to apply to (hopefully) all relevant
properties.

BUG: 105108

M +1 -1 css/css_renderstyledeclarationimpl.cpp
M +1 -1 css/css_svgcssparser.cpp
M +7 -1 css/css_valueimpl.cpp
M +8 -1 css/css_valueimpl.h
M +3 -3 css/css_webfont.cpp
M +5 -5 css/cssparser.cpp
M +1 -1 svg/SVGFontFaceElement.cpp
M +1 -1 svg/SVGFontFaceSrcElement.cpp

--- trunk/KDE/kdelibs/khtml/css/css_renderstyledeclarationimpl.cpp #1046455:1046456
@@ -304,7 +304,7 @@
{
if (!shadow)
return new CSSPrimitiveValueImpl(CSS_VAL_NONE);
- CSSValueListImpl *list = new CSSValueListImpl;
+ CSSValueListImpl *list = new CSSValueListImpl(CSSValueListImpl::Comma);
for (const ShadowData *s = shadow; s; s = s->next) {
CSSPrimitiveValueImpl *x = new CSSPrimitiveValueImpl(s->x, CSSPrimitiveValue::CSS_PX);
CSSPrimitiveValueImpl *y = new CSSPrimitiveValueImpl(s->y, CSSPrimitiveValue::CSS_PX);
--- trunk/KDE/kdelibs/khtml/css/css_svgcssparser.cpp #1046455:1046456
@@ -303,7 +303,7 @@

CSSValueImpl* CSSParser::parseSVGStrokeDasharray()
{
- CSSValueListImpl* ret = new CSSValueListImpl;
+ CSSValueListImpl* ret = new CSSValueListImpl(CSSValueListImpl::Comma);
Value* value = valueList->current();
bool valid_primitive = true;
while (value) {
--- trunk/KDE/kdelibs/khtml/css/css_valueimpl.cpp #1046455:1046456
@@ -924,7 +924,13 @@
DOMString result = "";

for (QListIterator<CSSValueImpl*> iterator(m_values); iterator.hasNext();) {
- result += iterator.next()->cssText();
+ if (!result.isEmpty()) {
+ if (m_separator == Comma)
+ result += ", ";
+ else if (m_separator == Space)
+ result += " ";
+ }
+ result += iterator.next()->cssText();
}

return result;
--- trunk/KDE/kdelibs/khtml/css/css_valueimpl.h #1046455:1046456
@@ -152,8 +152,14 @@
class CSSValueListImpl : public CSSValueImpl
{
public:
- CSSValueListImpl() : CSSValueImpl() {}
+ enum Separator {
+ Space,
+ Comma
+ };

+ CSSValueListImpl() : CSSValueImpl(), m_separator(Space) {}
+ CSSValueListImpl(Separator sep) : CSSValueImpl(), m_separator(sep) {}
+
virtual ~CSSValueListImpl();

unsigned long length() const { return m_values.count(); }
@@ -167,6 +173,7 @@
virtual DOM::DOMString cssText() const;

protected:
+ KDE_BF_ENUM(Separator) m_separator: 1;
QList<CSSValueImpl*> m_values;
};

--- trunk/KDE/kdelibs/khtml/css/css_webfont.cpp #1046455:1046456
@@ -372,7 +372,7 @@
if (CSSValueImpl* fontStyle = style->getPropertyCSSValue(CSS_PROP_FONT_STYLE)) {

if (fontStyle->isPrimitiveValue()) {
- CSSValueListImpl* list = new CSSValueListImpl();// ### CSSValueListImpl::createCommaSeparated();
+ CSSValueListImpl* list = new CSSValueListImpl(CSSValueListImpl::Comma);
list->append(fontStyle);
fontStyle = list;
} else if (!fontStyle->isValueList())
@@ -404,7 +404,7 @@

if (CSSValueImpl* fontWeight = style->getPropertyCSSValue(CSS_PROP_FONT_WEIGHT)) {
if (fontWeight->isPrimitiveValue()) {
- CSSValueListImpl* list = new CSSValueListImpl();// ### CSSValueListImpl::createCommaSeparated();
+ CSSValueListImpl* list = new CSSValueListImpl(CSSValueListImpl::Comma);
list->append(fontWeight);
fontWeight = list;
} else if (!fontWeight->isValueList())
@@ -460,7 +460,7 @@

if (CSSValueImpl* fontVariant = style->getPropertyCSSValue(CSS_PROP_FONT_VARIANT)) {
if (fontVariant->isPrimitiveValue()) {
- CSSValueListImpl* list = new CSSValueListImpl();// ### CSSValueListImpl::createCommaSeparated();
+ CSSValueListImpl* list = new CSSValueListImpl(CSSValueListImpl::Comma);
list->append(fontVariant);
fontVariant = list;
} else if (!fontVariant->isValueList())
--- trunk/KDE/kdelibs/khtml/css/cssparser.cpp #1046455:1046456
@@ -348,7 +348,7 @@
// change those to a list of values containing a single value, so that we may always cast to a list in the CSSFontSelector.
CSSValueImpl* value = property->value();
value->ref();
- property->setValue( new CSSValueListImpl ); // ### createCommaSeparated();
+ property->setValue( new CSSValueListImpl(CSSValueListImpl::Comma) );
static_cast<CSSValueListImpl*>(property->value())->append(value);
value->deref();
}
@@ -1489,7 +1489,7 @@
// [ <string> | attr(X) | open-quote | close-quote | no-open-quote | no-close-quote ]+ | inherit
bool CSSParser::parseContent( int propId, bool important )
{
- CSSValueListImpl* values = new CSSValueListImpl();
+ CSSValueListImpl* values = new CSSValueListImpl(CSSValueListImpl::Comma);

bool isValid = true;
Value *val;
@@ -2116,7 +2116,7 @@
CSSValueListImpl *CSSParser::parseFontFamily()
{
// kDebug( 6080 ) << "CSSParser::parseFontFamily current=" << valueList->currentValue;
- CSSValueListImpl *list = new CSSValueListImpl;
+ CSSValueListImpl *list = new CSSValueListImpl(CSSValueListImpl::Comma);
Value *value = valueList->current();
QString currFace;

@@ -2202,7 +2202,7 @@

bool CSSParser::parseFontFaceSrc()
{
- CSSValueListImpl* values = new CSSValueListImpl; // ### CSSValueList::createCommaSeparated()
+ CSSValueListImpl* values = new CSSValueListImpl(CSSValueListImpl::Comma);
Value* val;
bool expectComma = false;
bool allowFormat = false;
@@ -2479,7 +2479,7 @@
// Handle the ,, case gracefully by doing nothing.
if (x || y || blur || color) {
if (!values)
- values = new CSSValueListImpl();
+ values = new CSSValueListImpl(CSSValueListImpl::Comma);

// Construct the current shadow value and add it to the list.
values->append(new ShadowValueImpl(x, y, blur, color));
--- trunk/KDE/kdelibs/khtml/svg/SVGFontFaceElement.cpp #1046455:1046456
@@ -318,7 +318,7 @@
if (describesParentFont) {
m_fontElement = static_cast<SVGFontElement*>(parentNode());

- list = new CSSValueList;
+ list = new CSSValueList; // ### CSSValueListImpl(CSSValueListImpl::Comma);
list->append(new CSSFontFaceSrcValue(fontFamily(), true));
} else if (srcElement)
list = srcElement->srcValue();
--- trunk/KDE/kdelibs/khtml/svg/SVGFontFaceSrcElement.cpp #1046455:1046456
@@ -40,7 +40,7 @@

PassRefPtr<CSSValueList> SVGFontFaceSrcElement::srcValue() const
{
- RefPtr<CSSValueList> list = new CSSValueList;
+ RefPtr<CSSValueList> list = new CSSValueList; // ### CSSValueListImpl(CSSValueListImpl::Comma)
for (Node* child = firstChild(); child; child = child->nextSibling()) {
if (child->hasTagName(font_face_uriTag))
list->append(static_cast<SVGFontFaceUriElement*>(child)->srcValue());
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml/rendering

2009-11-08T11:28:50Z

SVN commit 1046455 by ggarand:

better handling of <col> elements in fixed-layout tables

tested in webcore/fast/table/fixed-granular-cols.html

patch by Dan Bernstein <mitz@...> wc/r42577/

M +20 -16 table_layout.cpp

--- trunk/KDE/kdelibs/khtml/rendering/table_layout.cpp #1046454:1046455
@@ -93,7 +93,6 @@

// iterate over all <col> elements
RenderObject *child = table->firstChild();
- int cCol = 0;
int nEffCols = table->numEffCols();
width.resize( nEffCols );
width.fill( Length( Auto ) );
@@ -103,11 +102,11 @@
qDebug(" col elements:");
#endif

+ int currentEffectiveColumn = 0;
Length grpWidth;
while ( child ) {
if ( child->isTableCol() ) {
RenderTableCol *col = static_cast<RenderTableCol *>(child);
- int span = col->span();
if ( col->firstChild() ) {
grpWidth = col->style()->width();
} else {
@@ -123,28 +122,33 @@
qDebug(" col element: effCol=%d, span=%d: %d w=%d type=%d",
cCol, span, effWidth, w.rawValue(), w.type());
#endif
- int usedSpan = 0;
- int i = 0;
- while ( usedSpan < span ) {
- if( cCol + i >= nEffCols ) {
- table->appendColumn( span - usedSpan );
+ int span = col->span();
+ while (span) {
+ int spanInCurrentEffectiveColumn;
+ if (currentEffectiveColumn >= nEffCols) {
+ table->appendColumn(span);
nEffCols++;
- width.resize( nEffCols );
- width[nEffCols-1] = Length();
+ width.append(Length());
+ spanInCurrentEffectiveColumn = span;
+ } else {
+ if (span < table->spanOfEffCol(currentEffectiveColumn)) {
+ table->splitColumn(currentEffectiveColumn, span);
+ nEffCols++;
+ width.append(Length());
+ }
+ spanInCurrentEffectiveColumn = table->spanOfEffCol(currentEffectiveColumn);
}
- int eSpan = table->spanOfEffCol( cCol+i );
if ( (w.isFixed() || w.isPercent()) && w.isPositive()) {
- width[cCol+i].setRawValue(w.type(), w.rawValue() * eSpan);
- usedWidth += effWidth * eSpan;
+ width[currentEffectiveColumn].setRawValue(w.type(), w.rawValue() * spanInCurrentEffectiveColumn);
+ usedWidth += effWidth * spanInCurrentEffectiveColumn;
#ifdef DEBUG_LAYOUT
qDebug(" setting effCol %d (span=%d) to width %d(type=%d)",
cCol+i, eSpan, width[cCol+i].rawValue(), width[cCol+i].type() );
#endif
}
- usedSpan += eSpan;
- i++;
+ span -= spanInCurrentEffectiveColumn;
+ currentEffectiveColumn++;
}
- cCol += i;
}
} else {
break;
@@ -170,7 +174,7 @@
if ( !section )
section = table->foot;
if ( section && section->firstChild() ) {
- cCol = 0;
+ int cCol = 0;
// get the first cell in the first row
child = section->firstChild()->firstChild();
while ( child ) {
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml/rendering

2009-11-08T11:28:45Z

SVN commit 1046454 by ggarand:

don't stop testing the inner line boxes if the parent inline is
visibility:hidden. Inner children might override visibility.

patch by Allan Sandfeld Jensen

BUG: 149018

M +3 -9 render_inline.cpp

--- trunk/KDE/kdelibs/khtml/rendering/render_inline.cpp #1046453:1046454
@@ -872,20 +872,14 @@

bool RenderInline::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty, HitTestAction hitTestAction, bool inside)
{
-/*
- if ( hitTestAction != HitTestSelfOnly ) {
- for (RenderObject* child = lastChild(); child; child = child->previousSibling())
- if (!child->layer() && !child->isFloating() && child->nodeAtPoint(info, _x, _y, _tx, _ty, HitTestAll))
- inside = true;
- }
-*/
+
// Check our line boxes if we're still not inside.
- if (/*hitTestAction != HitTestChildrenOnly &&*/ !inside && style()->visibility() != HIDDEN) {
+ if (!inside) {
// See if we're inside one of our line boxes.
inside = hitTestLines(info, _x, _y, _tx, _ty, hitTestAction);
}

- if (inside && element()) {
+ if (inside && element() && style()->visibility() != HIDDEN) {
if (info.innerNode() && info.innerNode()->renderer() &&
!info.innerNode()->renderer()->isInline()) {
// Within the same layer, inlines are ALWAYS fully above blocks. Change inner node.
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml

2009-11-08T11:28:40Z

SVN commit 1046453 by ggarand:

rework synchronization of the |style| attribute so that is is done
lazzily on attribute retrieval instead.

M +1 -2 css/css_valueimpl.cpp
M +7 -3 xml/dom_elementimpl.cpp
M +2 -1 xml/dom_elementimpl.h
M +3 -2 xml/dom_nodeimpl.cpp
M +5 -2 xml/dom_nodeimpl.h

--- trunk/KDE/kdelibs/khtml/css/css_valueimpl.cpp #1046452:1046453
@@ -685,8 +685,7 @@
{
if (m_node) {
if (m_node->nodeType() == Node::ELEMENT_NODE && (static_cast<ElementImpl*>(m_node)->inlineStyleDecls() == this)) {
- // FIXME: potentially costly...
- static_cast<ElementImpl*>(m_node)->synchronizeStyleAttribute();
+ m_node->setNeedsStyleAttributeUpdate();
}
m_node->setChanged();
return;
--- trunk/KDE/kdelibs/khtml/xml/dom_elementimpl.cpp #1046452:1046453
@@ -587,8 +587,10 @@
{
// clone attributes
if (namedAttrMap)
- clone->attributes()->copyAttributes(namedAttrMap);
+ clone->attributes()->copyAttributes(attributes(true));

+ assert( !m_needsStyleAttributeUpdate ); // ensured by previous line
+
// clone individual style rules
if (m_style.inlineDecls) {
if (m_hasCombinedStyle) {
@@ -1368,9 +1370,11 @@
document()->setFocusNode(this);
}

-void ElementImpl::synchronizeStyleAttribute()
+void ElementImpl::synchronizeStyleAttribute() const
{
- DOMString value = getInlineStyleDecls()->cssText();
+ assert(inlineStyleDecls() && m_needsStyleAttributeUpdate);
+ m_needsStyleAttributeUpdate = false;
+ DOMString value = inlineStyleDecls()->cssText();
attributes()->setValueWithoutElementUpdate(ATTR_STYLE, value.implementation());
}

--- trunk/KDE/kdelibs/khtml/xml/dom_elementimpl.h #1046452:1046453
@@ -260,6 +260,7 @@

NamedAttrMapImpl* attributes(bool readonly = false) const
{
+ if (m_needsStyleAttributeUpdate) synchronizeStyleAttribute();
if (!readonly && !namedAttrMap) createAttributeMap();
return namedAttrMap;
}
@@ -349,7 +350,7 @@
virtual void addId (const DOMString& id);

// Synchronize style attribute after it was changed via CSSOM
- void synchronizeStyleAttribute();
+ void synchronizeStyleAttribute() const;

protected:
void createAttributeMap() const;
--- trunk/KDE/kdelibs/khtml/xml/dom_nodeimpl.cpp #1046452:1046453
@@ -78,7 +78,6 @@
m_changedAscendentAttribute( false ),
m_inDocument( false ),
m_hasAnchor( false ),
- m_elementHasRareData( false ),
m_hovered( false ),
m_focused( false ),
m_active( false ),
@@ -86,7 +85,9 @@
m_htmlCompat( false ),
m_hasClass( false ),
m_hasCombinedStyle( false ),
- m_hasHoverDependency(false)
+ m_hasHoverDependency( false ),
+ m_elementHasRareData( false ),
+ m_needsStyleAttributeUpdate( false )
{
}

--- trunk/KDE/kdelibs/khtml/xml/dom_nodeimpl.h #1046452:1046453
@@ -280,6 +280,7 @@
void setHTMLCompat(bool b) { m_htmlCompat = b; }
bool hasHoverDependency() { return m_hasHoverDependency; }
void setHasHoverDependency(bool b = true) { m_hasHoverDependency = b; }
+ void setNeedsStyleAttributeUpdate(bool b = true) { m_needsStyleAttributeUpdate = b; }
virtual void setFocus(bool b=true) { m_focused = b; }
virtual void setActive(bool b=true) { m_active = b; }
virtual void setHovered(bool b=true) { m_hovered = b; }
@@ -527,7 +528,6 @@
bool m_changedAscendentAttribute : 1;
bool m_inDocument : 1;
bool m_hasAnchor : 1;
- bool m_elementHasRareData : 1;

bool m_hovered : 1;
bool m_focused : 1;
@@ -538,7 +538,10 @@
bool m_hasCombinedStyle : 1; // true if element has inline styles and presentational styles
bool m_hasHoverDependency : 1; // true if element has hover dependency on itself

- // 15 bits left
+ bool m_elementHasRareData : 1;
+ mutable bool m_needsStyleAttributeUpdate : 1; // true if |style| attribute is out of sync (i.e. CSSOM modified our inline styles)
+
+ // 14 bits left
};

// this is the full Node Implementation with parents and children.
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml/xml

2009-11-08T11:28:33Z

SVN commit 1046452 by ggarand:

migrate tabIndex to the rare data mechanism,
frees 15 bits of the NodeImpl bitfield.

M +15 -1 dom_elementimpl.cpp
M +3 -0 dom_elementimpl.h
M +0 -1 dom_nodeimpl.cpp
M +4 -5 dom_nodeimpl.h

--- trunk/KDE/kdelibs/khtml/xml/dom_elementimpl.cpp #1046451:1046452
@@ -366,7 +366,11 @@
public:
ElementRareDataImpl();
void resetComputedStyle();
+ short tabIndex() const { return m_tabIndex; }
+ void setTabIndex(short _tabIndex) { m_tabIndex = _tabIndex; }
+
RenderStyle* m_computedStyle;
+ signed short m_tabIndex;
};

typedef WTF::HashMap<const ElementImpl*, ElementRareDataImpl*> ElementRareDataMap;
@@ -383,7 +387,7 @@
}

inline ElementRareDataImpl::ElementRareDataImpl()
- : m_computedStyle(0)
+ : m_computedStyle(0), m_tabIndex(0)
{}

void ElementRareDataImpl::resetComputedStyle()
@@ -796,6 +800,16 @@
m_prefix = PrefixName::fromString(_prefix);
}

+short ElementImpl::tabIndex() const
+{
+ return m_elementHasRareData ? rareData()->tabIndex() : 0;
+}
+
+void ElementImpl::setTabIndex(short _tabIndex)
+{
+ createRareData()->setTabIndex(_tabIndex);
+}
+
void ElementImpl::defaultEventHandler(EventImpl *e)
{
if (!e->defaultHandled() && document()->part() && e->id() == EventImpl::KEYPRESS_EVENT && e->isKeyRelatedEvent()) {
--- trunk/KDE/kdelibs/khtml/xml/dom_elementimpl.h #1046451:1046452
@@ -234,6 +234,9 @@
virtual DOMString namespaceURI() const;
inline const PrefixName& prefixName() const { return m_prefix; }

+ virtual short tabIndex() const;
+ void setTabIndex(short _tabIndex);
+
// DOM methods overridden from parent classes
virtual DOMString tagName() const;
virtual DOMString localName() const;
--- trunk/KDE/kdelibs/khtml/xml/dom_nodeimpl.cpp #1046451:1046452
@@ -70,7 +70,6 @@
m_previous(0),
m_next(0),
m_render(0),
- m_tabIndex( 0 ),
m_hasId( false ),
m_attached(false),
m_closed(false),
--- trunk/KDE/kdelibs/khtml/xml/dom_nodeimpl.h #1046451:1046452
@@ -290,10 +290,9 @@
// for descending restyle when ID or CLASS changes
bool changedAscendentAttribute() const { return m_changedAscendentAttribute; }
void setChangedAscendentAttribute(bool b) { m_changedAscendentAttribute = b; }
+
+ virtual short tabIndex() const { return 0; }

- short tabIndex() const { return m_tabIndex; }
- void setTabIndex(short _tabIndex) { m_tabIndex = _tabIndex; }
-
virtual bool isFocusable() const { return false; }
virtual bool isMouseFocusable() const { return isFocusable(); }
virtual bool isTabFocusable() const { return isFocusable(); }
@@ -520,8 +519,6 @@
khtml::RenderObject *m_render;
RegisteredListenerList m_regdListeners;

- signed m_tabIndex : 15; // ### needs one bit more
-
bool m_hasId : 1;
bool m_attached : 1;
bool m_closed : 1;
@@ -540,6 +537,8 @@
bool m_hasClass : 1; // true if element has a class property, as relevant to CSS
bool m_hasCombinedStyle : 1; // true if element has inline styles and presentational styles
bool m_hasHoverDependency : 1; // true if element has hover dependency on itself
+
+ // 15 bits left
};

// this is the full Node Implementation with parents and children.
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml

2009-11-08T11:28:27Z

SVN commit 1046451 by ggarand:

make sure the considered style declaration is inline before mirroring it to
the |style| attribute.

we don't want that to apply to non-inline stylesheet rules.

BUG: 207282

M +4 -2 css/css_valueimpl.cpp
M +2 -1 xml/dom_elementimpl.cpp
M +2 -2 xml/dom_elementimpl.h

--- trunk/KDE/kdelibs/khtml/css/css_valueimpl.cpp #1046450:1046451
@@ -684,8 +684,10 @@
void CSSStyleDeclarationImpl::setChanged()
{
if (m_node) {
- if (m_node->nodeType() == Node::ELEMENT_NODE)
- static_cast<ElementImpl*>(m_node)->synchronizeStyleAttribute(cssText());
+ if (m_node->nodeType() == Node::ELEMENT_NODE && (static_cast<ElementImpl*>(m_node)->inlineStyleDecls() == this)) {
+ // FIXME: potentially costly...
+ static_cast<ElementImpl*>(m_node)->synchronizeStyleAttribute();
+ }
m_node->setChanged();
return;
}
--- trunk/KDE/kdelibs/khtml/xml/dom_elementimpl.cpp #1046450:1046451
@@ -1354,8 +1354,9 @@
document()->setFocusNode(this);
}

-void ElementImpl::synchronizeStyleAttribute(const DOMString& value)
+void ElementImpl::synchronizeStyleAttribute()
{
+ DOMString value = getInlineStyleDecls()->cssText();
attributes()->setValueWithoutElementUpdate(ATTR_STYLE, value.implementation());
}

--- trunk/KDE/kdelibs/khtml/xml/dom_elementimpl.h #1046450:1046451
@@ -345,8 +345,8 @@
//Called when mapping from id to this node in document should be added
virtual void addId (const DOMString& id);

- // Synchronize style attribute after it was changed via CSS DOM (html5)
- void synchronizeStyleAttribute(const DOMString& value);
+ // Synchronize style attribute after it was changed via CSSOM
+ void synchronizeStyleAttribute();

protected:
void createAttributeMap() const;
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml

2009-11-08T11:28:21Z

SVN commit 1046450 by ggarand:

also hide alt tooltips when the view is scrolled via keyboard shortcuts
(follow up to a previous fix by Martin Koller)

M +3 -0 khtmlview.cpp

--- trunk/KDE/kdelibs/khtml/khtmlview.cpp #1046449:1046450
@@ -3909,6 +3909,9 @@
}
}

+ if ( underMouse() && QToolTip::isVisible() )
+ QToolTip::hideText();
+
if (!d->scrollingSelf) {
d->scrollBarMoved = true;
d->contentsMoving = true;
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml/rendering

2009-11-08T11:28:16Z

SVN commit 1046449 by ggarand:

use correct method for computation of percentage height in relative
positionning:
calcPercentageHeight() properly handles cases where CB recursion
is necessary, and other quirks.

Thanks to Gérard Talbot for accurately spotting the regression.

BUG: 169635

M +14 -2 render_box.cpp

--- trunk/KDE/kdelibs/khtml/rendering/render_box.cpp #1046448:1046449
@@ -1083,11 +1083,23 @@
tx -= style()->right().width(containingBlockWidth());
if(!style()->top().isAuto())
{
- ty += style()->top().width(containingBlockHeight());
+ if (style()->top().isPercent()) {
+ int ph = calcPercentageHeight(style()->top());
+ if (ph != -1)
+ ty += ph;
+ } else {
+ ty += style()->top().width(containingBlockHeight());
+ }
}
else if(!style()->bottom().isAuto())
{
- ty -= style()->bottom().width(containingBlockHeight());
+ if (style()->top().isPercent()) {
+ int ph = calcPercentageHeight(style()->top());
+ if (ph != -1)
+ ty -= ph;
+ } else {
+ ty -= style()->bottom().width(containingBlockHeight());
+ }
}
}

_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml (silent)

2009-11-08T11:28:11Z

SVN commit 1046448 by ggarand:

SVN_SILENT: fix lt/gt's here to avoid runtime warnings.

M +2 -2 test_regression.cpp

--- trunk/KDE/kdelibs/khtml/test_regression.cpp #1046447:1046448
@@ -629,9 +629,9 @@
options.add("html", ki18n("Only run .html tests"));
options.add("noxvfb", ki18n("Do not use Xvfb"));
options.add("o");
- options.add("output <directory>", ki18n("Put output in <directory> instead of <base_dir>/output"));
+ options.add("output <directory>", ki18n("Put output in <directory> instead of <base_dir>/output"));
options.add("r");
- options.add("reference <directory>", ki18n("Use <directory> as reference instead of <base_dir>/baseline"));
+ options.add("reference <directory>", ki18n("Use <directory> as reference instead of <base_dir>/baseline"));
options.add("+[base_dir]", ki18n("Directory containing tests, basedir and output directories. Only regarded if -b is not specified."));
options.add("+[testcases]", ki18n("Relative path to testcase, or directory of testcases to be run (equivalent to -t)."));

_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs

KDE/kdelibs/khtml/rendering

2009-11-08T11:28:05Z

SVN commit 1046447 by ggarand:

patch by Andrea IACOVITTI <aiacovitti@...> and Allan Sandfeld Jensen
for honouring "border: none" on native widget borders.

BUG: 200795

M +1 -1 render_replaced.cpp

--- trunk/KDE/kdelibs/khtml/rendering/render_replaced.cpp #1046446:1046447
@@ -480,7 +480,7 @@
}

// Border:
- if (shouldPaintBorder())
+ if (shouldPaintBorder() || (!shouldPaintBackgroundOrBorder() && canHaveBorder()))
{
if (QFrame* frame = qobject_cast<QFrame*>(m_widget))
frame->setFrameShape(QFrame::NoFrame);
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs