Changeset 10556 in webkit for trunk/JavaScriptCore/kjs


Ignore:
Timestamp:
Sep 16, 2005, 3:42:30 PM (20 years ago)
Author:
adele
Message:

JavaScriptCore:

Change by Darin, reviewed by me and Maciej.

Fixes ​http://bugzilla.opendarwin.org/show_bug.cgi?id=4547
use int instead of long for 32-bit (to prepare for LP64 compiling)

  • bindings/c/c_class.h: (KJS::Bindings::CClass::constructorAt): (KJS::Bindings::CClass::numConstructors):
  • bindings/c/c_runtime.h: (KJS::Bindings::CMethod::numParameters):
  • bindings/jni/jni_class.cpp: (JavaClass::JavaClass):
  • bindings/jni/jni_class.h: (KJS::Bindings::JavaClass::constructorAt): (KJS::Bindings::JavaClass::numConstructors):
  • bindings/jni/jni_instance.cpp: (JavaInstance::invokeMethod):
  • bindings/jni/jni_jsobject.cpp: (JSObject::convertJObjectToValue): (JSObject::listFromJArray):
  • bindings/jni/jni_runtime.cpp: (JavaMethod::JavaMethod):
  • bindings/jni/jni_runtime.h: (KJS::Bindings::JavaConstructor::_commonCopy): (KJS::Bindings::JavaConstructor::parameterAt): (KJS::Bindings::JavaConstructor::numParameters): (KJS::Bindings::JavaMethod::_commonCopy): (KJS::Bindings::JavaMethod::parameterAt): (KJS::Bindings::JavaMethod::numParameters):
  • bindings/npapi.h:
  • bindings/objc/WebScriptObject.mm: (listFromNSArray):
  • bindings/objc/objc_class.h: (KJS::Bindings::ObjcClass::constructorAt): (KJS::Bindings::ObjcClass::numConstructors):
  • bindings/objc/objc_instance.h:
  • bindings/objc/objc_runtime.h:
  • bindings/objc/objc_runtime.mm: (ObjcMethod::numParameters):
  • bindings/runtime.h:
  • kjs/identifier.h:
  • kjs/internal.h:
  • kjs/property_slot.h: (KJS::PropertySlot::setCustomIndex): (KJS::PropertySlot::index): (KJS::PropertySlot::):
  • kjs/regexp_object.cpp: (RegExpObjectImp::backrefGetter): (RegExpObjectImp::getOwnPropertySlot):
  • kjs/simple_number.h: (KJS::SimpleNumber::): (KJS::SimpleNumber::value): (KJS::SimpleNumber::fits): (KJS::SimpleNumber::integerFits): (KJS::SimpleNumber::make):
  • kjs/string_object.cpp: (substituteBackreferences):
  • kjs/ustring.cpp: (KJS::UString::from): (KJS::UString::toUInt32): (KJS::UString::find): (KJS::UString::rfind):
  • kjs/ustring.h:
  • kjs/value.cpp: (KJS::jsNumber):
  • kjs/value.h:

WebCore:

Change by Darin, reviewed by me and Maciej.

Fixes ​http://bugzilla.opendarwin.org/show_bug.cgi?id=4547
use int instead of long for 32-bit (to prepare for LP64 compiling)

Changed longs (which IDL files use as 32-bit) to ints

  • ForwardingHeaders/khtml_pagecache.h:
  • khtml/css/css_base.h: (DOM::StyleListImpl::length): (DOM::StyleListImpl::item):
  • khtml/css/css_computedstyle.cpp: (DOM::CSSComputedStyleDeclarationImpl::length): (DOM::CSSComputedStyleDeclarationImpl::item):
  • khtml/css/css_computedstyle.h:
  • khtml/css/css_ruleimpl.cpp: (CSSMediaRuleImpl::append): (CSSMediaRuleImpl::insertRule): (CSSMediaRuleImpl::cssText): (CSSRuleListImpl::CSSRuleListImpl): (CSSRuleListImpl::deleteRule): (CSSRuleListImpl::insertRule):
  • khtml/css/css_ruleimpl.h: (DOM::CSSRuleListImpl::length): (DOM::CSSRuleListImpl::item): (DOM::CSSMediaRuleImpl::deleteRule):
  • khtml/css/css_stylesheetimpl.cpp: (CSSStyleSheetImpl::insertRule): (CSSStyleSheetImpl::addRule): (CSSStyleSheetImpl::deleteRule): (StyleSheetListImpl::length): (StyleSheetListImpl::item):
  • khtml/css/css_stylesheetimpl.h: (DOM::MediaListImpl::length): (DOM::MediaListImpl::item):
  • khtml/css/css_valueimpl.cpp: (DOM::CSSMutableStyleDeclarationImpl::length): (DOM::CSSMutableStyleDeclarationImpl::item):
  • khtml/css/css_valueimpl.h: (DOM::CSSValueListImpl::length): (DOM::CSSValueListImpl::item):
  • khtml/dom/css_rule.h:
  • khtml/dom/css_stylesheet.h:
  • khtml/dom/css_value.h:
  • khtml/dom/dom2_events.cpp: (DOM::UIEvent::detail): (DOM::UIEvent::initUIEvent): (DOM::MouseEvent::screenX): (DOM::MouseEvent::screenY): (DOM::MouseEvent::clientX): (DOM::MouseEvent::clientY): (DOM::MouseEvent::initMouseEvent): (DOM::KeyboardEvent::keyLocation): (DOM::KeyboardEvent::initKeyboardEvent):
  • khtml/dom/dom2_events.h:
  • khtml/dom/dom2_range.h:
  • khtml/dom/dom2_traversal.cpp: (DOM::NodeIterator::whatToShow): (DOM::TreeWalker::whatToShow):
  • khtml/dom/dom2_traversal.h:
  • khtml/dom/dom_node.h:
  • khtml/ecma/kjs_css.cpp: (KJS::DOMCSSStyleDeclaration::getOwnPropertySlot): (KJS::DOMStyleSheetList::getOwnPropertySlot): (KJS::DOMMediaList::getOwnPropertySlot): (KJS::DOMCSSStyleSheetProtoFunc::callAsFunction): (KJS::DOMCSSRuleList::getOwnPropertySlot): (KJS::DOMCSSValueList::getOwnPropertySlot):
  • khtml/ecma/kjs_dom.cpp: (KJS::DOMNodeList::getOwnPropertySlot): (KJS::DOMNodeList::callAsFunction): (KJS::DOMNamedNodeMap::getOwnPropertySlot): (KJS::DOMNamedNodesCollection::getOwnPropertySlot):
  • khtml/ecma/kjs_events.cpp: (KJS::DOMEvent::getValueProperty):
  • khtml/ecma/kjs_html.cpp: (KJS::HTMLElement::getOwnPropertySlot): (KJS::KJS::HTMLElement::put): (KJS::HTMLCollection::getOwnPropertySlot): (KJS::KJS::HTMLCollection::callAsFunction): (KJS::KJS::HTMLSelectCollection::put):
  • khtml/ecma/kjs_navigator.cpp: (KJS::Plugins::getOwnPropertySlot): (KJS::MimeTypes::getOwnPropertySlot): (KJS::Plugin::getOwnPropertySlot):
  • khtml/editing/apply_style_command.cpp: (khtml::ApplyStyleCommand::splitTextAtStartIfNeeded): (khtml::ApplyStyleCommand::splitTextElementAtStartIfNeeded): (khtml::ApplyStyleCommand::mergeStartWithPreviousIfIdentical):
  • khtml/editing/break_blockquote_command.cpp: (khtml::BreakBlockquoteCommand::doApply):
  • khtml/editing/composite_edit_command.cpp: (khtml::CompositeEditCommand::insertNodeAt): (khtml::CompositeEditCommand::splitTextNode): (khtml::CompositeEditCommand::splitTextNodeContainingElement): (khtml::CompositeEditCommand::insertTextIntoNode): (khtml::CompositeEditCommand::deleteTextFromNode): (khtml::CompositeEditCommand::replaceTextInNode): (khtml::CompositeEditCommand::deleteInsignificantText):
  • khtml/editing/composite_edit_command.h:
  • khtml/editing/delete_from_text_node_command.cpp: (khtml::DeleteFromTextNodeCommand::DeleteFromTextNodeCommand):
  • khtml/editing/delete_from_text_node_command.h: (khtml::DeleteFromTextNodeCommand::offset): (khtml::DeleteFromTextNodeCommand::count):
  • khtml/editing/insert_into_text_node_command.cpp: (khtml::InsertIntoTextNodeCommand::InsertIntoTextNodeCommand):
  • khtml/editing/insert_into_text_node_command.h: (khtml::InsertIntoTextNodeCommand::offset):
  • khtml/editing/insert_paragraph_separator_command.cpp: (khtml::InsertParagraphSeparatorCommand::doApply):
  • khtml/editing/insert_text_command.cpp: (khtml::InsertTextCommand::input): (khtml::InsertTextCommand::insertSpace):
  • khtml/editing/insert_text_command.h: (khtml::InsertTextCommand::charactersAdded):
  • khtml/editing/join_text_nodes_command.h:
  • khtml/editing/markup.cpp: (khtml::startMarkup): (khtml::completeURLs):
  • khtml/editing/move_selection_command.cpp: (khtml::MoveSelectionCommand::doApply):
  • khtml/editing/rebalance_whitespace_command.cpp: (khtml::RebalanceWhitespaceCommand::doApply):
  • khtml/editing/rebalance_whitespace_command.h:
  • khtml/editing/replace_selection_command.cpp: (khtml::ReplaceSelectionCommand::insertNodeAtAndUpdateNodesInserted):
  • khtml/editing/replace_selection_command.h:
  • khtml/editing/selection.cpp: (khtml::Selection::debugPosition):
  • khtml/editing/split_text_node_command.cpp: (khtml::SplitTextNodeCommand::SplitTextNodeCommand):
  • khtml/editing/split_text_node_command.h: (khtml::SplitTextNodeCommand::offset):
  • khtml/editing/split_text_node_containing_element.cpp: (khtml::SplitTextNodeContainingElementCommand::SplitTextNodeContainingElementCommand):
  • khtml/editing/split_text_node_containing_element_command.h:
  • khtml/editing/visible_position.cpp: (khtml::VisiblePosition::VisiblePosition): (khtml::VisiblePosition::deepEquivalent): (khtml::VisiblePosition::rangeCompliantEquivalent): (khtml::VisiblePosition::maxOffset): (khtml::VisiblePosition::character): (khtml::VisiblePosition::debugPosition):
  • khtml/editing/visible_position.h:
  • khtml/editing/visible_range.h:
  • khtml/editing/visible_text.cpp: (khtml::CircularSearchBuffer::length): (khtml::TextIterator::TextIterator): (khtml::TextIterator::handleTextNode): (khtml::TextIterator::handleTextBox): (khtml::TextIterator::emitCharacter): (khtml::TextIterator::range): (khtml::SimplifiedBackwardsTextIterator::SimplifiedBackwardsTextIterator): (khtml::SimplifiedBackwardsTextIterator::handleReplacedElement): (khtml::SimplifiedBackwardsTextIterator::emitCharacter): (khtml::SimplifiedBackwardsTextIterator::emitNewlineForBROrText): (khtml::CharacterIterator::range): (khtml::CharacterIterator::advance): (khtml::CharacterIterator::string): (khtml::WordAwareIterator::length): (khtml::CircularSearchBuffer::append): (khtml::CircularSearchBuffer::neededCharacters): (khtml::CircularSearchBuffer::isMatch): (khtml::TextIterator::rangeLength): (khtml::TextIterator::rangeFromLocationAndLength): (khtml::plainText): (khtml::findPlainText):
  • khtml/editing/visible_text.h: (khtml::TextIterator::length): (khtml::SimplifiedBackwardsTextIterator::length): (khtml::CharacterIterator::length): (khtml::CharacterIterator::characterOffset):
  • khtml/editing/visible_units.cpp: (khtml::startOfLine): (khtml::endOfLine): (khtml::startOfParagraph): (khtml::endOfParagraph):
  • khtml/html/html_blockimpl.cpp: (HTMLPreElementImpl::width): (HTMLPreElementImpl::setWidth):
  • khtml/html/html_blockimpl.h:
  • khtml/html/html_formimpl.cpp: (DOM::HTMLFormElementImpl::length): (DOM::HTMLGenericFormElementImpl::tabIndex): (DOM::HTMLGenericFormElementImpl::setTabIndex): (DOM::HTMLInputElementImpl::selectionStart): (DOM::HTMLInputElementImpl::selectionEnd): (DOM::HTMLInputElementImpl::setSelectionStart): (DOM::HTMLInputElementImpl::setSelectionEnd): (DOM::HTMLInputElementImpl::setSelectionRange): (DOM::HTMLInputElementImpl::setMaxLength): (DOM::HTMLInputElementImpl::setSize): (DOM::HTMLSelectElementImpl::selectedIndex): (DOM::HTMLSelectElementImpl::setSelectedIndex): (DOM::HTMLSelectElementImpl::length): (DOM::HTMLSelectElementImpl::remove): (DOM::HTMLSelectElementImpl::setSize): (DOM::HTMLOptionElementImpl::index): (DOM::HTMLOptionElementImpl::setIndex): (DOM::HTMLTextAreaElementImpl::selectionStart): (DOM::HTMLTextAreaElementImpl::selectionEnd): (DOM::HTMLTextAreaElementImpl::setSelectionStart): (DOM::HTMLTextAreaElementImpl::setSelectionEnd): (DOM::HTMLTextAreaElementImpl::setSelectionRange): (DOM::HTMLTextAreaElementImpl::setCols): (DOM::HTMLTextAreaElementImpl::setRows): (DOM::HTMLOptionsCollectionImpl::length): (DOM::HTMLOptionsCollectionImpl::setLength): (DOM::HTMLOptionsCollectionImpl::item):
  • khtml/html/html_formimpl.h: (DOM::HTMLInputElementImpl::maxLength): (DOM::HTMLInputElementImpl::maxResults): (DOM::HTMLSelectElementImpl::minWidth): (DOM::HTMLSelectElementImpl::size): (DOM::HTMLTextAreaElementImpl::cols): (DOM::HTMLTextAreaElementImpl::rows):
  • khtml/html/html_imageimpl.cpp: (HTMLImageElementImpl::width): (HTMLImageElementImpl::height): (HTMLImageElementImpl::border): (HTMLImageElementImpl::setBorder): (HTMLImageElementImpl::setHeight): (HTMLImageElementImpl::hspace): (HTMLImageElementImpl::setHspace): (HTMLImageElementImpl::vspace): (HTMLImageElementImpl::setVspace): (HTMLImageElementImpl::setWidth): (HTMLImageElementImpl::x): (HTMLImageElementImpl::y): (HTMLAreaElementImpl::tabIndex): (HTMLAreaElementImpl::setTabIndex):
  • khtml/html/html_imageimpl.h:
  • khtml/html/html_inlineimpl.cpp: (DOM::HTMLAnchorElementImpl::tabIndex): (DOM::HTMLAnchorElementImpl::setTabIndex):
  • khtml/html/html_inlineimpl.h:
  • khtml/html/html_listimpl.cpp: (DOM::HTMLOListElementImpl::setStart): (DOM::HTMLLIElementImpl::value): (DOM::HTMLLIElementImpl::setValue):
  • khtml/html/html_listimpl.h: (DOM::HTMLUListElementImpl::start): (DOM::HTMLOListElementImpl::start):
  • khtml/html/html_miscimpl.cpp: (DOM::HTMLCollectionImpl::calcLength): (DOM::HTMLCollectionImpl::length): (DOM::HTMLCollectionImpl::item): (DOM::HTMLFormCollectionImpl::calcLength): (DOM::HTMLFormCollectionImpl::item):
  • khtml/html/html_miscimpl.h:
  • khtml/html/html_objectimpl.cpp: (DOM::HTMLObjectElementImpl::tabIndex): (DOM::HTMLObjectElementImpl::setTabIndex):
  • khtml/html/html_objectimpl.h:
  • khtml/html/html_tableimpl.cpp: (DOM::HTMLTableElementImpl::insertRow): (DOM::HTMLTableElementImpl::deleteRow): (DOM::HTMLTableSectionElementImpl::insertRow): (DOM::HTMLTableSectionElementImpl::deleteRow): (DOM::HTMLTableRowElementImpl::rowIndex): (DOM::HTMLTableRowElementImpl::sectionRowIndex): (DOM::HTMLTableRowElementImpl::insertCell): (DOM::HTMLTableRowElementImpl::deleteCell): (DOM::HTMLTableCellElementImpl::cellIndex): (DOM::HTMLTableCellElementImpl::setColSpan): (DOM::HTMLTableCellElementImpl::setRowSpan): (DOM::HTMLTableColElementImpl::setSpan):
  • khtml/html/html_tableimpl.h: (DOM::HTMLTableColElementImpl::span):
  • khtml/html/htmlparser.cpp: (HTMLParser::handleError):
  • khtml/html/htmltokenizer.cpp: (khtml::HTMLTokenizer::processToken):
  • khtml/khtml_events.cpp: (khtml::MouseEvent::offset):
  • khtml/khtml_events.h: (khtml::MouseReleaseEvent::MouseReleaseEvent):
  • khtml/khtml_part.cpp: (KHTMLPart::restoreURL): (KHTMLPart::stopLoading): (KHTMLPart::receivedFirstData): (KHTMLPart::slotFinished): (KHTMLPart::begin): (KHTMLPart::slotViewFrameSource): (KHTMLPart::selectFrameElementInParentIfFullySelected):
  • khtml/khtml_part.h:
  • khtml/khtmlpart_p.h: (KHTMLPartPrivate::KHTMLPartPrivate):
  • khtml/misc/loader.h:
  • khtml/rendering/render_block.cpp: (khtml::RenderBlock::positionForRenderer):
  • khtml/rendering/render_br.cpp: (RenderBR::caretMinOffset): (RenderBR::caretMaxOffset): (RenderBR::caretMaxRenderedOffset): (RenderBR::inlineBox):
  • khtml/rendering/render_br.h:
  • khtml/rendering/render_form.cpp: (RenderLineEdit::selectionStart): (RenderLineEdit::selectionEnd): (RenderLineEdit::setSelectionStart): (RenderLineEdit::setSelectionEnd): (RenderLineEdit::setSelectionRange): (RenderTextArea::calcMinMaxWidth): (RenderTextArea::selectionStart): (RenderTextArea::selectionEnd): (RenderTextArea::setSelectionStart): (RenderTextArea::setSelectionEnd): (RenderTextArea::setSelectionRange):
  • khtml/rendering/render_form.h:
  • khtml/rendering/render_frames.cpp: (RenderPartObject::updateWidget):
  • khtml/rendering/render_line.cpp: (khtml::InlineBox::caretMinOffset): (khtml::InlineBox::caretMaxOffset): (khtml::InlineBox::caretMaxRenderedOffset):
  • khtml/rendering/render_line.h:
  • khtml/rendering/render_list.cpp: (RenderListMarker::calcMinMaxWidth):
  • khtml/rendering/render_list.h: (khtml::RenderListItem::value): (khtml::RenderListItem::setValue):
  • khtml/rendering/render_object.cpp: (RenderObject::caretMinOffset): (RenderObject::caretMaxOffset): (RenderObject::caretMaxRenderedOffset): (RenderObject::previousOffset): (RenderObject::nextOffset): (RenderObject::inlineBox):
  • khtml/rendering/render_object.h:
  • khtml/rendering/render_replaced.cpp: (RenderReplaced::caretMinOffset): (RenderReplaced::caretMaxOffset): (RenderReplaced::caretMaxRenderedOffset):
  • khtml/rendering/render_replaced.h:
  • khtml/rendering/render_table.h: (khtml::RenderTableCell::cellIndex): (khtml::RenderTableCell::setCellIndex):
  • khtml/rendering/render_text.cpp: (InlineTextBox::paintMarker): (InlineTextBox::paintMarkedTextUnderline): (InlineTextBox::caretMinOffset): (InlineTextBox::caretMaxOffset): (InlineTextBox::caretMaxRenderedOffset): (RenderText::previousOffset): (RenderText::nextOffset): (InlineTextBox::positionForOffset): (RenderText::caretMinOffset): (RenderText::caretMaxOffset): (RenderText::caretMaxRenderedOffset): (RenderText::inlineBox):
  • khtml/rendering/render_text.h:
  • khtml/xml/dom2_eventsimpl.cpp: (DOM::EventImpl::timeStamp): (DOM::UIEventImpl::UIEventImpl): (DOM::UIEventImpl::initUIEvent): (DOM::UIEventImpl::layerX): (DOM::UIEventImpl::layerY): (DOM::UIEventImpl::pageX): (DOM::UIEventImpl::pageY): (DOM::UIEventImpl::which): (DOM::MouseRelatedEventImpl::MouseRelatedEventImpl): (DOM::MouseRelatedEventImpl::pageX): (DOM::MouseRelatedEventImpl::pageY): (DOM::MouseEventImpl::MouseEventImpl): (DOM::MouseEventImpl::initMouseEvent): (DOM::MouseEventImpl::which): (DOM::KeyboardEventImpl::KeyboardEventImpl): (DOM::KeyboardEventImpl::initKeyboardEvent): (DOM::KeyboardEventImpl::which): (DOM::WheelEventImpl::WheelEventImpl):
  • khtml/xml/dom2_eventsimpl.h: (DOM::UIEventImpl::detail): (DOM::UIEventWithKeyStateImpl::UIEventWithKeyStateImpl): (DOM::MouseRelatedEventImpl::screenX): (DOM::MouseRelatedEventImpl::screenY): (DOM::MouseRelatedEventImpl::clientX): (DOM::MouseRelatedEventImpl::clientY): (DOM::MouseRelatedEventImpl::layerX): (DOM::MouseRelatedEventImpl::layerY): (DOM::KeyboardEventImpl::keyLocation): (DOM::WheelEventImpl::wheelDelta):
  • khtml/xml/dom2_rangeimpl.cpp: (DOM::RangeImpl::RangeImpl): (DOM::RangeImpl::startOffset): (DOM::RangeImpl::endOffset): (DOM::RangeImpl::setStart): (DOM::RangeImpl::setEnd): (DOM::RangeImpl::compareBoundaryPoints): (DOM::RangeImpl::processContents): (DOM::RangeImpl::checkNodeWOffset):
  • khtml/xml/dom2_rangeimpl.h:
  • khtml/xml/dom2_traversalimpl.cpp: (DOM::TraversalImpl::TraversalImpl): (DOM::TreeWalkerImpl::TreeWalkerImpl):
  • khtml/xml/dom2_traversalimpl.h: (DOM::TraversalImpl::whatToShow):
  • khtml/xml/dom_docimpl.cpp: (DocumentImpl::createNodeIterator): (DocumentImpl::createTreeWalker): (DocumentImpl::processHttpEquiv): (DocumentImpl::removeMarkers): (DocumentImpl::copyMarkers): (DocumentImpl::markersForNode): (DocumentImpl::shiftMarkers):
  • khtml/xml/dom_docimpl.h:
  • khtml/xml/dom_elementimpl.cpp: (ElementImpl::openTagStartToString): (NamedAttrMapImpl::item): (NamedAttrMapImpl::getAttributeItem): (NamedAttrMapImpl::removeAttribute):
  • khtml/xml/dom_elementimpl.h: (DOM::NamedAttrMapImpl::length): (DOM::NamedAttrMapImpl::attributeItem): (DOM::NamedMappedAttrMapImpl::attributeItem):
  • khtml/xml/dom_nodeimpl.cpp: (DOM::NodeImpl::normalize): (DOM::NodeImpl::nodeIndex): (DOM::NodeImpl::childNodeCount): (DOM::NodeImpl::childNode): (DOM::NodeImpl::maxOffset): (DOM::NodeImpl::maxDeepOffset): (DOM::NodeImpl::caretMinOffset): (DOM::NodeImpl::caretMaxOffset): (DOM::NodeImpl::caretMaxRenderedOffset): (DOM::NodeImpl::previousOffset): (DOM::NodeImpl::nextOffset): (DOM::ContainerNodeImpl::childNodeCount): (DOM::ContainerNodeImpl::childNode): (DOM::NodeListImpl::recursiveLength): (DOM::NodeListImpl::recursiveItem): (DOM::NodeListImpl::itemById): (DOM::ChildNodeListImpl::length): (DOM::ChildNodeListImpl::item): (DOM::TagNodeListImpl::length): (DOM::TagNodeListImpl::item): (DOM::NameNodeListImpl::length): (DOM::NameNodeListImpl::item):
  • khtml/xml/dom_nodeimpl.h:
  • khtml/xml/dom_position.cpp: (DOM::Position::Position): (DOM::Position::previous): (DOM::Position::next): (DOM::Position::renderedOffset): (DOM::Position::equivalentRangeCompliantPosition): (DOM::Position::rendersInDifferentPosition): (DOM::Position::trailingWhitespacePosition): (DOM::Position::debugPosition):
  • khtml/xml/dom_position.h: (DOM::Position::offset):
  • khtml/xml/dom_textimpl.cpp: (CharacterDataImpl::length): (CharacterDataImpl::substringData): (CharacterDataImpl::insertData): (CharacterDataImpl::deleteData): (CharacterDataImpl::replaceData): (CharacterDataImpl::checkCharDataOperation): (CharacterDataImpl::maxOffset): (CharacterDataImpl::caretMinOffset): (CharacterDataImpl::caretMaxOffset): (CharacterDataImpl::caretMaxRenderedOffset): (TextImpl::splitText):
  • khtml/xml/dom_textimpl.h:
  • kwq/DOM-CSS.mm: (-[DOMStyleSheetList length]): (-[DOMStyleSheetList item:]): (-[DOMCSSStyleSheet insertRule::]): (-[DOMCSSStyleSheet deleteRule:]): (-[DOMMediaList length]): (-[DOMMediaList item:]): (-[DOMCSSRuleList length]): (-[DOMCSSRuleList item:]): (-[DOMCSSMediaRule insertRule::]): (-[DOMCSSMediaRule deleteRule:]): (-[DOMCSSStyleDeclaration length]): (-[DOMCSSStyleDeclaration item:]): (-[DOMCSSValueList length]): (-[DOMCSSValueList item:]):
  • kwq/DOM.mm: (-[DOMNamedNodeMap item:]): (-[DOMNamedNodeMap length]): (-[DOMNodeList item:]): (-[DOMNodeList length]): (-[DOMCharacterData length]): (-[DOMCharacterData substringData::]): (-[DOMCharacterData insertData::]): (-[DOMCharacterData deleteData::]): (-[DOMCharacterData replaceData:::]): (-[DOMText splitText:]): (-[DOMRange description]): (-[DOMRange startOffset]): (-[DOMRange endOffset]): (-[DOMRange setStart::]): (-[DOMRange setEnd::]): (-[DOMNodeIterator whatToShow]): (-[DOMTreeWalker whatToShow]): (-[DOMDocument createNodeIterator::::]): (-[DOMDocument createTreeWalker::::]):
  • kwq/DOMCSS.h:
  • kwq/DOMCore.h:
  • kwq/DOMEvents.h: (-[DOMMouseEvent initMouseEvent:::::::::::::::]):
  • kwq/DOMEvents.mm: (-[DOMMouseEvent screenX]): (-[DOMMouseEvent screenY]): (-[DOMMouseEvent clientX]): (-[DOMMouseEvent clientY]): (-[DOMMouseEvent initMouseEvent:::::::::::::::]): (-[DOMUIEvent detail]): (-[DOMUIEvent initUIEvent:::::]):
  • kwq/DOMExtensions.h:
  • kwq/DOMHTML.h:
  • kwq/DOMHTML.mm: (-[DOMHTMLCollection length]): (-[DOMHTMLCollection item:]): (-[DOMHTMLOptionsCollection length]): (-[DOMHTMLOptionsCollection setLength:]): (-[DOMHTMLOptionsCollection item:]): (-[DOMHTMLFormElement length]): (-[DOMHTMLSelectElement selectedIndex]): (-[DOMHTMLSelectElement setSelectedIndex:]): (-[DOMHTMLSelectElement length]): (-[DOMHTMLSelectElement setLength:]): (-[DOMHTMLSelectElement size]): (-[DOMHTMLSelectElement setSize:]): (-[DOMHTMLSelectElement tabIndex]): (-[DOMHTMLSelectElement setTabIndex:]): (-[DOMHTMLSelectElement remove:]): (-[DOMHTMLOptionElement index]): (-[DOMHTMLInputElement maxLength]): (-[DOMHTMLInputElement setMaxLength:]): (-[DOMHTMLInputElement size]): (-[DOMHTMLInputElement setSize:]): (-[DOMHTMLInputElement tabIndex]): (-[DOMHTMLInputElement setTabIndex:]): (-[DOMHTMLTextAreaElement cols]): (-[DOMHTMLTextAreaElement setCols:]): (-[DOMHTMLTextAreaElement rows]): (-[DOMHTMLTextAreaElement setRows:]): (-[DOMHTMLTextAreaElement tabIndex]): (-[DOMHTMLTextAreaElement setTabIndex:]): (-[DOMHTMLButtonElement tabIndex]): (-[DOMHTMLButtonElement setTabIndex:]): (-[DOMHTMLOListElement start]): (-[DOMHTMLOListElement setStart:]): (-[DOMHTMLLIElement value]): (-[DOMHTMLLIElement setValue:]): (-[DOMHTMLPreElement width]): (-[DOMHTMLPreElement setWidth:]): (-[DOMHTMLAnchorElement tabIndex]): (-[DOMHTMLAnchorElement setTabIndex:]): (-[DOMHTMLImageElement height]): (-[DOMHTMLImageElement setHeight:]): (-[DOMHTMLImageElement hspace]): (-[DOMHTMLImageElement setHspace:]): (-[DOMHTMLImageElement vspace]): (-[DOMHTMLImageElement setVspace:]): (-[DOMHTMLImageElement width]): (-[DOMHTMLImageElement setWidth:]): (-[DOMHTMLObjectElement hspace]): (-[DOMHTMLObjectElement setHspace:]): (-[DOMHTMLObjectElement tabIndex]): (-[DOMHTMLObjectElement setTabIndex:]): (-[DOMHTMLObjectElement vspace]): (-[DOMHTMLObjectElement setVspace:]): (-[DOMHTMLAppletElement hspace]): (-[DOMHTMLAppletElement setHspace:]): (-[DOMHTMLAppletElement vspace]): (-[DOMHTMLAppletElement setVspace:]): (-[DOMHTMLAreaElement tabIndex]): (-[DOMHTMLAreaElement setTabIndex:]): (-[DOMHTMLTableSectionElement insertRow:]): (-[DOMHTMLTableSectionElement deleteRow:]): (-[DOMHTMLTableElement insertRow:]): (-[DOMHTMLTableElement deleteRow:]): (-[DOMHTMLTableColElement span]): (-[DOMHTMLTableColElement setSpan:]): (-[DOMHTMLTableRowElement rowIndex]): (-[DOMHTMLTableRowElement sectionRowIndex]): (-[DOMHTMLTableRowElement insertCell:]): (-[DOMHTMLTableRowElement deleteCell:]): (-[DOMHTMLTableCellElement cellIndex]): (-[DOMHTMLTableCellElement colSpan]): (-[DOMHTMLTableCellElement setColSpan:]): (-[DOMHTMLTableCellElement rowSpan]): (-[DOMHTMLTableCellElement setRowSpan:]): (-[DOMHTMLEmbedElement height]): (-[DOMHTMLEmbedElement setHeight:]): (-[DOMHTMLEmbedElement width]): (-[DOMHTMLEmbedElement setWidth:]):
  • kwq/DOMRange.h:
  • kwq/DOMStylesheets.h:
  • kwq/DOMTraversal.h:
  • kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::advanceToNextMisspelling): (KWQKHTMLPart::openURLFromPageCache): (KWQKHTMLPart::markMisspellings):
  • kwq/KWQString.h:
  • kwq/KWQString.mm: (QString::toShort): (QString::toUShort): (QString::toInt): (QString::toUInt):
  • kwq/KWQTextEdit.h:
  • kwq/KWQTextEdit.mm: (QTextEdit::selectionStart): (QTextEdit::selectionEnd): (QTextEdit::setSelectionStart): (QTextEdit::setSelectionEnd): (QTextEdit::setSelectionRange):
  • kwq/WebCoreBridge.mm: (-[WebCoreBridge convertToNSRange:DOM::]):

WebKit:

Change by Darin, reviewed by me and Maciej.

Fixes ​http://bugzilla.opendarwin.org/show_bug.cgi?id=4547
use int instead of long for 32-bit (to prepare for LP64 compiling)

  • Plugins.subproj/npapi.m: changed types to match those defined in npapi.h (NPN_MemAlloc): (NPN_MemFlush): (NPN_PostURLNotify): (NPN_PostURL): (NPN_Write):
Location:
trunk/JavaScriptCore/kjs
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/kjs/identifier.h

    r10325 r10556  
    5151        bool isEmpty() const { return _ustring.isEmpty(); }
    5252       
    53         unsigned long toULong(bool *ok) const { return _ustring.toULong(ok); }
    5453        uint32_t toUInt32(bool *ok) const { return _ustring.toUInt32(ok); }
    5554        uint32_t toStrictUInt32(bool *ok) const { return _ustring.toStrictUInt32(ok); }

  • trunk/JavaScriptCore/kjs/internal.h

    r10456 r10556  
    117117    friend ValueImp *jsNumber(long);
    118118    friend ValueImp *jsNumber(unsigned long);
     119    friend ValueImp *jsNumber(long long);
     120    friend ValueImp *jsNumber(unsigned long long);
    119121    friend ValueImp *jsNumber(double);
    120122    friend ValueImp *jsNumber(double, bool);

  • trunk/JavaScriptCore/kjs/property_slot.h

    r10258 r10556  
    7575    }
    7676
    77     void setCustomIndex(ObjectImp *slotBase, unsigned long index, GetValueFunc getValue)
     77    void setCustomIndex(ObjectImp *slotBase, unsigned index, GetValueFunc getValue)
    7878    {
    7979        assert(getValue);
    … …  
    9292
    9393    const HashEntry *staticEntry() const { return m_data.staticEntry; }
    94     unsigned long index() const { return m_data.index; }
     94    unsigned index() const { return m_data.index; }
    9595
    9696private:
    … …  
    103103        ValueImp **valueSlot;
    104104        const HashEntry *staticEntry;
    105         unsigned long index;
     105        unsigned index;
    106106    } m_data;
    107107};

  • trunk/JavaScriptCore/kjs/regexp_object.cpp

    r10456 r10556  
    215215{
    216216  RegExpObjectImp *thisObj = static_cast<RegExpObjectImp *>(slot.slotBase());
    217   unsigned long i = slot.index();
     217  unsigned i = slot.index();
    218218
    219219  if (i < thisObj->lastNrSubPatterns + 1) {
    … …  
    232232  {
    233233    bool ok;
    234     unsigned long i = s.substr(1).toULong(&ok);
    235     if (ok)
    236     {
     234    unsigned i = s.substr(1).toUInt32(&ok);
     235    if (ok) {
    237236      slot.setCustomIndex(this, i, backrefGetter);
    238237      return true;

  • trunk/JavaScriptCore/kjs/simple_number.h

    r10512 r10556  
    3737#endif
    3838
     39#define KJS_MIN_MACRO(a, b) ((a) < (b) ? (a) : (b))
     40
    3941namespace KJS {
    4042
    … …  
    5254    class SimpleNumber {
    5355    public:
    54         enum { tag = 1, shift = 2, mask = (1 << shift) - 1, sign = 1L << (sizeof(long) * 8 - 1 ), max = (1L << ((sizeof(long) * 8 - 1) - shift)) - 1, min = -max - 1, imax = (1L << ((sizeof(int) * 8 - 1) - shift)) - 1, imin = -imax - 1 };
     56        enum {
     57            tag = 1,
     58            shift = 2,
     59            mask = (1 << shift) - 1,
     60            bits = KJS_MIN_MACRO(sizeof(ValueImp *) * 8 - shift, sizeof(long) * 8),
     61            sign = 1UL << (bits + shift - 1),
     62            umax = sign >> 1,
     63            smax = static_cast<long>(umax),
     64            smin = static_cast<long>(-umax - 1)
     65        };
     66       
     67        static inline bool is(const ValueImp *imp) { return ((long)imp & mask) == tag; }
     68        static inline long value(const ValueImp *imp) { return ((long)imp >> shift) | (((long)imp & sign) ? ~umax : 0); }
    5569
    56         static inline bool is(const ValueImp *imp) { return ((long)imp & mask) == tag; }
    57         static inline long value(const ValueImp *imp) { return ((long)imp >> shift) | (((long)imp & sign) ? ~max : 0); }
    58 
    59         static inline bool fits(int i) { return i <= imax && i >= imin; }
    60         static inline bool fits(unsigned i) { return i <= (unsigned)max; }
    61         static inline bool fits(long i) { return i <= max && i >= min; }
    62         static inline bool fits(unsigned long i) { return i <= (unsigned)max; }
    63         static inline bool integerFits(double d) { return !(d < min || d > max); }
    64         static inline bool fits(double d) { return d >= min && d <= max && d == (double)(long)d && !isNegativeZero(d); }
    65         static inline ValueImp *make(long i) { return (ValueImp *)((i << shift) | tag); }
     70        static inline bool fits(int i) { return i <= smax && i >= smin; }
     71        static inline bool fits(unsigned i) { return i <= umax; }
     72        static inline bool fits(long i) { return i <= smax && i >= smin; }
     73        static inline bool fits(unsigned long i) { return i <= umax; }
     74        static inline bool fits(long long i) { return i <= smax && i >= smin; }
     75        static inline bool fits(unsigned long long i) { return i <= umax; }
     76        static inline bool integerFits(double d) { return !(d < smin || d > smax); }
     77        static inline bool fits(double d) { return d >= smin && d <= smax && d == (double)(long)d && !isNegativeZero(d); }
     78        static inline ValueImp *make(long i) { return reinterpret_cast<ValueImp *>(static_cast<uintptr_t>((i << shift) | tag)); }
    6679    };
    6780

  • trunk/JavaScriptCore/kjs/string_object.cpp

    r10207 r10556  
    243243    }
    244244    // Assume number part is one char exactly
    245     unsigned long backrefIndex = substitutedReplacement.substr(i+1,1).toULong(&converted, false /* tolerate empty string */);
     245    unsigned backrefIndex = substitutedReplacement.substr(i+1,1).toUInt32(&converted, false /* tolerate empty string */);
    246246    if (converted && backrefIndex <= (unsigned)reg->subPatterns()) {
    247247      int backrefStart = (*ovector)[2*backrefIndex];

  • trunk/JavaScriptCore/kjs/ustring.cpp

    r10265 r10556  
    489489UString UString::from(int i)
    490490{
    491   return from((long)i);
     491  UChar buf[1 + sizeof(i) * 3];
     492  UChar *end = buf + sizeof(buf) / sizeof(UChar);
     493  UChar *p = end;
     494 
     495  if (i == 0) {
     496    *--p = '0';
     497  } else if (i == INT_MIN) {
     498    char minBuf[1 + sizeof(i) * 3];
     499    sprintf(minBuf, "%d", INT_MIN);
     500    return UString(minBuf);
     501  } else {
     502    bool negative = false;
     503    if (i < 0) {
     504      negative = true;
     505      i = -i;
     506    }
     507    while (i) {
     508      *--p = (unsigned short)((i % 10) + '0');
     509      i /= 10;
     510    }
     511    if (negative) {
     512      *--p = '-';
     513    }
     514  }
     515 
     516  return UString(p, end - p);
    492517}
    493518
    494519UString UString::from(unsigned int u)
    495520{
    496   UChar buf[20];
    497   UChar *end = buf + 20;
     521  UChar buf[sizeof(u) * 3];
     522  UChar *end = buf + sizeof(buf) / sizeof(UChar);
    498523  UChar *p = end;
    499524 
    … …  
    512537UString UString::from(long l)
    513538{
    514   UChar buf[20];
    515   UChar *end = buf + 20;
     539  UChar buf[1 + sizeof(l) * 3];
     540  UChar *end = buf + sizeof(buf) / sizeof(UChar);
    516541  UChar *p = end;
    517542 
    … …  
    519544    *--p = '0';
    520545  } else if (l == LONG_MIN) {
    521     char minBuf[20];
     546    char minBuf[1 + sizeof(l) * 3];
    522547    sprintf(minBuf, "%ld", LONG_MIN);
    523548    return UString(minBuf);
    … …  
    939964}
    940965
    941 unsigned long UString::toULong(bool *ok, bool tolerateEmptyString) const
    942 {
    943   double d = toDouble(false, tolerateEmptyString);
     966uint32_t UString::toUInt32(bool *ok) const
     967{
     968  double d = toDouble();
    944969  bool b = true;
    945970
    946   if (isNaN(d) || d != static_cast<unsigned long>(d)) {
     971  if (isNaN(d) || d != static_cast<uint32_t>(d)) {
    947972    b = false;
    948973    d = 0;
    … …  
    952977    *ok = b;
    953978
    954   return static_cast<unsigned long>(d);
    955 }
    956 
    957 unsigned long UString::toULong(bool *ok) const
    958 {
    959   return toULong(ok, true);
    960 }
    961 
    962 uint32_t UString::toUInt32(bool *ok) const
    963 {
    964   double d = toDouble();
     979  return static_cast<uint32_t>(d);
     980}
     981
     982uint32_t UString::toUInt32(bool *ok, bool tolerateEmptyString) const
     983{
     984  double d = toDouble(false, tolerateEmptyString);
    965985  bool b = true;
    966986
    … …  
    10471067    return pos;
    10481068  const UChar *end = data() + sz - fsz;
    1049   long fsizeminusone = (fsz - 1) * sizeof(UChar);
     1069  int fsizeminusone = (fsz - 1) * sizeof(UChar);
    10501070  const UChar *fdata = f.data();
    10511071  unsigned short fchar = fdata->uc;
    … …  
    10821102  if (fsz == 0)
    10831103    return pos;
    1084   long fsizeminusone = (fsz - 1) * sizeof(UChar);
     1104  int fsizeminusone = (fsz - 1) * sizeof(UChar);
    10851105  const UChar *fdata = f.data();
    10861106  for (const UChar *c = data() + pos; c >= data(); c--) {

  • trunk/JavaScriptCore/kjs/ustring.h

    r10325 r10556  
    303303    static UString from(unsigned int u);
    304304    /**
    305      * Constructs a string from a long.
    306      */
    307     static UString from(long l);
     305     * Constructs a string from a long int.
     306     */
     307    static UString from(long u);
    308308    /**
    309309     * Constructs a string from a double.
    … …  
    420420    double toDouble(bool tolerateTrailingJunk) const;
    421421    double toDouble() const;
    422     /**
    423      * Attempts an conversion to an unsigned long integer. ok will be set
     422
     423    /**
     424     * Attempts an conversion to a 32-bit integer. ok will be set
    424425     * according to the success.
    425      * @param tolerateEmptyString if false, toULong will return false for *ok for an empty string.
    426      */
    427     unsigned long toULong(bool *ok, bool tolerateEmptyString) const;
    428     unsigned long toULong(bool *ok = 0) const;
    429 
     426     * @param tolerateEmptyString if false, toUInt32 will return false for *ok for an empty string.
     427     */
    430428    uint32_t toUInt32(bool *ok = 0) const;
     429    uint32_t toUInt32(bool *ok, bool tolerateEmptyString) const;
    431430    uint32_t toStrictUInt32(bool *ok = 0) const;
    432431

  • trunk/JavaScriptCore/kjs/value.cpp

    r10510 r10556  
    202202}
    203203
     204ValueImp *jsNumber(long long i)
     205{
     206    return SimpleNumber::fits(i) ? SimpleNumber::make(i) : new NumberImp(static_cast<double>(i));
     207}
     208
     209ValueImp *jsNumber(unsigned long long i)
     210{
     211    return SimpleNumber::fits(i) ? SimpleNumber::make(i) : new NumberImp(static_cast<double>(i));
     212}
     213
    204214ValueImp *jsNumber(double d)
    205215{

  • trunk/JavaScriptCore/kjs/value.h

    r10457 r10556  
    190190ValueImp *jsNumber(long);
    191191ValueImp *jsNumber(unsigned long);
     192ValueImp *jsNumber(long long);
     193ValueImp *jsNumber(unsigned long long);
    192194
    193195AllocatedValueImp *jsString(const UString &); // returns empty string if passed null string
Note: See TracChangeset for help on using the changeset viewer.