Context Navigation

Make m_lineHeight be cached on RenderFlow instead of RenderText and avoid recomputing it so much when it
is not set by CSS (since calls to fontMetrics().lineSpacing() are expensive).

Yields ~1.5% performance improvement.

Reviewed by darin

khtml/rendering/render_block.cpp: (khtml::RenderBlock::setStyle):
khtml/rendering/render_flow.cpp: (RenderFlow::lineHeight):
khtml/rendering/render_flow.h:
khtml/rendering/render_inline.cpp: (RenderInline::setStyle):
khtml/rendering/render_object.cpp: (RenderObject::verticalPositionHint): (RenderObject::lineHeight):
khtml/rendering/render_object.h:
khtml/rendering/render_text.cpp: (RenderText::setStyle): (RenderText::checkSelectionPointIgnoringContinuations): (RenderText::height): (RenderText::lineHeight):
khtml/rendering/render_text.h:

10:36 AM Changeset in webkit [6009] by cblu

2 edits in trunk/WebKit

Fixed: <rdar://problem/3536126>: REGRESSION (Merlot): WebKit dragging is in strange location

Reviewed by kocienda.

WebView.subproj/WebHTMLView.m: (-[WebHTMLView _handleMouseDragged:]): use the proper offset when dragging text

1:06 AM Changeset in webkit [6008] by hyatt

10 edits in trunk/WebCore

Disable XBL. The loadBindings call was taking 0.1-0.25%. While I know how to get rid of this overhead,
it's easier for now to just disable all of XBL.

WebCorePrefix.h:
khtml/misc/loader.h:
khtml/xbl/xbl_binding.cpp:
khtml/xbl/xbl_binding_manager.cpp:
khtml/xbl/xbl_docimpl.cpp:
khtml/xbl/xbl_protobinding.cpp:
khtml/xbl/xbl_protohandler.cpp:
khtml/xbl/xbl_protoimplementation.cpp:
khtml/xbl/xbl_tokenizer.cpp:

Jan 29, 2004:

11:44 PM Changeset in webkit [6007] by hyatt

44 edits
4 adds
1 delete in trunk/WebCore

Atomize font families (KWQFontFamily) and all attribute values. Move atomic string into separate files.

In my testing, this patch yields the same score as Safari-125 in tests and recovers all lost performance
(mostly from excess copying of AtomicStrings where DOMStringImpl* used to be returned).

Reviewed by darin

ForwardingHeaders/xml/dom_atomicstring.h: Added.
WebCore.pbproj/project.pbxproj:
khtml/css/css_base.cpp: (CSSSelector::print): (CSSSelector::extractPseudoType): (CSSSelector::selectorText):
khtml/css/css_valueimpl.cpp: (FontFamilyValueImpl::FontFamilyValueImpl):
khtml/css/cssparser.cpp: (CSSParser::parseFontFamily):
khtml/css/cssparser.h:
khtml/css/cssstyleselector.cpp: (khtml::checkPseudoState): (khtml::CSSStyleSelector::checkOneSelector): (khtml::CSSStyleSelector::applyRule):
khtml/dom/dom_element.cpp: (Element::getAttributeNS):
khtml/dom/dom_string.cpp: (DOMString::toInt): (DOMString::toLengthArray): (DOM::operator==):
khtml/dom/dom_string.h: (DOM::operator==): (DOM::operator!=):
khtml/ecma/kjs_navigator.cpp: (Plugins::get): (MimeTypes::get): (Plugin::get):
khtml/html/html_baseimpl.cpp: (HTMLBodyElementImpl::parseAttribute): (HTMLFrameElementImpl::isURLAllowed): (HTMLFrameElementImpl::openURL): (HTMLFrameElementImpl::parseAttribute): (HTMLFrameElementImpl::attach): (HTMLFrameElementImpl::setLocation): (HTMLFrameSetElementImpl::parseAttribute): (HTMLIFrameElementImpl::attach):
khtml/html/html_baseimpl.h:
khtml/html/html_blockimpl.cpp: (HTMLHRElementImpl::parseAttribute): (HTMLHRElementImpl::attach): (HTMLMarqueeElementImpl::parseAttribute):
khtml/html/html_documentimpl.cpp: (HTMLDocumentImpl::documentElement):
khtml/html/html_documentimpl.h:
khtml/html/html_elementimpl.cpp: (HTMLElementImpl::parseAttribute): (HTMLElementImpl::addCSSLength): (HTMLElementImpl::addHTMLAlignment):
khtml/html/html_elementimpl.h:
khtml/html/html_formimpl.cpp: (HTMLGenericFormElementImpl::parseAttribute): (HTMLInputElementImpl::parseAttribute): (HTMLInputElementImpl::attach): (HTMLSelectElementImpl::parseAttribute): (HTMLKeygenElementImpl::parseAttribute): (HTMLKeygenElementImpl::encoding): (HTMLOptionElementImpl::parseAttribute): (HTMLTextAreaElementImpl::parseAttribute):
khtml/html/html_formimpl.h:
khtml/html/html_headimpl.cpp: (HTMLLinkElementImpl::parseAttribute): (HTMLStyleElementImpl::parseAttribute):
khtml/html/html_imageimpl.cpp: (HTMLImageElementImpl::parseAttribute): (HTMLAreaElementImpl::parseAttribute):
khtml/html/html_inlineimpl.cpp: (HTMLAnchorElementImpl::parseAttribute):
khtml/html/html_listimpl.cpp: (HTMLOListElementImpl::parseAttribute): (HTMLLIElementImpl::parseAttribute):
khtml/html/html_miscimpl.cpp: (HTMLCollectionImpl::getNamedItem): (HTMLFormCollectionImpl::getNamedFormItem): (HTMLFormCollectionImpl::getNamedImgItem):
khtml/html/html_objectimpl.cpp: (HTMLEmbedElementImpl::parseAttribute): (HTMLObjectElementImpl::parseAttribute): (HTMLParamElementImpl::HTMLParamElementImpl): (HTMLParamElementImpl::~HTMLParamElementImpl): (HTMLParamElementImpl::parseAttribute):
khtml/html/html_objectimpl.h: (DOM::HTMLParamElementImpl::name): (DOM::HTMLParamElementImpl::value):
khtml/html/html_tableimpl.cpp: (HTMLTableElementImpl::parseAttribute): (HTMLTablePartElementImpl::parseAttribute): (HTMLTableCellElementImpl::parseAttribute): (HTMLTableColElementImpl::parseAttribute):
khtml/html/htmlparser.cpp: (KHTMLParser::insertNode): (KHTMLParser::handleIsindex):
khtml/html/htmltokenizer.cpp: (HTMLTokenizer::parseTag):
khtml/html/htmltokenizer.h: (khtml::Token::addAttribute):
khtml/khtml_part.cpp: (KHTMLPart::init):
khtml/khtmlview.cpp: (KHTMLToolTip::maybeTip):
khtml/xml/dom_atomicstring.cpp: Added. (DOM::AtomicStringStatisticsExitLogger::~AtomicStringStatisticsExitLogger): (DOM::AtomicString::equal): (DOM::AtomicString::add): (DOM::AtomicString::insert): (DOM::AtomicString::remove): (DOM::AtomicString::expand): (DOM::AtomicString::shrink): (DOM::AtomicString::rehash): (DOM::AtomicString::init): (DOM::operator==): (DOM::equalsIgnoreCase):
khtml/xml/dom_atomicstring.h: Added. (DOM::AtomicString::AtomicString): (DOM::AtomicString:::m_string): (DOM::AtomicString::operator const DOMString&): (DOM::AtomicString::domString): (DOM::AtomicString::string): (DOM::AtomicString::implementation): (DOM::AtomicString::unicode): (DOM::AtomicString::length): (DOM::AtomicString::ascii): (DOM::AtomicString::find): (DOM::AtomicString::toInt): (DOM::AtomicString::percentage): (DOM::AtomicString::toLengthArray): (DOM::AtomicString::isNull): (DOM::AtomicString::isEmpty): (DOM::AtomicString::equal): (DOM::operator==): (DOM::operator!=):
khtml/xml/dom_atomicstringlist.h: Added. (DOM::AtomicStringList:::m_next): (DOM::AtomicStringList::m_next): (DOM::AtomicStringList::~AtomicStringList): (DOM::AtomicStringList::next): (DOM::AtomicStringList::setNext): (DOM::AtomicStringList::string): (DOM::AtomicStringList::setString): (DOM::AtomicStringList::clone): (DOM::AtomicStringList::clear):
khtml/xml/dom_docimpl.h:
khtml/xml/dom_elementimpl.cpp: (AttrImpl::nodeValue): (AttrImpl::cloneNode): (ElementImpl::getAttribute): (ElementImpl::getAttributeNS): (ElementImpl::setAttribute): (ElementImpl::setAttributeMap): (ElementImpl::attach): (ElementImpl::detach): (ElementImpl::updateId): (NamedAttrMapImpl::setNamedItem): (NamedAttrMapImpl::removeNamedItem): (NamedAttrMapImpl::getAttributeItem): (NamedAttrMapImpl::operator=): (NamedAttrMapImpl::removeAttribute):
khtml/xml/dom_elementimpl.h: (DOM::AttributeImpl::AttributeImpl): (DOM::AttributeImpl::value): (DOM::AttributeImpl::prefix): (DOM::AttributeImpl::isNull): (DOM::AttributeImpl::isEmpty): (DOM::AttributeImpl::setValue): (DOM::AttributeImpl::setPrefix): (DOM::ElementImpl::getAttribute):
khtml/xml/dom_nameimpl.cpp: Removed.
khtml/xml/dom_nameimpl.h: (DOM::Name::namespaceURI): (DOM::Name::localName):
khtml/xml/dom_nodeimpl.h:
khtml/xml/dom_stringimpl.cpp:
kwq/KWQFont.mm: (QFont::family):
kwq/KWQFontFamily.h: (KWQFontFamily::family):
kwq/KWQFontFamily.mm: (retainDOMStringImpl): (releaseDOMStringImpl): (KWQFontFamily::getNSFamily): (KWQFontFamily::setFamily): (KWQFontFamily::operator==):
kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::fileWrapperForElement):
kwq/WebCoreBridge.mm: (-[WebCoreBridge elementAtPoint:]):

2:00 PM Changeset in webkit [6006] by cblu

2 edits in trunk/WebCore

Fixed: <rdar://problem/3543619>: copied HTML is strangely formatted, random whitespace and return characters

Reviewed by dave.

khtml/xml/dom_nodeimpl.cpp: (NodeImpl::recursive_toHTMLWithRange): remove all code that tries to format the HTML since we can rely on the existing white space to preserve the original formatting

Jan 28, 2004:

6:16 PM Changeset in webkit [6005]

2 copies in branches/Safari-1-0-branch/WebKit/Misc.subproj

This commit was manufactured by cvs2svn to create branch
'Safari-1-0-branch'.

6:16 PM Changeset in webkit [6004] by sullivan

10 edits
2 adds in trunk

Tests:

Reviewed by Dave.

Blot/blot-tasks.txt: Mentioned NSTextView's (and therefore Mail's) option-Escape behavior here since we will probably have to implement it also; clarified a comment.

WebCore:

Reviewed by Dave.

khtml/rendering/render_text.cpp: (RenderText::paintObject): Increment s in the while() clause so it is incremented even after a continue statement. This fixes an infinite loop I ran into in the printing code path at certain scaled print sizes on certain pages.

WebKit:

More header/footer work: refactored the header/footer code so it could
be easily reused by other WebDocument classes; used it from WebImageView
and WebTextView; removed the page count parameters because it's possible
(though currently nasty, see 3543078) to determine this in the client.

Reviewed by Dave.

Misc.subproj/WebNSPrintOperationExtras.h Added.
Misc.subproj/WebNSPrintOperationExtras.m Added. (-[NSPrintOperation _web_pageSetupScaleFactor]): new convenience method.

WebView.subproj/WebUIDelegatePrivate.h: Removed page index and page count parameters from delegate methods.

WebView.subproj/WebViewPrivate.h: New private category for header/footer printing methods so that different WebDocument methods can share almost all of the code.

WebView.subproj/WebView.m: (-[WebView _headerHeight]): (-[WebView _footerHeight]): (-[WebView _drawHeaderInRect:]): (-[WebView _drawFooterInRect:]): (-[WebView _adjustPrintingMarginsForHeaderAndFooter]): (-[WebView _drawHeaderAndFooter]): Moved all of these methods here, formerly in WebHTMLView. Removed the page index and page count parameters.

WebView.subproj/WebHTMLView.m: Removed all the header/footer code that's now in WebView.m, and the method that's now -[NSPrintOperation _web_pageSetupScaleFactor] (-[WebHTMLView _setPrinting:minimumPageWidth:maximumPageWidth:adjustViewSize:]): call methods differently that have now been moved (-[WebHTMLView _scaleFactorForPrintOperation:]): ditto (-[WebHTMLView knowsPageRange:]): ditto (-[WebHTMLView drawPageBorderWithSize:]): now just turns around and calls -[WebView _drawHeaderAndFooter]

WebView.subproj/WebImageView.m: (-[WebImageView drawPageBorderWithSize:]): new method, just calls -[WebView _drawHeaderAndFooter] (-[WebImageView beginDocument]): now calls -[WebView _adjustPrintMarginsForHeaderAndFooter], also moved in file. (-[WebImageView endDocument]): just moved in file.

WebView.subproj/WebTextView.m: (-[WebTextView drawPageBorderWithSize:]): new method, just calls -[WebView _drawHeaderAndFooter] (-[WebTextView knowsPageRange:]): overridden to call -[WebView _adjustPrintMarginsForHeaderAndFooter]

WebKit.pbproj/project.pbxproj: updated for added files

WebBrowser:

Some header/footer cleanup.

Reviewed by Dave.

BrowserWebViewPrinting.m: (-[BrowserWebView webView:drawHeaderInRect:]): Removed obsolete page index and count parameters. Use displayName rather than currentTitle because it works for all document types (currentTitle didn't work for plain text pages). (-[BrowserWebView webView:drawFooterInRect:]): Removed obsolete page index and count parameters. Did some AppKit hackery to get the total document page count in a way that works for any print operation. Now handles the case where the page count is unknown (by printing "Page <x>" instead of "Page <x> of <n>"). Also added a 1 pixel offset to the footer's baseline to work around AppKit bug where the descenders in the footer were getting slightly clipped at some scale factors.

English.lproj/Localizable.strings: updated for these changes

5:26 PM Changeset in webkit [6003] by cblu

2 edits in trunk/WebCore

Fixed: <rdar://problem/3543041>: when pasting an image, cursor should be after the image, not before

Reviewed by rjw.

khtml/xml/dom_docimpl.cpp: (DocumentImpl::pasteHTMLString): when the last node of the paste is non-text, use 1 instead of 0 as the start offset of the caret

4:22 PM Changeset in webkit [6002] by kocienda

18 edits
1 add in trunk/WebCore

Reviewed by Hyatt

A small collection of fixes and improvements to editing.

Added a forwarding header for dom_position.h
Added some debugging output to KHTMLSelection
Added support for left arrow navigation.
Greatly improved support for right arrow navigation.
Added include guards to dom_position.h. Oops!
Removed pruneEmptyNodes() function from htmlediting.cpp. That was crack.
Improved the text insert command so that it splits the text node being

operated on only when necessary.

Added support for placing the caret in and arrowing into BR elements.
Moved precedesLineBreak/followsLineBreak from RenderText to RenderObject.

ForwardingHeaders/dom/dom_position.h: Added.
khtml/dom/dom_position.h:
khtml/editing/htmlediting.cpp: (InputTextCommand::apply): (DeleteTextCommand::apply):
khtml/khtml_selection.cpp: (KHTMLSelection::setSelection): (KHTMLSelection::alterSelection): (KHTMLSelection::update): (KHTMLSelection::previousCharacterPosition): (KHTMLSelection::nextCharacterPosition): (startAndEndLineNodesIncludingNode): (KHTMLSelection::debugRenderer): (KHTMLSelection::debugPosition):
khtml/khtml_selection.h:
khtml/rendering/render_br.cpp: (RenderBR::RenderBR): (RenderBR::position): (RenderBR::caretMaxOffset): (RenderBR::caretPos):
khtml/rendering/render_br.h: (khtml::RenderBR::xPos): (khtml::RenderBR::yPos): (khtml::RenderBR::height):
khtml/rendering/render_object.cpp: (RenderObject::precedesLineBreak): (RenderObject::followsLineBreak): (RenderObject::isEditable):
khtml/rendering/render_object.h:
khtml/rendering/render_text.cpp: (RenderText::caretPos): (RenderText::position): (RenderText::caretMaxOffset):
khtml/rendering/render_text.h:
khtml/xml/dom_elementimpl.cpp: (ElementImpl::defaultEventHandler):

1:26 PM Changeset in webkit [6001] by hyatt

2 adds in trunk/LayoutTests/fast/css

Add layout test for checking the cascade of the clear property.

1:22 PM Changeset in webkit [6000] by hyatt

2 edits in trunk/WebCore

Fix for 3537694, make blocks for parents of inline children be axobjects.

Reviewed by kocienda

kwq/KWQAccObject.mm: (-[KWQAccObject role]): (-[KWQAccObject accessibilityIsIgnored]):

1:19 PM Changeset in webkit [5999] by hyatt

9 edits in trunk/WebCore

Make AtomicString a new class that owns DOMStrings, instead of using KJS::Identifier. One day when we
convert DOMString and UString to have the same underlying rep, then these classes could possibly re-merge.
For now this provides an easy migration path for all the code that is using DOMStringImpl*.

Also fixed a bug with float clearing in the style cascade.

Reviewed by darin

khtml/css/cssparser.h: (DOM::atomicString):
khtml/css/cssstyleselector.cpp: (khtml::CSSStyleSelector::checkOneSelector): (khtml::CSSStyleSelector::applyRule):
khtml/dom/dom_string.cpp: (DOMString::DOMString):
khtml/xml/dom_nameimpl.cpp: (DOM::AtomicStringStatisticsExitLogger::~AtomicStringStatisticsExitLogger): (DOM::AtomicString::equal): (DOM::AtomicString::add): (DOM::AtomicString::insert): (DOM::AtomicString::remove): (DOM::AtomicString::expand): (DOM::AtomicString::shrink): (DOM::AtomicString::rehash): (DOM::AtomicString::null): (DOM::AtomicString::init): (DOM::operator==): (DOM::equalsIgnoreCase):
khtml/xml/dom_nameimpl.h: (DOM::AtomicString::AtomicString): (DOM::AtomicString:::m_string): (DOM::AtomicString::string): (DOM::AtomicString::qstring): (DOM::AtomicString::implementation): (DOM::AtomicString::unicode): (DOM::AtomicString::length): (DOM::AtomicString::ascii): (DOM::AtomicString::find): (DOM::AtomicString::isNull): (DOM::AtomicString::isEmpty): (DOM::AtomicString::equal): (DOM::operator==): (DOM::operator!=):
khtml/xml/dom_stringimpl.cpp: (DOM::DOMStringImpl::empty): (DOM::DOMStringImpl::DOMStringImpl): (DOM::DOMStringImpl::~DOMStringImpl): (DOM::DOMStringImpl::append): (DOM::DOMStringImpl::insert): (DOM::DOMStringImpl::truncate): (DOM::DOMStringImpl::remove): (DOM::DOMStringImpl::split): (DOM::DOMStringImpl::substring): (DOM::DOMStringImpl::replace): (DOM::DOMStringImpl::computeHash):
khtml/xml/dom_stringimpl.h: (DOM::DOMStringImpl::DOMStringImpl): (DOM::DOMStringImpl::hash):
khtml/xml/dom_textimpl.cpp: (CharacterDataImpl::CharacterDataImpl):

1:09 PM Changeset in webkit [5998] by cblu

4 edits in trunk/WebKit

WebKit:

Fixed: <rdar://problem/3197222>: need context menu items for back, forward, refresh.

Reviewed by rjw.

English.lproj/Localizable.strings:
WebView.subproj/WebDefaultContextMenuDelegate.m: (-[WebDefaultUIDelegate menuItemWithTag:]): added support for WebMenuItemTagGoBack, WebMenuItemTagGoForward, WebMenuItemTagStop and WebMenuItemTagReload tags (-[WebDefaultUIDelegate webView:contextMenuItemsForElement:defaultMenuItems:]): added support for Back, Forward, Stop and Reload
WebView.subproj/WebUIDelegate.h: added WebMenuItemTagGoBack, WebMenuItemTagGoForward, WebMenuItemTagStop and WebMenuItemTagReload tags

WebBrowser:

Fixed: <rdar://problem/3197222>: need context menu items for back, forward, refresh.

Reviewed by rjw.

ContextMenuHandler.m: (-[BrowserWebView webView:contextMenuItemsForElement:defaultMenuItems:]): added support for Back, Forward, Stop and Reload

Note: See TracTimeline for information about the timeline view.

Download in other formats:

RSS Feed