1. 12 Jun, 2006 6 commits
    • hyatt's avatar
      Add selection foreground color on Win32. · cb7f065b
      hyatt authored
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14827 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      cb7f065b
    • sullivan's avatar
      Reviewed by Darin Adler. · 5db72767
      sullivan authored
              
              * page/Frame.cpp:
              (WebCore::Frame::markAllMatchesForText):
              Do a "fake" paint here so that the rectangles for the text matches will have been
              computed by the time this method returns.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14826 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      5db72767
    • beidson's avatar
      Reviewed by Levi and Tim Omernick. · c6be2f6f
      beidson authored
              -Added a skeleton sqlite3 icon database file to IconDatabase
              -Added functionality to validate and recreate this icon.db file
              -Fixed some buggys in SQLDatabase.cpp
      
              * icon/IconDatabase.cpp:
              (WebCore::IconDatabase::open):
              (WebCore::IconDatabase::isValidDatabase):
              (WebCore::IconDatabase::clearDatabase):
              (WebCore::IconDatabase::recreateDatabase):
              * icon/IconDatabase.h:
      
              * icon/SQLStatement.cpp:
              (WebCore::SQLStatement::columnCount):
              (WebCore::SQLStatement::getColumnName):
              (WebCore::SQLStatement::getColumnName16):
              (WebCore::SQLStatement::getColumnText):
              (WebCore::SQLStatement::getColumnText16):
              (WebCore::SQLStatement::getColumnDouble):
              (WebCore::SQLStatement::getColumnInt):
              (WebCore::SQLStatement::getColumnInt64):
              (WebCore::SQLStatement::getColumnBlob):
              -Added checks to make sure we had a valid working sqlite3_statement as the sqlite3_*
              function calls weren't as error-tolerant as documentation advertised
              (maybe differences between the 3.3 docs I looked at and the 3.1.3 version installed on OSX)
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14825 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      c6be2f6f
    • hyatt's avatar
      Fix Win32 build bustage. · c6590eb9
      hyatt authored
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14822 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      c6590eb9
    • ggaren's avatar
      Reviewed by Maciej. · 7dd2504d
      ggaren authored
              
              - Have *.lut.h files #include lookup.h to eliminate surprising header
              include order dependency.
      
              * DerivedSources.make:
              * kjs/array_object.cpp:
              * kjs/date_object.cpp:
              * kjs/date_object.h:
              (KJS::DateProtoFunc::):
              * kjs/lexer.cpp:
              * kjs/math_object.cpp:
              * kjs/number_object.cpp:
              * kjs/regexp_object.cpp:
              * kjs/string_object.cpp:
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14821 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      7dd2504d
    • beidson's avatar
      Reviewed by Levi. · b13e945d
      beidson authored
              -Added SQLite helper wrappers to ease use of SQLite in the IconDatabase.  
              -Changed the base IconDatabase over to this new framework.
      
              * WebCore.xcodeproj/project.pbxproj:
              * bridge/mac/WebCoreIconDatabaseBridge.mm:
              (-[WebCoreIconDatabaseBridge closeSharedDatabase]):
                  -By popular request, removed an annoying log message I'd accidentally left in
      
              * icon/IconDatabase.cpp:
              (WebCore::IconDatabase::IconDatabase):
              (WebCore::IconDatabase::open):
              (WebCore::IconDatabase::close):
              (WebCore::IconDatabase::~IconDatabase):
              * icon/IconDatabase.h:
              (WebCore::IconDatabase::isOpen):
                  -Changed over IconDatabase from direct sqlite3_* calls to the new SQLDatabase calls
      
              * icon/SQLDatabase.cpp: Added.
              (SQLDatabase::SQLDatabase):
              (SQLDatabase::open):
              (SQLDatabase::close):
              (SQLDatabase::executeCommand):
              (SQLDatabase::tableExists):
              * icon/SQLDatabase.h: Added.
              (WebCore::SQLDatabase::isOpen):
              (WebCore::SQLDatabase::getPath):
              (WebCore::SQLDatabase::lastError):
              (WebCore::SQLDatabase::lastErrorMsg):
              (WebCore::SQLStatement::isPrepared):
              (WebCore::SQLStatement::lastError):
              (WebCore::SQLStatement::lastErrorMsg):
              * icon/SQLStatement.cpp: Added.
              (WebCore::SQLStatement::SQLStatement):
              (WebCore::SQLStatement::~SQLStatement):
              (WebCore::SQLStatement::prepare):
              (WebCore::SQLStatement::step):
              (WebCore::SQLStatement::finalize):
              (WebCore::SQLStatement::reset):
              (WebCore::SQLStatement::executeCommand):
              (WebCore::SQLStatement::bindBlob):
              (WebCore::SQLStatement::bindText):
              (WebCore::SQLStatement::columnCount):
              (WebCore::SQLStatement::getColumnName):
              (WebCore::SQLStatement::getColumnName16):
              (WebCore::SQLStatement::getColumnText):
              (WebCore::SQLStatement::getColumnText16):
              (WebCore::SQLStatement::getColumnDouble):
              (WebCore::SQLStatement::getColumnInt):
              (WebCore::SQLStatement::getColumnInt64):
              (WebCore::SQLStatement::getColumnBlob):
              (WebCore::SQLStatement::returnTextResults):
              (WebCore::SQLStatement::returnTextResults16):
              (WebCore::SQLStatement::returnIntResults):
              (WebCore::SQLStatement::returnInt64Results):
              (WebCore::SQLStatement::returnDoubleResults):
                  -Initial checking of SQLDatabase framework
      
              * platform/PlatformString.h:
              * platform/String.cpp:
              (WebCore::String::String):
                  -Added an explicit UChar* constructor to our string class as much of sqlite3's UTF16 handling is based on 
                  null-terminated UTF16 which we didn't yet support.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14820 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      b13e945d
  2. 11 Jun, 2006 9 commits
    • ddkilzer's avatar
      WebCore: · 4e7910ac
      ddkilzer authored
              Reviewed by Maciej.
      
              http://bugzilla.opendarwin.org/show_bug.cgi?id=9408
              Clean build fails with "make: *** No rule to make target `SVGElementFactory.cpp', needed by `all'. Stop"
      
              * DerivedSources.make: Fix clean builds.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14819 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      4e7910ac
    • darin's avatar
      - another try at fixing Windows · 16a2dfbe
      darin authored
              * loader/CachedResource.h:
              * platform/cairo/GraphicsContextCairo.cpp:
              * platform/image-decoders/ImageDecoder.h:
              (WebCore::ImageDecoder::setData):
              * platform/image-decoders/gif/GIFImageDecoder.cpp:
              (WebCore::GIFImageDecoderPrivate::decode):
              (WebCore::GIFImageDecoder::setData):
              * platform/image-decoders/gif/GIFImageDecoder.h:
              * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
              (WebCore::JPEGImageReader::decode):
              (WebCore::JPEGImageDecoder::setData):
              * platform/image-decoders/jpeg/JPEGImageDecoder.h:
              * platform/image-decoders/png/PNGImageDecoder.cpp:
              (WebCore::PNGImageReader::decode):
              (WebCore::PNGImageDecoder::setData):
              * platform/image-decoders/png/PNGImageDecoder.h:
              s/DeprecatedByteArray/Vector<char>/
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14818 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      16a2dfbe
    • darin's avatar
      WebCore: · c0988acc
      darin authored
              - try to fix Windows build
      
              * platform/cairo/ImageCairo.cpp: (WebCore::Image::loadResource):
              Use Vector<char> instead of DeprecatedByteArray.
      
              * platform/win/TemporaryLinkStubs.cpp: (KWQServeSynchronousRequest):
              Don't try to return 0 from a function that returns a Vector<char>.
      
      WebKit:
      
              - try to fix Windows build
      
              * COM/WebKitDLL.cpp: (loadResourceIntoArray): Use Vector<char> instead of
              DeprecatedByteArray.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14817 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      c0988acc
    • darin's avatar
      Reviewed by Hyatt, tweaked quite a bit and landed by Darin. · 91298e58
      darin authored
              - Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=8039
                Remove use of DeprecatedArray in favor of new Vector class
      
              This removes most of the uses of DeprecatedArray and 
              DeprecatedByteArray, with the exception of DeprecatedCString.
      
              No test cases added because there is no change in
              functionality.
      
              * loader/CachedCSSStyleSheet.cpp:
              (WebCore::CachedCSSStyleSheet::data):
              * loader/CachedCSSStyleSheet.h:
              * loader/CachedImage.cpp:
              (WebCore::CachedImage::bufferData):
              (WebCore::CachedImage::data):
              (WebCore::CachedImage::checkNotify):
              (WebCore::CachedImage::shouldStopAnimation):
              * loader/CachedImage.h:
              * loader/CachedObject.cpp:
              (WebCore::CachedObject::bufferData):
              (WebCore::CachedObject::setExpireDate):
              * loader/CachedObject.h:
              (WebCore::CachedObject::setCharset):
              * loader/CachedScript.cpp:
              (WebCore::CachedScript::data):
              * loader/CachedScript.h:
              * loader/CachedXBLDocument.cpp:
              (WebCore::CachedXBLDocument::data):
              (WebCore::CachedXBLDocument::checkNotify):
              * loader/CachedXBLDocument.h:
              * loader/CachedXSLStyleSheet.cpp:
              (WebCore::CachedXSLStyleSheet::data):
              * loader/CachedXSLStyleSheet.h:
              * loader/Request.cpp:
              (WebCore::Request::Request):
              (WebCore::Request::~Request):
              * loader/Request.h:
              (WebCore::Request::buffer):
              (WebCore::Request::cachedObject):
              (WebCore::Request::docLoader):
              (WebCore::Request::isIncremental):
              (WebCore::Request::setIsIncremental):
              (WebCore::Request::isMultipart):
              (WebCore::Request::setIsMultipart):
              * loader/loader.cpp:
              (WebCore::crossDomain):
              (WebCore::Loader::Loader):
              (WebCore::Loader::load):
              (WebCore::Loader::servePendingRequests):
              (WebCore::Loader::receivedAllData):
              (WebCore::Loader::receivedResponse):
              (WebCore::Loader::receivedData):
              (WebCore::Loader::numRequests):
              (WebCore::Loader::cancelRequests):
              (WebCore::Loader::removeBackgroundDecodingRequest):
              (WebCore::Loader::jobForRequest):
              * platform/Image.cpp:
              (WebCore::Image::setData):
              * platform/Image.h:
              (WebCore::Image::dataBuffer):
      
              * css/cssstyleselector.cpp:
              (WebCore::CSSStyleSelector::init):
              (WebCore::CSSStyleSelector::matchRules):
              (WebCore::CSSStyleSelector::matchRulesForList):
              (WebCore::CSSStyleSelector::sortMatchedRules):
              (WebCore::CSSStyleSelector::initForStyleResolve):
              (WebCore::CSSStyleSelector::createStyleForElement):
              (WebCore::CSSStyleSelector::createPseudoStyleForElement):
              * css/cssstyleselector.h:
              (WebCore::CSSStyleSelector::addMatchedRule):
              (WebCore::CSSStyleSelector::addMatchedDeclaration):
              * dom/xml_tokenizer.cpp:
              (WebCore::OffsetBuffer::OffsetBuffer):
              (WebCore::openFunc):
              * html/HTMLOptionElement.cpp:
              (WebCore::HTMLOptionElement::index):
              * html/HTMLSelectElement.cpp:
              (WebCore::HTMLSelectElement::selectedIndex):
              (WebCore::HTMLSelectElement::setSelectedIndex):
              (WebCore::HTMLSelectElement::length):
              (WebCore::HTMLSelectElement::remove):
              (WebCore::HTMLSelectElement::value):
              (WebCore::HTMLSelectElement::setValue):
              (WebCore::HTMLSelectElement::state):
              (WebCore::HTMLSelectElement::restoreState):
              (WebCore::HTMLSelectElement::appendFormData):
              (WebCore::HTMLSelectElement::optionToListIndex):
              (WebCore::HTMLSelectElement::listToOptionIndex):
              (WebCore::HTMLSelectElement::recalcListItems):
              (WebCore::HTMLSelectElement::reset):
              (WebCore::HTMLSelectElement::notifyOptionSelected):
              * html/HTMLSelectElement.h:
              (WebCore::HTMLSelectElement::listItems):
              * kwq/KWQLoader.h:
              * kwq/KWQLoader.mm:
              (KWQServeSynchronousRequest):
              * kwq/KWQTextStream.cpp:
              (QTextStream::operator<<):
              * kwq/KWQTextStream.h:
              * loader/FormData.cpp:
              (WebCore::FormData::flatten):
              (WebCore::FormData::flattenToString):
              * loader/FormData.h:
              (WebCore::FormDataElement::FormDataElement):
              * platform/DeprecatedString.cpp:
              * platform/DeprecatedString.h:
              * platform/IntPointArray.cpp: Removed.
              * platform/IntPointArray.h: Removed.
              * platform/TextEncoding.cpp:
              (WebCore::TextEncoding::toUnicode):
              * platform/TextEncoding.h:
              * platform/cairo/pixman/src/pixregion.c:
              * platform/cg/PathCG.cpp:
              (WebCore::Path::Path):
              * rendering/RenderObject.cpp:
              (WebCore::RenderObject::drawBorder):
              * rendering/RenderTable.h:
              (WebCore::RenderTable::colToEffCol):
              (WebCore::RenderTable::effColToCol):
              * rendering/RenderTableSection.cpp:
              (WebCore::RenderTableSection::ensureRows):
              (WebCore::RenderTableSection::addCell):
              (WebCore::RenderTableSection::setCellWidths):
              * rendering/RenderTableSection.h:
              * rendering/bidi.cpp:
              (WebCore::addMidpoint):
              (WebCore::RenderBlock::layoutInlineChildren):
              * rendering/render_form.cpp:
              (WebCore::RenderSelect::updateFromElement):
              (WebCore::RenderSelect::layout):
              (WebCore::RenderSelect::valueChanged):
              (WebCore::RenderSelect::selectionChanged):
              (WebCore::RenderSelect::updateSelection):
              * rendering/table_layout.cpp:
              (WebCore::FixedTableLayout::layout):
              * rendering/table_layout.h:
              * xml/XSLTProcessor.cpp:
              (WebCore::docLoaderFunc):
              * xml/xmlhttprequest.cpp:
              (WebCore::XMLHttpRequest::send):
              (WebCore::XMLHttpRequest::processSyncLoadResults):
              * xml/xmlhttprequest.h:
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14816 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      91298e58
    • ddkilzer's avatar
      WebCore: · 8af08626
      ddkilzer authored
              Reviewed by darin.
      
              http://bugzilla.opendarwin.org/show_bug.cgi?id=9394
              Fix no-SVG build
      
              * DerivedSources.make: Removed tabs. Create empty SVGElementFactory.cpp on no-svg build.
              * ksvg2/bindings/js/JSSVGElementWrapperFactory.cpp: Added #if SVG_SUPPORT/#endif.
              * ksvg2/bindings/js/JSSVGElementWrapperFactory.h: Ditto.
              * ksvg2/bindings/idl/svg/SVGAElement.idl: Add "Conditional=SVG" to all interfaces.
              * ksvg2/bindings/idl/svg/SVGAnimateColorElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGAnimateElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGAnimateTransformElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGAnimatedAngle.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGAnimatedBoolean.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGAnimatedEnumeration.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGAnimatedInteger.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGAnimatedLengthList.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGAnimatedNumber.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGAnimatedNumberList.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGAnimatedPathData.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGAnimatedPoints.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGAnimatedPreserveAspectRatio.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGAnimatedRect.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGAnimatedString.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGAnimatedTransformList.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGAnimationElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGCircleElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGClipPathElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGComponentTransferFunctionElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGCursorElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGDOMImplementation.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGDefsElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGDescElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGElementInstance.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGElementInstanceList.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGEllipseElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGEvent.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGException.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGExternalResourcesRequired.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGFEBlendElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGFEColorMatrixElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGFEComponentTransferElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGFECompositeElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGFEFloodElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGFEFuncAElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGFEFuncBElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGFEFuncGElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGFEFuncRElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGFEGaussianBlurElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGFEImageElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGFEMergeElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGFEMergeNodeElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGFEOffsetElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGFETileElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGFETurbulenceElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGFilterElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGFilterPrimitiveStandardAttributes.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGFitToViewBox.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGGElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGGradientElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGICCColor.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGImageElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGLangSpace.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGLengthList.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGLineElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGLinearGradientElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGLocatable.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGMarkerElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGNumberList.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGPaint.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGPathElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGPathSeg.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGPathSegArc.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGPathSegClosePath.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGPathSegCurvetoCubic.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGPathSegCurvetoCubicSmooth.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGPathSegCurvetoQuadratic.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGPathSegCurvetoQuadraticSmooth.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGPathSegLineto.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGPathSegLinetoHorizontal.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGPathSegLinetoVertical.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGPathSegList.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGPathSegMoveto.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGPatternElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGPointList.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGPolygonElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGPolylineElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGPreserveAspectRatio.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGRadialGradientElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGRectElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGRenderingIntent.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGScriptElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGSetElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGStopElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGStringList.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGStylable.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGStyleElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGSwitchElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGSymbolElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGTSpanElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGTests.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGTextContentElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGTextElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGTextPositioningElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGTitleElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGTransformList.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGTransformable.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGURIReference.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGUnitTypes.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGUseElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGViewElement.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGZoomAndPan.idl: Ditto.
              * ksvg2/bindings/idl/svg/SVGZoomEvent.idl: Ditto.
              * ksvg2/svg/SVGAngle.idl: Ditto.
              * ksvg2/svg/SVGAnimatedLength.idl: Ditto.
              * ksvg2/svg/SVGColor.idl: Ditto.
              * ksvg2/svg/SVGDocument.idl: Ditto.
              * ksvg2/svg/SVGElement.idl: Ditto.
              * ksvg2/svg/SVGEvent.idl: Ditto.
              * ksvg2/svg/SVGLength.idl: Ditto.
              * ksvg2/svg/SVGMatrix.idl: Ditto.
              * ksvg2/svg/SVGNumber.idl: Ditto.
              * ksvg2/svg/SVGPoint.idl: Ditto.
              * ksvg2/svg/SVGRect.idl: Ditto.
              * ksvg2/svg/SVGSVGElement.idl: Ditto.
              * ksvg2/svg/SVGTransform.idl: Ditto.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14815 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      8af08626
    • ddkilzer's avatar
      WebKitTools: · 0507c8fa
      ddkilzer authored
              Reviewed by darin.
      
              http://bugzilla.opendarwin.org/show_bug.cgi?id=9395
              Make prepare-ChangeLog faster
      
              * Scripts/prepare-ChangeLog: Use "svn diff" instead of "svn stat" to find changed files,
              then save the diff output for reuse.  Keep a status variable if changes are made to
              LayoutTests so "svn diff LayoutTests" doesn't have to be run to check for changes when
              WebCore is updated.  Added -h|--help command-line switch and help message.  Move test
              for no changed files closer to the beginning of the program.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14814 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      0507c8fa
    • thatcher's avatar
      Removes a hardcoded path I had added for testing. · 87daa312
      thatcher authored
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14813 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      87daa312
    • thatcher's avatar
      Reviewed by Tim H. · 460cf154
      thatcher authored
              - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=8672
                Red outline from web inspector reappears after inspector is closed
      
              * WebInspector/WebInspector.m:
              (-[NSWindow windowWillClose:]): Added a call to setWebFrame to avoid further
              load progress notifications.
              (-[NSWindow setWebFrame:]): Changed to resign the WebView's hostWindow rather
              than its window for close notifications, to avoid resigning from all windows' close
              notifications (including the inspector window's) when the WebView is in a hidden tab.
              Also changed to prevent highlighting the initial focused node.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14812 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      460cf154
    • andersca's avatar
      WebCore: · c79dba31
      andersca authored
      2006-06-11  Anders Carlsson  <acarlsson@apple.com>
      
              Reviewed by Geoff.
      
              http://bugzilla.opendarwin.org/show_bug.cgi?id=9390
              Move full-frame plugins to WebCore
              
              * WebCore.vcproj/WebCore/WebCore.vcproj:
              * WebCore.xcodeproj/project.pbxproj:
              Add PluginDocument
              
              * bridge/mac/FrameMac.h:
              * bridge/mac/FrameMac.mm:
              (WebCore::FrameMac::redirectDataToPlugin):
              Call the bridge.
              
              * bridge/mac/WebCoreFrameBridge.h:
              * bridge/mac/WebCoreFrameBridge.mm:
              Add redirectDataToPlugin which is used to redirect incoming data
              to a plugin.
              
              * bridge/mac/WebCoreViewFactory.h:
              Add pluginSupportsMIMEType which returns whether any plugins support a given MIME type.
              
              * dom/DOMImplementation.cpp:
              * dom/DOMImplementation.h:
              Get rid of createTextDocument and just create a text document explicitly when needed.
              
              * dom/Document.h:
              (WebCore::Document::isPluginDocument):
              * loader/PluginDocument.cpp: Added.
              (WebCore::PluginTokenizer::PluginTokenizer):
              (WebCore::PluginTokenizer::wantsRawData):
              (WebCore::PluginTokenizer::write):
              (WebCore::PluginTokenizer::createDocumentStructure):
              (WebCore::PluginTokenizer::writeRawData):
              (WebCore::PluginTokenizer::stopParsing):
              (WebCore::PluginTokenizer::finish):
              (WebCore::PluginTokenizer::isWaitingForScripts):
              (WebCore::PluginDocument::PluginDocument):
              (WebCore::PluginDocument::createTokenizer):
              * loader/PluginDocument.h: Added.
              (WebCore::PluginDocument::isPluginDocument):
              Add PluginDocument.
              
              * page/Frame.cpp:
              (WebCore::Frame::begin):
              Possibly create a plugin document.
              
              * page/Frame.h:
              (WebCore::Frame::redirectDataToPlugin):
              Add declaration.
              
              * platform/PlugInInfoStore.h:
              * platform/mac/PlugInInfoStoreMac.mm:
              (WebCore::PlugInInfoStore::supportsMIMEType):
              Ask WebCoreViewFactory if the MIME type is supported.
      
      WebKit:
      
      2006-06-11  Anders Carlsson  <acarlsson@apple.com>
      
              Reviewed by Tim.
      
              http://bugzilla.opendarwin.org/show_bug.cgi?id=9390
              Move full-frame plugins to WebCore
      
              * Plugins/WebBaseNetscapePluginStream.h:
              * Plugins/WebBaseNetscapePluginStream.m:
              (-[WebBaseNetscapePluginStream instance]):
              Add instance method which returns the plugin instance.
              
              * Plugins/WebBasePluginPackage.h:
              Add WebPluginManualLoader protocol
              
              * Plugins/WebNetscapePluginDocumentView.h: Removed.
              * Plugins/WebNetscapePluginDocumentView.m: Removed.
      
              * Plugins/WebNetscapePluginEmbeddedView.h:
              * Plugins/WebNetscapePluginEmbeddedView.m:
              (-[WebNetscapePluginEmbeddedView initWithFrame:plugin:URL:baseURL:MIMEType:attributeKeys:attributeValues:loadManually:]):
              (-[WebNetscapePluginEmbeddedView dealloc]):
              (-[WebNetscapePluginEmbeddedView didStart]):
              (-[WebNetscapePluginEmbeddedView pluginView:receivedResponse:]):
              (-[WebNetscapePluginEmbeddedView pluginView:receivedData:]):
              (-[WebNetscapePluginEmbeddedView pluginView:receivedError:]):
              (-[WebNetscapePluginEmbeddedView pluginViewFinishedLoading:]):
              (-[WebNetscapePluginEmbeddedView redeliverStream]):
              Make WebNetscapePluginEmbeddedView support the WebPluginManualLoader protocol. It creates a plugin stream and feeds the
              data manually. Much of this code has been copied from WebNetscapePluginRepresentation.
      
              * Plugins/WebNetscapePluginRepresentation.h: Removed.
              * Plugins/WebNetscapePluginRepresentation.m: Removed.
      
              * Plugins/WebPluginController.h:
              * Plugins/WebPluginController.m:
              (-[WebPluginController pluginView:receivedResponse:]):
              (-[WebPluginController pluginView:receivedData:]):
              (-[WebPluginController pluginView:receivedError:]):
              (-[WebPluginController pluginViewFinishedLoading:]):
              Make WebPluginController support the WebPluginManualLoader protocol so it can feed data manually to WebKit plugins.
      
              * Plugins/WebPluginDatabase.m:        
              (-[WebPluginDatabase refresh]):
              Use WebHTMLView and WebHTMLRepresentation when registering/unregistering plug-in MIME types.
              
              * Plugins/WebPluginDocumentView.h: Removed.
              * Plugins/WebPluginDocumentView.m: Removed.
      
              * WebCoreSupport/WebFrameBridge.m:
              (-[WebFrameBridge pluginViewWithPackage:attributeNames:attributeValues:baseURL:DOMElement:loadManually:]):
              (-[WebFrameBridge viewForPluginWithURL:attributeNames:attributeValues:MIMEType:DOMElement:loadManually:]):
              Add loadManually argument.
              
              (-[WebFrameBridge redirectDataToPlugin:]):
              Call down to the HTML representation.
              
              (-[WebFrameBridge viewForJavaAppletWithFrame:attributeNames:attributeValues:baseURL:DOMElement:]):
              Pass NO to loadManually.
              
              (-[WebFrameBridge determineObjectFromMIMEType:URL:]):
              Explicitly check if the MIME type is supported by a plug-in instead of checking the view class.
              
              * WebCoreSupport/WebViewFactory.m:
              (-[WebViewFactory pluginSupportsMIMEType:]):
              New function which returns whether any plugins support a given MIME type.
              
              * WebKit.xcodeproj/project.pbxproj:
              Update for removed files.
              
              * WebView/WebFrame.m:
              (-[WebFrame _reloadForPluginChanges]):
              Remove view type checks.
              
              (-[WebFrame _recursive_pauseNullEventsForAllNetscapePlugins]):
              (-[WebFrame _recursive_resumeNullEventsForAllNetscapePlugins]):
              Remove FIXME comments.
              
              * WebView/WebHTMLRepresentation.m:
              (-[WebHTMLRepresentation _redirectDataToManualLoader:forPluginView:]):        
              New function which redirects incoming data to a manual loader.
              
              (-[WebHTMLRepresentation receivedData:withDataSource:]):
              (-[WebHTMLRepresentation receivedError:withDataSource:]):
              (-[WebHTMLRepresentation finishedLoadingWithDataSource:]):
              Optionally redirect incoming data.
              
              * WebView/WebHTMLRepresentationPrivate.h:
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14811 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      c79dba31
  3. 10 Jun, 2006 9 commits
    • ddkilzer's avatar
      LayoutTests: · 7c7373c1
      ddkilzer authored
              Patch by mitzpettel.  Reviewed by hyatt.
      
              - test for http://bugzilla.opendarwin.org/show_bug.cgi?id=9334
                Incomplete repaint when changing block from non-positioned to positioned
      
              * fast/repaint/static-to-positioned-expected.checksum: Added.
              * fast/repaint/static-to-positioned-expected.png: Added.
              * fast/repaint/static-to-positioned-expected.txt: Added.
              * fast/repaint/static-to-positioned.html: Added.
      
      WebCore:
      
              Patch by mitzpettel.  Reviewed by hyatt.
      
              - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=9334
                Incomplete repaint when changing block from non-positioned to positioned
      
              Test: fast/repaint/static-to-positioned.html
      
              * rendering/RenderObject.cpp:
              (WebCore::RenderObject::setStyle): If changing from static to positioned, repaint
              as static.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14810 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      7c7373c1
    • ddkilzer's avatar
      LayoutTests: · 8f9b1a93
      ddkilzer authored
              Reviewed by hyatt.
      
              - test for http://bugzilla.opendarwin.org/show_bug.cgi?id=9193
                REGRESSION: setting an opacity on an element with an outline causes the outline to disappear completely
      
              - test repainting of layer children's outlines that extend beyond the layer
      
              * fast/layers: Added.
              * fast/layers/opacity-outline-expected.checksum: Added.
              * fast/layers/opacity-outline-expected.png: Added.
              * fast/layers/opacity-outline-expected.txt: Added.
              * fast/layers/opacity-outline.html: Added.
              * fast/repaint/layer-child-outline-expected.checksum: Added.
              * fast/repaint/layer-child-outline-expected.png: Added.
              * fast/repaint/layer-child-outline-expected.txt: Added.
              * fast/repaint/layer-child-outline.html: Added.
      
      WebCore:
      
              Reviewed by hyatt.
      
              - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=9193
                REGRESSION: setting an opacity on an element with an outline causes the outline to disappear completely
      
              Test: fast/layers/opacity-outline.html
      
              - fix repainting of layer children's outlines that extend beyond the layer
      
              Test: fast/repaint/layer-child-outline.html
      
              * rendering/RenderLayer.cpp:
              (WebCore::RenderLayer::intersectsDamageRect): Account for outlines.
              (WebCore::RenderLayer::absoluteBoundingBox): Ditto.
              * rendering/RenderObject.cpp:
              (WebCore::RenderObject::maximalOutlineSize): Changed to return the view's maximal
              outline size rather than 0 for PaintPhaseChildOutlines.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14809 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      8f9b1a93
    • sfalken's avatar
      2006-06-10 Steve Falkenburg <sfalken@apple.com> · 7ff85162
      sfalken authored
              Fix build break
      
              * platform/cairo/GraphicsContextCairo.cpp:
              * platform/win/TemporaryLinkStubs.cpp:
              (GraphicsContext::scale):
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14808 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      7ff85162
    • ggaren's avatar
      JavaScriptCore: · 1ec99535
      ggaren authored
              - http://bugzilla.opendarwin.org/show_bug.cgi?id=8515
              Linux porting compile bug
              
              Fix by Mike Emmel, Reviewed by Darin.
      
              * JavaScriptCoreSources.bkl:
              * jscore.bkl:
              * wtf/Platform.h:
      
      WebCore:
      
              - http://bugzilla.opendarwin.org/show_bug.cgi?id=8515
              Linux porting compile bug
              
              Fix by Mike Emmel, Reviewed by Darin.
      
              * Projects/gdk/webcore-gdk.bkl:
              * WebCoreSources.bkl:
              * css/maketokenizer:
              * html/HTMLCanvasElement.cpp:
              * html/HTMLImageElement.h:
              * icon/IconDatabase.cpp:
              * make-generated-sources.sh:
              * page/Frame.h:
              * page/FramePrivate.h:
              * platform/Cursor.h:
              * platform/FontData.h:
              (WebCore::FontData::getGlyphIndex):
              * platform/GlyphBuffer.h:
              (WebCore::GlyphBuffer::glyphAt):
              (WebCore::GlyphBuffer::advanceAt):
              (WebCore::GlyphBuffer::add):
              * platform/GraphicsContext.h:
              * platform/PlatformKeyboardEvent.h:
              * platform/PlatformMouseEvent.h:
              * platform/PlatformWheelEvent.h:
              * platform/ScrollView.h:
              * platform/TransferJob.h:
              (WebCore::TransferJob::getInternal):
              * platform/TransferJobInternal.h:
              (WebCore::TransferJobInternal::TransferJobInternal):
              * platform/Widget.h:
              * platform/cairo/GraphicsContextCairo.cpp:
              (WebCore::GraphicsContext::GraphicsContext):
              (WebCore::GraphicsContext::roundToDevicePixels):
              * webcore-base.bkl:
              * xpath/impl/XPathValue.cpp:
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14807 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      1ec99535
    • sullivan's avatar
      Reviewed by Tim Omernick and Dave Hyatt. · 94a64228
      sullivan authored
              WebKit support for computing but not highlighting rects for text matches.
      
              * WebView/WebHTMLViewPrivate.h:
              added markedTextMatchesAreHighlighted/setMarkedTextMatchesAreHighlighted and
              rectsForTextMatches, and renamed related methods for clarity/consistency
              * WebView/WebHTMLView.m:
              (-[WebHTMLView markAllMatchesForText:caseSensitive:]):
              renamed, calls similarly-renamed method
              (-[WebHTMLView setMarkedTextMatchesAreHighlighted:]):
              new method, calls through to bridge
              (-[WebHTMLView markedTextMatchesAreHighlighted]):
              ditto
              (-[WebHTMLView unmarkAllTextMatches]):
              renamed
              (-[WebHTMLView rectsForTextMatches]):
              new method, calls through to bridge
      
              * WebView/WebViewPrivate.h:
              added rectsForTextMatches, renamed other methods (and added highlight: parameter)
              * WebView/WebView.m:
              (-[WebView markAllMatchesForText:caseSensitive:highlight:]):
              renamed for clarity/consistency, and now has highlight: parameter, which is passed down
              (-[WebView unmarkAllTextMatches]):
              renamed for clarity/consistency, and calls similarly-renamed method lower down. diff got
              confused with the end of this and the end of the next method.
              (-[WebView rectsForTextMatches]):
              new method, calls through to WebHTMLView as related methods currently do
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14806 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      94a64228
    • sullivan's avatar
      Reviewed by Tim Omernick and Dave Hyatt. · 6b99ea1e
      sullivan authored
              WebCore support for computing but not highlighting rects for text matches.
      
              * dom/Document.h:
              added setRenderedRectForMarker() and renderedRectsForMarkers(), and redefined
              MarkerMap to be a hashtable of node -> (pair of vectors), one vector of markers
              and one vector of rects
              
              * dom/Document.cpp:
              (placeholderRectForMarker()):
              new function, returns a recognizable degenerate rect used until a real rect has been set
              (WebCore::Document::addMarker):
              Reworked for new MarkerMap data structure; now adds parallel placeholder rect
              along with marker
              (WebCore::Document::copyMarkers):
              Reworked for new MarkerMap data structure
              (WebCore::Document::removeMarkers):
              Reworked for new MarkerMap data structure; now removed corresponding rect along
              with marker
              (WebCore::Document::markersForNode):
              Reworked for new MarkerMap data structure
              (WebCore::Document::renderedRectsForMarkers):
              New method, returns an array of all non-placeholder rects for the given marker type
              (WebCore::Document::repaintMarkers):
              Reworked for new MarkerMap data structure
              (WebCore::Document::setRenderedRectForMarker):
              New method, sets the rendered rect for a given marker
              (WebCore::Document::shiftMarkers):
              Reworked for new MarkerMap data structure; resets rendered rects to placeholders.
              
              * rendering/InlineTextBox.cpp:
              (WebCore::InlineTextBox::paint):
              removed markedTextMatchesAreHighlighted guard; we always want to call paintTextMatchMarker
              now, but sometimes we will end up only computing the rect, not actually highlighting it.
              (Maybe some names should be improved here?)
              (WebCore::InlineTextBox::paintTextMatchMarker):
              Reorganized to move all the code that actually draws into a block that's guarded by
              markedTextMatchesAreHighlighted. The rest of the code computes where the highlight will
              go, and now we always use that computation in order to call setRenderedRectForMarker.
      
              * bridge/mac/WebCoreFrameBridge.h:
              * bridge/mac/WebCoreFrameBridge.mm:
              (-[WebCoreFrameBridge rectsForTextMatches]):
              New method, returns an array of NSValues representing NSRects. Gets them
              from Document::renderedRectsForMarkers
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14805 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      6b99ea1e
    • sullivan's avatar
      <http://bugzilla.opendarwin.org/show_bug.cgi?id=9384> · f99d1e82
      sullivan authored
              WebView's initWithCoder: method does not set useBackForwardList
              correctly
              
              Reviewed by John Sullivan.
      
              * WebView/WebView.m:
              (-[WebView initWithCoder:]):
              Make sure that the function variable useBackForwardList is correctly
              set, so that the copy in the _private ivar is set.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14804 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      f99d1e82
    • ap's avatar
      2006-06-10 Mitz Pettel <opendarwin.org@mitzpettel.com> · 41a51b71
      ap authored
              Reviewed and landed by ap.
      
              - make DumpRenderTree build
      
              * DumpRenderTree/DumpRenderTree.m:
              (-[WaitUntilDoneDelegate webView:didCommitLoadForFrame:]): Changed _updateFocusState to _updateActiveState
              (-[WaitUntilDoneDelegate webViewFocus:]): Ditto.
              (-[LayoutTestController setWindowIsKey:]): Ditto.
              (-[LayoutTestController setMainFrameIsFirstResponder:]): Ditto.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14803 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      41a51b71
    • andersca's avatar
      2006-06-10 Anders Carlsson <acarlsson@apple.com> · b38a866a
      andersca authored
              Reviewed by Eric.
      
              * bindings/js/kjs_html.cpp:
              (KJS::JSHTMLElement::put):
              Call WebCore::JSHTMLElement::put so that autogenerated setters will work 
              for HTMLElement.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14802 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      b38a866a
  4. 09 Jun, 2006 15 commits
    • ggaren's avatar
      Build fix -- I think :). · 553fa5fb
      ggaren authored
              * JavaScriptCore.xcodeproj/project.pbxproj:
              * kjs/context.h:
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14801 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      553fa5fb
    • ggaren's avatar
      - Build fix after last JSC check-in (oops!) · 8d298bb2
      ggaren authored
              
              * bridge/mac/WebCoreScriptDebugger.mm:
              (-[WebCoreScriptCallFrame scopeChain]):
              (-[WebCoreScriptCallFrame functionName]):
              (-[WebCoreScriptCallFrame evaluateWebScript:]):
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14800 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      8d298bb2
    • ggaren's avatar
      Reviewed by Eric (yay!). · fd7c1022
      ggaren authored
              
              - Removed Context wrapper for ContextImp, renamed ContextImp to Context,
              split Context into its own file -- Context.cpp -- renamed _var to m_var,
              change ' *' to '* '.
      
              * JavaScriptCore.xcodeproj/project.pbxproj:
              * kjs/Context.cpp: Added.
              (KJS::Context::Context):
              (KJS::Context::~Context):
              (KJS::Context::mark):
              * kjs/context.h:
              (KJS::Context::scopeChain):
              (KJS::Context::variableObject):
              (KJS::Context::setVariableObject):
              (KJS::Context::thisValue):
              (KJS::Context::callingContext):
              (KJS::Context::activationObject):
              (KJS::Context::currentBody):
              (KJS::Context::function):
              (KJS::Context::arguments):
              (KJS::Context::pushScope):
              (KJS::Context::seenLabels):
              * kjs/function.cpp:
              (KJS::FunctionImp::callAsFunction):
              (KJS::FunctionImp::processParameters):
              (KJS::FunctionImp::argumentsGetter):
              (KJS::GlobalFuncImp::callAsFunction):
              * kjs/internal.cpp:
              (KJS::InterpreterImp::evaluate):
              * kjs/internal.h:
              (KJS::InterpreterImp::setContext):
              (KJS::InterpreterImp::context):
              * kjs/interpreter.cpp:
              * kjs/interpreter.h:
              (KJS::ExecState::context):
              (KJS::ExecState::ExecState):
              * kjs/nodes.cpp:
              (currentSourceId):
              (currentSourceURL):
              (ThisNode::evaluate):
              (ResolveNode::evaluate):
              (FunctionCallResolveNode::evaluate):
              (PostfixResolveNode::evaluate):
              (DeleteResolveNode::evaluate):
              (TypeOfResolveNode::evaluate):
              (PrefixResolveNode::evaluate):
              (AssignResolveNode::evaluate):
              (VarDeclNode::evaluate):
              (VarDeclNode::processVarDecls):
              (DoWhileNode::execute):
              (WhileNode::execute):
              (ForNode::execute):
              (ForInNode::execute):
              (ContinueNode::execute):
              (BreakNode::execute):
              (ReturnNode::execute):
              (WithNode::execute):
              (SwitchNode::execute):
              (LabelNode::execute):
              (TryNode::execute):
              (FuncDeclNode::processFuncDecl):
              (FuncExprNode::evaluate):
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14799 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      fd7c1022
    • justing's avatar
      · 5b8ad11c
      justing authored
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14798 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      5b8ad11c
    • hyatt's avatar
      Fix win32 build bustage. · be77b9dd
      hyatt authored
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14795 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      be77b9dd
    • hyatt's avatar
      Rename updateFocusState to updateActiveState. · 99e2a4e4
      hyatt authored
              * WebView/WebHTMLView.m:
              (-[WebHTMLView _updateActiveState]):
              (-[NSArray viewDidMoveToWindow]):
              (-[NSArray windowDidBecomeKey:]):
              (-[NSArray windowDidResignKey:]):
              (-[NSArray becomeFirstResponder]):
              (-[NSArray resignFirstResponder]):
              (-[WebHTMLView _formControlIsBecomingFirstResponder:]):
              (-[WebHTMLView _formControlIsResigningFirstResponder:]):
              * WebView/WebHTMLViewPrivate.h:
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14794 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      99e2a4e4
    • hyatt's avatar
      Rename m_isFocused on the frame to m_isActive, since it isn't really · df52ae62
      hyatt authored
              about focus but is instead about whether or not the top-level window is
              active.
      
              Pull code that was incorrectly factored into Mac-only code out of FrameMac
              and back up into Frame.
      
              Reviewed by andersca
      
              * bridge/mac/FrameMac.h:
              * bridge/mac/FrameMac.mm:
              * page/Frame.cpp:
              (WebCore::Frame::setFocusNodeIfNeeded):
              (WebCore::Frame::isActive):
              (WebCore::Frame::setIsActive):
              * page/FramePrivate.h:
              (WebCore::FramePrivate::FramePrivate):
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14791 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      df52ae62
    • hyatt's avatar
      Fix Win32 build bustage. · 90ffc77d
      hyatt authored
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14790 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      90ffc77d
    • thatcher's avatar
      Removes some control characters that snuck in. · 5903fe6c
      thatcher authored
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14785 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      5903fe6c
    • hyatt's avatar
      WebCore: · 76a0c024
      hyatt authored
              Rework selection coloring.  Rename displaysWithFocusAttributes
              to isActive.  Move the white-blending code onto the Color API to make
              it more convenient to mutate colors for selection blending.  Eliminate all
              the selection state from the GraphicsContext and move it to the RenderTheme.
              Implement both Win32 and Mac theme selection colors.
      
              Reviewed by sfalken
      
              * bridge/mac/FrameMac.h:
              * bridge/mac/FrameMac.mm:
              (WebCore::FrameMac::setIsActive):
              * bridge/mac/WebCoreFrameBridge.h:
              * bridge/mac/WebCoreFrameBridge.mm:
              (-[WebCoreFrameBridge drawRect:]):
              (-[WebCoreFrameBridge setIsActive:]):
              (-[WebCoreFrameBridge selectionColor]):
              * css/cssstyleselector.cpp:
              (WebCore::CSSStyleSelector::checkOneSelector):
              * page/Frame.cpp:
              (WebCore::Frame::isActive):
              (WebCore::Frame::setIsActive):
              * page/Frame.h:
              * platform/Color.cpp:
              (WebCore::blend):
              (WebCore::Color::blendWithWhite):
              * platform/Color.h:
              (WebCore::Color::hasAlpha):
              * platform/GraphicsContext.cpp:
              (WebCore::GraphicsContextPrivate::GraphicsContextPrivate):
              * platform/GraphicsContext.h:
              * platform/mac/GraphicsContextMac.mm:
              * platform/win/TemporaryLinkStubs.cpp:
              (GraphicsContext::endTransparencyLayer):
              * rendering/InlineTextBox.cpp:
              (WebCore::InlineTextBox::paintSelection):
              * rendering/RenderBlock.cpp:
              (WebCore::RenderBlock::fillHorizontalSelectionGap):
              (WebCore::RenderBlock::fillVerticalSelectionGap):
              (WebCore::RenderBlock::fillLeftSelectionGap):
              (WebCore::RenderBlock::fillRightSelectionGap):
              * rendering/RenderHTMLCanvas.cpp:
              (WebCore::RenderHTMLCanvas::paint):
              * rendering/RenderImage.cpp:
              (WebCore::RenderImage::paint):
              * rendering/RenderListMarker.cpp:
              (WebCore::RenderListMarker::paint):
              * rendering/RenderListMarker.h:
              * rendering/RenderObject.cpp:
              (WebCore::RenderObject::selectionColor):
              * rendering/RenderObject.h:
              * rendering/RenderReplaced.cpp:
              * rendering/RenderReplaced.h:
              * rendering/RenderTheme.cpp:
              (WebCore::RenderTheme::activeSelectionColor):
              (WebCore::RenderTheme::inactiveSelectionColor):
              (WebCore::RenderTheme::platformActiveSelectionColor):
              (WebCore::RenderTheme::platformInactiveSelectionColor):
              * rendering/RenderTheme.h:
              * rendering/RenderThemeMac.h:
              * rendering/RenderThemeMac.mm:
              (WebCore::RenderThemeMac::platformActiveSelectionColor):
              (WebCore::RenderThemeMac::platformInactiveSelectionColor):
              * rendering/RenderThemeWin.cpp:
              (WebCore::RenderThemeWin::platformActiveSelectionColor):
              (WebCore::RenderThemeWin::platformInactiveSelectionColor):
              * rendering/RenderThemeWin.h:
              * rendering/RenderWidget.cpp:
              (WebCore::RenderWidget::paint):
      
      WebKit:
      
              Rename displaysWithFocusAttributes to isActive.
      
              Reviewed by sfalken
      
              * WebKit.xcodeproj/project.pbxproj:
              * WebView/WebHTMLView.m:
              (-[WebHTMLView _updateFocusState]):
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14784 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      76a0c024
    • justing's avatar
      LayoutTests: · 7c9568d1
      justing authored
              Reviewed by levi
              
              <rdar://problem/4549980>
              REGRESSION: "Find Again" can get stuck when searching for string with a trailing space
      
              * editing/execCommand/findString-expected.checksum: Added.
              * editing/execCommand/findString-expected.png: Added.
              * editing/execCommand/findString-expected.txt: Added.
              * editing/execCommand/findString.html: Added.
      
      WebCore:
      
              Reviewed by levi
              
              <rdar://problem/4549980>
              REGRESSION: "Find Again" can get stuck when searching for string with a trailing space
      
              * bridge/mac/FrameMac.h: Moved findString to Frame.
              * bridge/mac/FrameMac.mm: Ditto.
              * bridge/mac/WebCoreFrameBridge.mm:
              (-[WebCoreFrameBridge searchFor:direction:caseSensitive:wrap:]): 
              Convert the NSString to a String.
              * editing/JSEditor.cpp: Added execCommand(FindString, ...)
              * editing/Selection.cpp: Added a constructor for Ranges
              (WebCore::Selection::Selection): 
              * editing/Selection.h:
              * page/Frame.cpp:
              (WebCore::Frame::findString): Moved from FrameMac.  Compare a selection created 
              using the found range with the current selection in case the current selection is
              the found range minus some collapsed whitespace on the edges.
              * page/Frame.h:
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14782 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      7c9568d1
    • ggaren's avatar
      Reviewed by Darin, landed by Geoff. · c88fb512
      ggaren authored
              http://bugzilla.opendarwin.org/show_bug.cgi?id=9350
              Use pathcmp() when sorting paths in svn-create-patch
      
              * Scripts/run-webkit-tests: Fixed splitpath() to use File::Basename subroutines instead of regex.
              * Scripts/svn-create-patch: Copied numericcmp(), pathcmp() and splitpath() from run-webkit-tests.
              Changed sort() functions to use pathcmp().  Added subroutine prototypes.  Added -h command-line
              switch and printUsage() subroutine.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14781 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      c88fb512
    • sfalken's avatar
      2006-06-09 Steve Falkenburg <sfalken@apple.com> · 18ad2154
      sfalken authored
              Fix build break
      
              * WebCore.vcproj/WebCore/WebCore.vcproj:
              * css/MediaQueryEvaluator.cpp:
              * platform/win/TemporaryLinkStubs.cpp:
              (GraphicsContext::addRoundedRectClip):
              (GraphicsContext::addInnerRoundedRectClip):
              (WebCore::screenDepthPerComponent):
              (WebCore::screenIsMonochrome):
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14780 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      18ad2154
    • bdakin's avatar
      Reviewed by Hyatt. Tweaked by Maciej. Tweaks reviewed by Beth. · 1f63b91e
      bdakin authored
              Landed by Beth.
      
              CSS3 Media Queries implementation.
              <http://bugzilla.opendarwin.org/show_bug.cgi?id=4127>
      
              * WebCore.xcodeproj/project.pbxproj:
              * bindings/js/kjs_css.cpp:
              (KJS::DOMMediaList::put):
              (KJS::KJS::DOMMediaListProtoFunc::callAsFunction):
              * bindings/objc/DOMCSS.mm:
              (-[DOMMediaList setMediaText:]):
              (-[DOMMediaList deleteMedium:]):
              (-[DOMMediaList appendMedium:]):
              * css/CSSGrammar.y:
              * css/MediaFeatureNames.cpp: Added.
              (WebCore::MediaFeatureNames::init):
              * css/MediaFeatureNames.h: Added.
              * css/MediaList.cpp:
              (WebCore::MediaList::MediaList):
              (WebCore::MediaList::~MediaList):
              (WebCore::parseMediaDescriptor):
              (WebCore::MediaList::deleteMedium):
              (WebCore::MediaList::mediaText):
              (WebCore::MediaList::setMediaText):
              (WebCore::MediaList::item):
              (WebCore::MediaList::appendMedium):
              (WebCore::MediaList::appendMediaQuery):
              * css/MediaList.h:
              (WebCore::MediaList::MediaList):
              (WebCore::MediaList::length):
              (WebCore::MediaList::mediaQueries):
              * css/MediaQuery.cpp: Added.
              (WebCore::MediaQuery::MediaQuery):
              (WebCore::MediaQuery::~MediaQuery):
              (WebCore::MediaQuery::operator==):
              (WebCore::MediaQuery::cssText):
              * css/MediaQuery.h: Added.
              (WebCore::MediaQuery::):
              (WebCore::MediaQuery::restrictor):
              (WebCore::MediaQuery::expressions):
              (WebCore::MediaQuery::mediaType):
              (WebCore::MediaQuery::append):
              * css/MediaQueryEvaluator.cpp: Added.
              (WebCore::):
              (WebCore::MediaQueryEvaluator):
              (WebCore::MediaQueryEvaluator::~MediaQueryEvaluator):
              (WebCore::MediaQueryEvaluator::mediaTypeMatch):
              (WebCore::applyRestrictor):
              (WebCore::MediaQueryEvaluator::eval):
              (WebCore::parseAspectRatio):
              (WebCore::cmpvalue):
              (WebCore::numberValue):
              (WebCore::colorMediaFeatureEval):
              (WebCore::monochromeMediaFeatureEval):
              (WebCore::device_aspect_ratioMediaFeatureEval):
              (WebCore::gridMediaFeatureEval):
              (WebCore::device_heightMediaFeatureEval):
              (WebCore::device_widthMediaFeatureEval):
              (WebCore::heightMediaFeatureEval):
              (WebCore::widthMediaFeatureEval):
              (WebCore::min_colorMediaFeatureEval):
              (WebCore::max_colorMediaFeatureEval):
              (WebCore::min_monochromeMediaFeatureEval):
              (WebCore::max_monochromeMediaFeatureEval):
              (WebCore::min_device_aspect_ratioMediaFeatureEval):
              (WebCore::max_device_aspect_ratioMediaFeatureEval):
              (WebCore::min_heightMediaFeatureEval):
              (WebCore::max_heightMediaFeatureEval):
              (WebCore::min_widthMediaFeatureEval):
              (WebCore::max_widthMediaFeatureEval):
              (WebCore::min_device_heightMediaFeatureEval):
              (WebCore::max_device_heightMediaFeatureEval):
              (WebCore::min_device_widthMediaFeatureEval):
              (WebCore::max_device_widthMediaFeatureEval):
              (WebCore::createFunctionMap):
              * css/MediaQueryEvaluator.h: Added.
              * css/MediaQueryExp.cpp: Added.
              (WebCore::MediaQueryExp::MediaQueryExp):
              (WebCore::MediaQueryExp::~MediaQueryExp):
              * css/MediaQueryExp.h: Added.
              (WebCore::MediaQueryExp::mediaFeature):
              (WebCore::MediaQueryExp::value):
              (WebCore::MediaQueryExp::operator==):
              * css/StyleSheet.cpp:
              (WebCore::StyleSheet::setMedia):
              * css/cssparser.cpp:
              (WebCore::CSSParser::CSSParser):
              (WebCore::CSSParser::~CSSParser):
              (WebCore::CSSParser::setupParser):
              (WebCore::CSSParser::parseMediaQuery):
              (WebCore::CSSParser::createFloatingMediaQueryExp):
              (WebCore::CSSParser::sinkFloatingMediaQueryExp):
              (WebCore::CSSParser::createFloatingMediaQueryExpList):
              (WebCore::CSSParser::sinkFloatingMediaQueryExpList):
              (WebCore::CSSParser::createFloatingMediaQuery):
              (WebCore::CSSParser::sinkFloatingMediaQuery):
              * css/cssparser.h:
              * css/cssstyleselector.cpp:
              (WebCore::CSSStyleSelector::CSSStyleSelector):
              (WebCore::CSSStyleSelector::init):
              (WebCore::CSSStyleSelector::~CSSStyleSelector):
              (WebCore::CSSStyleSelector::loadDefaultStyle):
              (WebCore::CSSStyleSelector::matchUARules):
              (WebCore::CSSStyleSelector::styleForElement):
              (WebCore::CSSStyleSelector::pseudoStyleForElement):
              (WebCore::CSSStyleSelector::updateFont):
              (WebCore::CSSStyleSelector::cacheBorderAndBackground):
              (WebCore::CSSStyleSelector::styleRulesForElement):
              (WebCore::CSSRuleSet::addRulesFromSheet):
              * css/cssstyleselector.h:
              * css/maketokenizer:
              * css/tokenizer.flex:
              * dom/DOMImplementation.cpp:
              (WebCore::DOMImplementation::createCSSStyleSheet):
              * html/HTMLLinkElement.cpp:
              (WebCore::HTMLLinkElement::process):
              (WebCore::HTMLLinkElement::setStyleSheet):
              * html/HTMLStyleElement.cpp:
              (WebCore::HTMLStyleElement::childrenChanged):
              * ksvg2/svg/SVGDOMImplementation.cpp:
              (SVGDOMImplementation::createCSSStyleSheet):
              * ksvg2/svg/SVGStyleElement.cpp:
              (WebCore::SVGStyleElement::childrenChanged):
              * page/Frame.cpp:
              (WebCore::Frame::Frame):
              * platform/Screen.h:
              * platform/mac/ScreenMac.mm:
              (WebCore::screenDepthPerComponent):
              (WebCore::screenIsMonochrome):
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14779 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      1f63b91e
    • justing's avatar
      Tweaked ChangeLog · 24793c50
      justing authored
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14778 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      24793c50
  5. 08 Jun, 2006 1 commit
    • justing's avatar
      LayoutTests: · e6f80c1e
      justing authored
              Reviewed by levi
              
              <http://bugzilla.opendarwin.org/show_bug.cgi?id=4468>
              Implement execCommand(Insert{Un}OrderedList)
      
              Added:
              * editing/execCommand/create-list-from-range-selection-expected.checksum: Added.
              * editing/execCommand/create-list-from-range-selection-expected.png: Added.
              * editing/execCommand/create-list-from-range-selection-expected.txt: Added.
              * editing/execCommand/create-list-from-range-selection.html: Added.
              * editing/execCommand/insert-list-and-stitch-expected.checksum: Added.
              * editing/execCommand/insert-list-and-stitch-expected.png: Added.
              * editing/execCommand/insert-list-and-stitch-expected.txt: Added.
              * editing/execCommand/insert-list-and-stitch.html: Added.
              * editing/execCommand/insert-list-with-id-expected.checksum: Added.
              * editing/execCommand/insert-list-with-id-expected.png: Added.
              * editing/execCommand/insert-list-with-id-expected.txt: Added.
              * editing/execCommand/insert-list-with-id.html: Added.
              * editing/execCommand/remove-list-from-range-selection-expected.checksum: Added.
              * editing/execCommand/remove-list-from-range-selection-expected.png: Added.
              * editing/execCommand/remove-list-from-range-selection-expected.txt: Added.
              * editing/execCommand/remove-list-from-range-selection.html: Added.
              * editing/execCommand/remove-list-items-expected.checksum: Added.
              * editing/execCommand/remove-list-items-expected.png: Added.
              * editing/execCommand/remove-list-items-expected.txt: Added.
              * editing/execCommand/remove-list-items.html: Added.
              * editing/execCommand/switch-list-type-expected.checksum: Added.
              * editing/execCommand/switch-list-type-expected.png: Added.
              * editing/execCommand/switch-list-type-expected.txt: Added.
              * editing/execCommand/switch-list-type.html: Added.
              
              Fixes:
              * editing/pasteboard/drag-drop-modifies-page-expected.txt:
              * editing/pasteboard/paste-list-001-expected.txt:
              * editing/selection/drag-to-contenteditable-iframe-expected.checksum:
              * editing/selection/drag-to-contenteditable-iframe-expected.png:
              * editing/selection/drag-to-contenteditable-iframe-expected.txt:
              * editing/style/block-style-005-expected.txt:
              * fast/text/textIteratorNilRenderer-expected.checksum:
              * fast/text/textIteratorNilRenderer-expected.png:
              * fast/text/textIteratorNilRenderer-expected.txt:
              * editing/deleting/delete-line-016-expected.checksum:
              * editing/deleting/delete-line-016-expected.png:
              * editing/deleting/delete-line-016-expected.txt:
      
      WebCore:
      
              Reviewed by levi
              
              <http://bugzilla.opendarwin.org/show_bug.cgi?id=4468>
              Implement execCommand(Insert{Un}OrderedList)
      
              * WebCore.xcodeproj/project.pbxproj: Added InsertListCommand.{h,cpp} to the project.
              * dom/Position.cpp:
              (WebCore::hasRenderedNonAnonymousDescendantsWithHeight): 
              Added. A block with height is only a candidate if this is false.  This should fix the problems
              getting carets into empty blocks.
              (WebCore::Position::inRenderedContent):
              * editing/AppendNodeCommand.cpp:
              (WebCore::AppendNodeCommand::doApply):
              * editing/CompositeEditCommand.cpp:
              (WebCore::hasARenderedDescendant):
              (WebCore::CompositeEditCommand::prune): A node can have DOM descendants that are rendered, yet
              have no rendered descendants.  Fixed the pruning rule to avoid removing a node like this.
              (WebCore::CompositeEditCommand::mergeIdenticalElements): Put the two elements next to
              each other if they aren't already, as a convenience.
              (WebCore::CompositeEditCommand::moveParagraph): Added code to preserve the current selection.
              (WebCore::CompositeEditCommand::moveParagraphs): Ditto. 
              * editing/CompositeEditCommand.h:
              * editing/DeleteSelectionCommand.cpp:
              (WebCore::DeleteSelectionCommand::initializeStartEnd): Expansion for special elements should
              continue to happen until it is no longer possible.
              (WebCore::DeleteSelectionCommand::handleGeneralDelete): The code to adjust the start node
              wouldn't always avoid removing the start block.
              * editing/InsertListCommand.cpp: Added.
              (WebCore::InsertListCommand::fixOrphanedListChild): Puts a list item that isn't inside a list
              into a list.
              (WebCore::InsertListCommand::InsertListCommand):
              (WebCore::InsertListCommand::modifyRange):
              (WebCore::InsertListCommand::doApply):
              * editing/InsertListCommand.h: Added.
              (WebCore::InsertListCommand::):
              * editing/InsertNodeBeforeCommand.cpp:
              (WebCore::InsertNodeBeforeCommand::doApply):
              * editing/InsertParagraphSeparatorCommand.cpp:
              * editing/JSEditor.cpp:
              * editing/TextIterator.cpp:
              (WebCore::TextIterator::advance): Don't handle a node if the end of the range used to create the 
              iterator ends at the start of that node.
              used to create the iterator.
              * editing/VisiblePosition.cpp:
              (WebCore::VisiblePosition::next):
              (WebCore::VisiblePosition::previous):
              * editing/VisiblePosition.h: 
              Added a parameter to next/previous to prevent them from going outside the current editable region.
              * editing/htmlediting.cpp:
              (WebCore::highestAncestor):
              (WebCore::enclosingList):
              (WebCore::enclosingListChild):
              (WebCore::outermostEnclosingList):
              (WebCore::createListItemElement):
              * editing/htmlediting.h:
              * page/Frame.cpp:
              (WebCore::Frame::selectionListState): Added.
              * page/Frame.h:
      
      WebKit:
      
              Reviewed by levi
              
              <http://bugzilla.opendarwin.org/show_bug.cgi?id=4468>
              Implement execCommand(Insert{Un}OrderedList)
      
              * WebView/WebFrame.m:
              (-[WebFrame _findFrameWithSelection]): Removed an assertion
              that we only have one frame with a selection.  
              * WebView/WebView.m:
              (-[WebView selectedFrame]): Ditto.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14777 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      e6f80c1e