summaryrefslogtreecommitdiff
path: root/www/webkit-gtk
diff options
context:
space:
mode:
authordrochner <drochner>2011-06-09 11:00:00 +0000
committerdrochner <drochner>2011-06-09 11:00:00 +0000
commit856c0b33bfbd114ac88d4092c94dfdf5b1a330b6 (patch)
tree1333740283e6eb552e401e5b8fc12f9c892f1671 /www/webkit-gtk
parente3139e696fe2ec61926aa44d57f5d6ac2f11d477 (diff)
downloadpkgsrc-856c0b33bfbd114ac88d4092c94dfdf5b1a330b6.tar.gz
update to 1.4.1
this switches to the new stable branch (shlib major changed -> PKGREV bumps needed)
Diffstat (limited to 'www/webkit-gtk')
-rw-r--r--www/webkit-gtk/Makefile9
-rw-r--r--www/webkit-gtk/PLIST752
-rw-r--r--www/webkit-gtk/buildlink3.mk4
-rw-r--r--www/webkit-gtk/distinfo37
-rw-r--r--www/webkit-gtk/patches/patch-ab33
-rw-r--r--www/webkit-gtk/patches/patch-ad24
-rw-r--r--www/webkit-gtk/patches/patch-af24
-rw-r--r--www/webkit-gtk/patches/patch-ag17
-rw-r--r--www/webkit-gtk/patches/patch-ah16
-rw-r--r--www/webkit-gtk/patches/patch-ba22
-rw-r--r--www/webkit-gtk/patches/patch-bb13
-rw-r--r--www/webkit-gtk/patches/patch-bc19
-rw-r--r--www/webkit-gtk/patches/patch-bd15
-rw-r--r--www/webkit-gtk/patches/patch-ca22
-rw-r--r--www/webkit-gtk/patches/patch-cb32
-rw-r--r--www/webkit-gtk/patches/patch-cc24
-rw-r--r--www/webkit-gtk/patches/patch-cd23
-rw-r--r--www/webkit-gtk/patches/patch-ce12
-rw-r--r--www/webkit-gtk/patches/patch-cf16
-rw-r--r--www/webkit-gtk/patches/patch-cg67
-rw-r--r--www/webkit-gtk/patches/patch-ch23
-rw-r--r--www/webkit-gtk/patches/patch-ci15
-rw-r--r--www/webkit-gtk/patches/patch-cj13
-rw-r--r--www/webkit-gtk/patches/patch-ck25
-rw-r--r--www/webkit-gtk/patches/patch-cl14
-rw-r--r--www/webkit-gtk/patches/patch-cm12
-rw-r--r--www/webkit-gtk/patches/patch-cn16
-rw-r--r--www/webkit-gtk/patches/patch-co22
-rw-r--r--www/webkit-gtk/patches/patch-cp65
-rw-r--r--www/webkit-gtk/patches/patch-cq12
30 files changed, 514 insertions, 884 deletions
diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index a164740d7ce..a1556c5a6e4 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2011/04/22 13:42:34 obache Exp $
+# $NetBSD: Makefile,v 1.42 2011/06/09 11:00:00 drochner Exp $
-DISTNAME= webkit-1.2.7
+DISTNAME= webkit-1.4.1
PKGNAME= ${DISTNAME:S/webkit/webkit-gtk/}
-PKGREVISION= 4
CATEGORIES= www
MASTER_SITES= http://www.webkitgtk.org/
@@ -35,6 +34,10 @@ REPLACE_PERL+= JavaScriptCore/pcre/dftables \
WebCore/dom/*.pl \
WebCore/platform/text/mac/*.pl
+BUILDLINK_DEPMETHOD.python= build
+.include "../../lang/python/application.mk"
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
+
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/flex/buildlink3.mk"
.include "../../devel/gperf/buildlink3.mk"
diff --git a/www/webkit-gtk/PLIST b/www/webkit-gtk/PLIST
index 1f18c4547d3..76c1f2b2972 100644
--- a/www/webkit-gtk/PLIST
+++ b/www/webkit-gtk/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.13 2010/04/12 21:12:12 drochner Exp $
-bin/jsc
+@comment $NetBSD: PLIST,v 1.14 2011/06/09 11:00:00 drochner Exp $
+bin/jsc-1
include/webkit-1.0/JavaScriptCore/JSBase.h
include/webkit-1.0/JavaScriptCore/JSContextRef.h
include/webkit-1.0/JavaScriptCore/JSObjectRef.h
@@ -10,18 +10,156 @@ include/webkit-1.0/JavaScriptCore/JSValueRef.h
include/webkit-1.0/JavaScriptCore/JavaScript.h
include/webkit-1.0/JavaScriptCore/JavaScriptCore.h
include/webkit-1.0/JavaScriptCore/WebKitAvailability.h
+include/webkit-1.0/webkit/WebKitDOMAttr.h
+include/webkit-1.0/webkit/WebKitDOMBarInfo.h
+include/webkit-1.0/webkit/WebKitDOMBlob.h
+include/webkit-1.0/webkit/WebKitDOMCDATASection.h
+include/webkit-1.0/webkit/WebKitDOMCSSRule.h
+include/webkit-1.0/webkit/WebKitDOMCSSRuleList.h
+include/webkit-1.0/webkit/WebKitDOMCSSStyleDeclaration.h
+include/webkit-1.0/webkit/WebKitDOMCSSStyleSheet.h
+include/webkit-1.0/webkit/WebKitDOMCSSValue.h
+include/webkit-1.0/webkit/WebKitDOMCharacterData.h
+include/webkit-1.0/webkit/WebKitDOMComment.h
+include/webkit-1.0/webkit/WebKitDOMConsole.h
+include/webkit-1.0/webkit/WebKitDOMDOMApplicationCache.h
+include/webkit-1.0/webkit/WebKitDOMDOMImplementation.h
+include/webkit-1.0/webkit/WebKitDOMDOMMimeType.h
+include/webkit-1.0/webkit/WebKitDOMDOMMimeTypeArray.h
+include/webkit-1.0/webkit/WebKitDOMDOMPlugin.h
+include/webkit-1.0/webkit/WebKitDOMDOMPluginArray.h
+include/webkit-1.0/webkit/WebKitDOMDOMSelection.h
+include/webkit-1.0/webkit/WebKitDOMDOMSettableTokenList.h
+include/webkit-1.0/webkit/WebKitDOMDOMStringList.h
+include/webkit-1.0/webkit/WebKitDOMDOMStringMap.h
+include/webkit-1.0/webkit/WebKitDOMDOMTokenList.h
+include/webkit-1.0/webkit/WebKitDOMDOMWindow.h
+include/webkit-1.0/webkit/WebKitDOMDatabase.h
+include/webkit-1.0/webkit/WebKitDOMDocument.h
+include/webkit-1.0/webkit/WebKitDOMDocumentFragment.h
+include/webkit-1.0/webkit/WebKitDOMDocumentType.h
+include/webkit-1.0/webkit/WebKitDOMElement.h
+include/webkit-1.0/webkit/WebKitDOMEntityReference.h
+include/webkit-1.0/webkit/WebKitDOMEvent.h
+include/webkit-1.0/webkit/WebKitDOMEventTarget.h
+include/webkit-1.0/webkit/WebKitDOMFile.h
+include/webkit-1.0/webkit/WebKitDOMFileList.h
+include/webkit-1.0/webkit/WebKitDOMHTMLAnchorElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLAppletElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLAreaElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLAudioElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLBRElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLBaseElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLBaseFontElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLBlockquoteElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLBodyElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLButtonElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLCanvasElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLCollection.h
+include/webkit-1.0/webkit/WebKitDOMHTMLDListElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLDetailsElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLDirectoryElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLDivElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLDocument.h
+include/webkit-1.0/webkit/WebKitDOMHTMLElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLEmbedElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLFieldSetElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLFontElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLFormElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLFrameElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLFrameSetElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLHRElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLHeadElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLHeadingElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLHtmlElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLIFrameElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLImageElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLInputElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLIsIndexElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLKeygenElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLLIElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLLabelElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLLegendElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLLinkElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLMapElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLMarqueeElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLMediaElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLMenuElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLMetaElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLModElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLOListElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLObjectElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLOptGroupElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLOptionElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLOptionsCollection.h
+include/webkit-1.0/webkit/WebKitDOMHTMLParagraphElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLParamElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLPreElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLQuoteElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLScriptElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLSelectElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLStyleElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLTableCaptionElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLTableCellElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLTableColElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLTableElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLTableRowElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLTableSectionElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLTextAreaElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLTitleElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLUListElement.h
+include/webkit-1.0/webkit/WebKitDOMHTMLVideoElement.h
+include/webkit-1.0/webkit/WebKitDOMHistory.h
+include/webkit-1.0/webkit/WebKitDOMLocation.h
+include/webkit-1.0/webkit/WebKitDOMMediaError.h
+include/webkit-1.0/webkit/WebKitDOMMediaList.h
+include/webkit-1.0/webkit/WebKitDOMMediaQueryList.h
+include/webkit-1.0/webkit/WebKitDOMMemoryInfo.h
+include/webkit-1.0/webkit/WebKitDOMMessagePort.h
+include/webkit-1.0/webkit/WebKitDOMMouseEvent.h
+include/webkit-1.0/webkit/WebKitDOMNamedNodeMap.h
+include/webkit-1.0/webkit/WebKitDOMNavigator.h
+include/webkit-1.0/webkit/WebKitDOMNode.h
+include/webkit-1.0/webkit/WebKitDOMNodeFilter.h
+include/webkit-1.0/webkit/WebKitDOMNodeIterator.h
+include/webkit-1.0/webkit/WebKitDOMNodeList.h
+include/webkit-1.0/webkit/WebKitDOMObject.h
+include/webkit-1.0/webkit/WebKitDOMProcessingInstruction.h
+include/webkit-1.0/webkit/WebKitDOMRange.h
+include/webkit-1.0/webkit/WebKitDOMScreen.h
+include/webkit-1.0/webkit/WebKitDOMStorage.h
+include/webkit-1.0/webkit/WebKitDOMStyleMedia.h
+include/webkit-1.0/webkit/WebKitDOMStyleSheet.h
+include/webkit-1.0/webkit/WebKitDOMStyleSheetList.h
+include/webkit-1.0/webkit/WebKitDOMText.h
+include/webkit-1.0/webkit/WebKitDOMTimeRanges.h
+include/webkit-1.0/webkit/WebKitDOMTreeWalker.h
+include/webkit-1.0/webkit/WebKitDOMUIEvent.h
+include/webkit-1.0/webkit/WebKitDOMValidityState.h
+include/webkit-1.0/webkit/WebKitDOMWebKitAnimation.h
+include/webkit-1.0/webkit/WebKitDOMWebKitAnimationList.h
+include/webkit-1.0/webkit/WebKitDOMWebKitPoint.h
+include/webkit-1.0/webkit/WebKitDOMXPathExpression.h
+include/webkit-1.0/webkit/WebKitDOMXPathNSResolver.h
+include/webkit-1.0/webkit/WebKitDOMXPathResult.h
include/webkit-1.0/webkit/webkit.h
+include/webkit-1.0/webkit/webkitapplicationcache.h
include/webkit-1.0/webkit/webkitdefines.h
+include/webkit-1.0/webkit/webkitdom.h
+include/webkit-1.0/webkit/webkitdomdefines.h
include/webkit-1.0/webkit/webkitdownload.h
include/webkit-1.0/webkit/webkitenumtypes.h
include/webkit-1.0/webkit/webkiterror.h
include/webkit-1.0/webkit/webkitgeolocationpolicydecision.h
+include/webkit-1.0/webkit/webkitglobals.h
include/webkit-1.0/webkit/webkithittestresult.h
+include/webkit-1.0/webkit/webkiticondatabase.h
include/webkit-1.0/webkit/webkitnetworkrequest.h
include/webkit-1.0/webkit/webkitnetworkresponse.h
include/webkit-1.0/webkit/webkitsecurityorigin.h
include/webkit-1.0/webkit/webkitsoupauthdialog.h
include/webkit-1.0/webkit/webkitversion.h
+include/webkit-1.0/webkit/webkitviewportattributes.h
include/webkit-1.0/webkit/webkitwebbackforwardlist.h
include/webkit-1.0/webkit/webkitwebdatabase.h
include/webkit-1.0/webkit/webkitwebdatasource.h
@@ -29,289 +167,341 @@ include/webkit-1.0/webkit/webkitwebframe.h
include/webkit-1.0/webkit/webkitwebhistoryitem.h
include/webkit-1.0/webkit/webkitwebinspector.h
include/webkit-1.0/webkit/webkitwebnavigationaction.h
+include/webkit-1.0/webkit/webkitwebplugin.h
+include/webkit-1.0/webkit/webkitwebplugindatabase.h
include/webkit-1.0/webkit/webkitwebpolicydecision.h
include/webkit-1.0/webkit/webkitwebresource.h
include/webkit-1.0/webkit/webkitwebsettings.h
include/webkit-1.0/webkit/webkitwebview.h
include/webkit-1.0/webkit/webkitwebwindowfeatures.h
-lib/libwebkit-1.0.la
+lib/libwebkitgtk-1.0.la
lib/pkgconfig/webkit-1.0.pc
-share/locale/cs/LC_MESSAGES/webkit.mo
-share/locale/de/LC_MESSAGES/webkit.mo
-share/locale/en_GB/LC_MESSAGES/webkit.mo
-share/locale/es/LC_MESSAGES/webkit.mo
-share/locale/et/LC_MESSAGES/webkit.mo
-share/locale/gu/LC_MESSAGES/webkit.mo
-share/locale/he/LC_MESSAGES/webkit.mo
-share/locale/it/LC_MESSAGES/webkit.mo
-share/locale/lt/LC_MESSAGES/webkit.mo
-share/locale/lv/LC_MESSAGES/webkit.mo
-share/locale/nl/LC_MESSAGES/webkit.mo
-share/locale/pa/LC_MESSAGES/webkit.mo
-share/locale/pt/LC_MESSAGES/webkit.mo
-share/locale/pt_BR/LC_MESSAGES/webkit.mo
-share/locale/ru/LC_MESSAGES/webkit.mo
-share/locale/sl/LC_MESSAGES/webkit.mo
-share/locale/sr/LC_MESSAGES/webkit.mo
-share/locale/sr@latin/LC_MESSAGES/webkit.mo
-share/locale/sv/LC_MESSAGES/webkit.mo
-share/locale/uk/LC_MESSAGES/webkit.mo
-share/locale/vi/LC_MESSAGES/webkit.mo
-share/locale/zh_CN/LC_MESSAGES/webkit.mo
-share/webkit-1.0/images/deleteButton.png
-share/webkit-1.0/images/missingImage.png
-share/webkit-1.0/images/nullPlugin.png
-share/webkit-1.0/images/panIcon.png
-share/webkit-1.0/images/textAreaResizeCorner.png
-share/webkit-1.0/images/urlIcon.png
+share/locale/ar/LC_MESSAGES/webkit-2.0.mo
+share/locale/bg/LC_MESSAGES/webkit-2.0.mo
+share/locale/cs/LC_MESSAGES/webkit-2.0.mo
+share/locale/de/LC_MESSAGES/webkit-2.0.mo
+share/locale/en_GB/LC_MESSAGES/webkit-2.0.mo
+share/locale/es/LC_MESSAGES/webkit-2.0.mo
+share/locale/et/LC_MESSAGES/webkit-2.0.mo
+share/locale/eu/LC_MESSAGES/webkit-2.0.mo
+share/locale/fr/LC_MESSAGES/webkit-2.0.mo
+share/locale/gl/LC_MESSAGES/webkit-2.0.mo
+share/locale/gr/LC_MESSAGES/webkit-2.0.mo
+share/locale/gu/LC_MESSAGES/webkit-2.0.mo
+share/locale/he/LC_MESSAGES/webkit-2.0.mo
+share/locale/hu/LC_MESSAGES/webkit-2.0.mo
+share/locale/id/LC_MESSAGES/webkit-2.0.mo
+share/locale/it/LC_MESSAGES/webkit-2.0.mo
+share/locale/ko/LC_MESSAGES/webkit-2.0.mo
+share/locale/lt/LC_MESSAGES/webkit-2.0.mo
+share/locale/lv/LC_MESSAGES/webkit-2.0.mo
+share/locale/nb/LC_MESSAGES/webkit-2.0.mo
+share/locale/nl/LC_MESSAGES/webkit-2.0.mo
+share/locale/pa/LC_MESSAGES/webkit-2.0.mo
+share/locale/pl/LC_MESSAGES/webkit-2.0.mo
+share/locale/pt/LC_MESSAGES/webkit-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/webkit-2.0.mo
+share/locale/ru/LC_MESSAGES/webkit-2.0.mo
+share/locale/sl/LC_MESSAGES/webkit-2.0.mo
+share/locale/sr/LC_MESSAGES/webkit-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/webkit-2.0.mo
+share/locale/sv/LC_MESSAGES/webkit-2.0.mo
+share/locale/uk/LC_MESSAGES/webkit-2.0.mo
+share/locale/vi/LC_MESSAGES/webkit-2.0.mo
+share/locale/zh_CN/LC_MESSAGES/webkit-2.0.mo
share/webkit-1.0/resources/error.html
-share/webkit-1.0/webinspector/AbstractTimelinePanel.js
-share/webkit-1.0/webinspector/AuditCategories.js
-share/webkit-1.0/webinspector/AuditLauncherView.js
-share/webkit-1.0/webinspector/AuditResultView.js
-share/webkit-1.0/webinspector/AuditRules.js
-share/webkit-1.0/webinspector/AuditsPanel.js
-share/webkit-1.0/webinspector/BottomUpProfileDataGridTree.js
-share/webkit-1.0/webinspector/Breakpoint.js
-share/webkit-1.0/webinspector/BreakpointsSidebarPane.js
-share/webkit-1.0/webinspector/CallStackSidebarPane.js
-share/webkit-1.0/webinspector/Callback.js
-share/webkit-1.0/webinspector/ChangesView.js
-share/webkit-1.0/webinspector/Checkbox.js
-share/webkit-1.0/webinspector/Color.js
-share/webkit-1.0/webinspector/ConsolePanel.js
-share/webkit-1.0/webinspector/ConsoleView.js
-share/webkit-1.0/webinspector/ContextMenu.js
-share/webkit-1.0/webinspector/CookieItemsView.js
-share/webkit-1.0/webinspector/DOMAgent.js
-share/webkit-1.0/webinspector/DOMStorage.js
-share/webkit-1.0/webinspector/DOMStorageItemsView.js
-share/webkit-1.0/webinspector/DOMSyntaxHighlighter.js
-share/webkit-1.0/webinspector/DataGrid.js
-share/webkit-1.0/webinspector/Database.js
-share/webkit-1.0/webinspector/DatabaseQueryView.js
-share/webkit-1.0/webinspector/DatabaseTableView.js
-share/webkit-1.0/webinspector/Drawer.js
-share/webkit-1.0/webinspector/ElementsPanel.js
-share/webkit-1.0/webinspector/ElementsTreeOutline.js
-share/webkit-1.0/webinspector/EventListenersSidebarPane.js
-share/webkit-1.0/webinspector/FontView.js
-share/webkit-1.0/webinspector/ImageView.js
-share/webkit-1.0/webinspector/Images/auditsIcon.png
-share/webkit-1.0/webinspector/Images/back.png
-share/webkit-1.0/webinspector/Images/breakpointBorder.png
-share/webkit-1.0/webinspector/Images/breakpointConditionalBorder.png
-share/webkit-1.0/webinspector/Images/breakpointConditionalCounterBorder.png
-share/webkit-1.0/webinspector/Images/breakpointCounterBorder.png
-share/webkit-1.0/webinspector/Images/breakpointsActivateButtonGlyph.png
-share/webkit-1.0/webinspector/Images/breakpointsDeactivateButtonGlyph.png
-share/webkit-1.0/webinspector/Images/checker.png
-share/webkit-1.0/webinspector/Images/clearConsoleButtonGlyph.png
-share/webkit-1.0/webinspector/Images/closeButtons.png
-share/webkit-1.0/webinspector/Images/consoleButtonGlyph.png
-share/webkit-1.0/webinspector/Images/consoleIcon.png
-share/webkit-1.0/webinspector/Images/cookie.png
-share/webkit-1.0/webinspector/Images/database.png
-share/webkit-1.0/webinspector/Images/databaseTable.png
-share/webkit-1.0/webinspector/Images/debuggerContinue.png
-share/webkit-1.0/webinspector/Images/debuggerPause.png
-share/webkit-1.0/webinspector/Images/debuggerStepInto.png
-share/webkit-1.0/webinspector/Images/debuggerStepOut.png
-share/webkit-1.0/webinspector/Images/debuggerStepOver.png
-share/webkit-1.0/webinspector/Images/disclosureTriangleSmallDown.png
-share/webkit-1.0/webinspector/Images/disclosureTriangleSmallDownBlack.png
-share/webkit-1.0/webinspector/Images/disclosureTriangleSmallDownWhite.png
-share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRight.png
-share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightBlack.png
-share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightDown.png
-share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightDownBlack.png
-share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightDownWhite.png
-share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightWhite.png
-share/webkit-1.0/webinspector/Images/dockButtonGlyph.png
-share/webkit-1.0/webinspector/Images/elementsIcon.png
-share/webkit-1.0/webinspector/Images/enableOutlineButtonGlyph.png
-share/webkit-1.0/webinspector/Images/enableSolidButtonGlyph.png
-share/webkit-1.0/webinspector/Images/errorIcon.png
-share/webkit-1.0/webinspector/Images/errorMediumIcon.png
-share/webkit-1.0/webinspector/Images/errorRedDot.png
-share/webkit-1.0/webinspector/Images/excludeButtonGlyph.png
-share/webkit-1.0/webinspector/Images/focusButtonGlyph.png
-share/webkit-1.0/webinspector/Images/forward.png
-share/webkit-1.0/webinspector/Images/gearButtonGlyph.png
-share/webkit-1.0/webinspector/Images/glossyHeader.png
-share/webkit-1.0/webinspector/Images/glossyHeaderPressed.png
-share/webkit-1.0/webinspector/Images/glossyHeaderSelected.png
-share/webkit-1.0/webinspector/Images/glossyHeaderSelectedPressed.png
-share/webkit-1.0/webinspector/Images/goArrow.png
-share/webkit-1.0/webinspector/Images/graphLabelCalloutLeft.png
-share/webkit-1.0/webinspector/Images/graphLabelCalloutRight.png
-share/webkit-1.0/webinspector/Images/grayConnectorPoint.png
-share/webkit-1.0/webinspector/Images/largerResourcesButtonGlyph.png
-share/webkit-1.0/webinspector/Images/localStorage.png
-share/webkit-1.0/webinspector/Images/nodeSearchButtonGlyph.png
-share/webkit-1.0/webinspector/Images/paneBottomGrow.png
-share/webkit-1.0/webinspector/Images/paneBottomGrowActive.png
-share/webkit-1.0/webinspector/Images/paneGrowHandleLine.png
-share/webkit-1.0/webinspector/Images/paneSettingsButtons.png
-share/webkit-1.0/webinspector/Images/pauseOnExceptionButtonGlyph.png
-share/webkit-1.0/webinspector/Images/percentButtonGlyph.png
-share/webkit-1.0/webinspector/Images/popoverArrows.png
-share/webkit-1.0/webinspector/Images/popoverBackground.png
-share/webkit-1.0/webinspector/Images/profileGroupIcon.png
-share/webkit-1.0/webinspector/Images/profileIcon.png
-share/webkit-1.0/webinspector/Images/profileSmallIcon.png
-share/webkit-1.0/webinspector/Images/profilesIcon.png
-share/webkit-1.0/webinspector/Images/profilesSilhouette.png
-share/webkit-1.0/webinspector/Images/programCounterBorder.png
-share/webkit-1.0/webinspector/Images/radioDot.png
-share/webkit-1.0/webinspector/Images/recordButtonGlyph.png
-share/webkit-1.0/webinspector/Images/recordToggledButtonGlyph.png
-share/webkit-1.0/webinspector/Images/reloadButtonGlyph.png
-share/webkit-1.0/webinspector/Images/resourceCSSIcon.png
-share/webkit-1.0/webinspector/Images/resourceDocumentIcon.png
-share/webkit-1.0/webinspector/Images/resourceDocumentIconSmall.png
-share/webkit-1.0/webinspector/Images/resourceJSIcon.png
-share/webkit-1.0/webinspector/Images/resourcePlainIcon.png
-share/webkit-1.0/webinspector/Images/resourcePlainIconSmall.png
-share/webkit-1.0/webinspector/Images/resourcesIcon.png
-share/webkit-1.0/webinspector/Images/resourcesSilhouette.png
-share/webkit-1.0/webinspector/Images/resourcesSizeGraphIcon.png
-share/webkit-1.0/webinspector/Images/resourcesTimeGraphIcon.png
-share/webkit-1.0/webinspector/Images/scriptsIcon.png
-share/webkit-1.0/webinspector/Images/scriptsSilhouette.png
-share/webkit-1.0/webinspector/Images/searchSmallBlue.png
-share/webkit-1.0/webinspector/Images/searchSmallBrightBlue.png
-share/webkit-1.0/webinspector/Images/searchSmallGray.png
-share/webkit-1.0/webinspector/Images/searchSmallWhite.png
-share/webkit-1.0/webinspector/Images/segment.png
-share/webkit-1.0/webinspector/Images/segmentEnd.png
-share/webkit-1.0/webinspector/Images/segmentHover.png
-share/webkit-1.0/webinspector/Images/segmentHoverEnd.png
-share/webkit-1.0/webinspector/Images/segmentSelected.png
-share/webkit-1.0/webinspector/Images/segmentSelectedEnd.png
-share/webkit-1.0/webinspector/Images/sessionStorage.png
-share/webkit-1.0/webinspector/Images/spinner.gif
-share/webkit-1.0/webinspector/Images/splitviewDimple.png
-share/webkit-1.0/webinspector/Images/splitviewDividerBackground.png
-share/webkit-1.0/webinspector/Images/statusbarBackground.png
-share/webkit-1.0/webinspector/Images/statusbarBottomBackground.png
-share/webkit-1.0/webinspector/Images/statusbarButtons.png
-share/webkit-1.0/webinspector/Images/statusbarMenuButton.png
-share/webkit-1.0/webinspector/Images/statusbarMenuButtonSelected.png
-share/webkit-1.0/webinspector/Images/statusbarResizerHorizontal.png
-share/webkit-1.0/webinspector/Images/statusbarResizerVertical.png
-share/webkit-1.0/webinspector/Images/storageIcon.png
-share/webkit-1.0/webinspector/Images/successGreenDot.png
-share/webkit-1.0/webinspector/Images/thumbActiveHoriz.png
-share/webkit-1.0/webinspector/Images/thumbActiveVert.png
-share/webkit-1.0/webinspector/Images/thumbHoriz.png
-share/webkit-1.0/webinspector/Images/thumbHoverHoriz.png
-share/webkit-1.0/webinspector/Images/thumbHoverVert.png
-share/webkit-1.0/webinspector/Images/thumbVert.png
-share/webkit-1.0/webinspector/Images/timelineBarBlue.png
-share/webkit-1.0/webinspector/Images/timelineBarGray.png
-share/webkit-1.0/webinspector/Images/timelineBarGreen.png
-share/webkit-1.0/webinspector/Images/timelineBarOrange.png
-share/webkit-1.0/webinspector/Images/timelineBarPurple.png
-share/webkit-1.0/webinspector/Images/timelineBarRed.png
-share/webkit-1.0/webinspector/Images/timelineBarYellow.png
-share/webkit-1.0/webinspector/Images/timelineCheckmarks.png
-share/webkit-1.0/webinspector/Images/timelineDots.png
-share/webkit-1.0/webinspector/Images/timelineHollowPillBlue.png
-share/webkit-1.0/webinspector/Images/timelineHollowPillGray.png
-share/webkit-1.0/webinspector/Images/timelineHollowPillGreen.png
-share/webkit-1.0/webinspector/Images/timelineHollowPillOrange.png
-share/webkit-1.0/webinspector/Images/timelineHollowPillPurple.png
-share/webkit-1.0/webinspector/Images/timelineHollowPillRed.png
-share/webkit-1.0/webinspector/Images/timelineHollowPillYellow.png
-share/webkit-1.0/webinspector/Images/timelineIcon.png
-share/webkit-1.0/webinspector/Images/timelinePillBlue.png
-share/webkit-1.0/webinspector/Images/timelinePillGray.png
-share/webkit-1.0/webinspector/Images/timelinePillGreen.png
-share/webkit-1.0/webinspector/Images/timelinePillOrange.png
-share/webkit-1.0/webinspector/Images/timelinePillPurple.png
-share/webkit-1.0/webinspector/Images/timelinePillRed.png
-share/webkit-1.0/webinspector/Images/timelinePillYellow.png
-share/webkit-1.0/webinspector/Images/toolbarItemSelected.png
-share/webkit-1.0/webinspector/Images/trackHoriz.png
-share/webkit-1.0/webinspector/Images/trackVert.png
-share/webkit-1.0/webinspector/Images/treeDownTriangleBlack.png
-share/webkit-1.0/webinspector/Images/treeDownTriangleWhite.png
-share/webkit-1.0/webinspector/Images/treeRightTriangleBlack.png
-share/webkit-1.0/webinspector/Images/treeRightTriangleWhite.png
-share/webkit-1.0/webinspector/Images/treeUpTriangleBlack.png
-share/webkit-1.0/webinspector/Images/treeUpTriangleWhite.png
-share/webkit-1.0/webinspector/Images/undockButtonGlyph.png
-share/webkit-1.0/webinspector/Images/userInputIcon.png
-share/webkit-1.0/webinspector/Images/userInputPreviousIcon.png
-share/webkit-1.0/webinspector/Images/userInputResultIcon.png
-share/webkit-1.0/webinspector/Images/warningIcon.png
-share/webkit-1.0/webinspector/Images/warningMediumIcon.png
-share/webkit-1.0/webinspector/Images/warningOrangeDot.png
-share/webkit-1.0/webinspector/Images/warningsErrors.png
-share/webkit-1.0/webinspector/Images/whiteConnectorPoint.png
-share/webkit-1.0/webinspector/InjectedFakeWorker.js
-share/webkit-1.0/webinspector/InjectedScript.js
-share/webkit-1.0/webinspector/InjectedScriptAccess.js
-share/webkit-1.0/webinspector/InspectorBackendStub.js
-share/webkit-1.0/webinspector/InspectorFrontendHostStub.js
-share/webkit-1.0/webinspector/KeyboardShortcut.js
-share/webkit-1.0/webinspector/MetricsSidebarPane.js
-share/webkit-1.0/webinspector/Object.js
-share/webkit-1.0/webinspector/ObjectPropertiesSection.js
-share/webkit-1.0/webinspector/ObjectProxy.js
-share/webkit-1.0/webinspector/Panel.js
-share/webkit-1.0/webinspector/PanelEnablerView.js
-share/webkit-1.0/webinspector/Placard.js
-share/webkit-1.0/webinspector/Popover.js
-share/webkit-1.0/webinspector/ProfileDataGridTree.js
-share/webkit-1.0/webinspector/ProfileView.js
-share/webkit-1.0/webinspector/ProfilesPanel.js
-share/webkit-1.0/webinspector/PropertiesSection.js
-share/webkit-1.0/webinspector/PropertiesSidebarPane.js
-share/webkit-1.0/webinspector/Resource.js
-share/webkit-1.0/webinspector/ResourceCategory.js
-share/webkit-1.0/webinspector/ResourceView.js
-share/webkit-1.0/webinspector/ResourcesPanel.js
-share/webkit-1.0/webinspector/ScopeChainSidebarPane.js
-share/webkit-1.0/webinspector/Script.js
-share/webkit-1.0/webinspector/ScriptView.js
-share/webkit-1.0/webinspector/ScriptsPanel.js
-share/webkit-1.0/webinspector/Section.js
-share/webkit-1.0/webinspector/Settings.js
-share/webkit-1.0/webinspector/SidebarPane.js
-share/webkit-1.0/webinspector/SidebarTreeElement.js
-share/webkit-1.0/webinspector/SourceCSSTokenizer.js
-share/webkit-1.0/webinspector/SourceFrame.js
-share/webkit-1.0/webinspector/SourceHTMLTokenizer.js
-share/webkit-1.0/webinspector/SourceJavaScriptTokenizer.js
-share/webkit-1.0/webinspector/SourceTokenizer.js
-share/webkit-1.0/webinspector/SourceView.js
-share/webkit-1.0/webinspector/StatusBarButton.js
-share/webkit-1.0/webinspector/StoragePanel.js
-share/webkit-1.0/webinspector/StylesSidebarPane.js
-share/webkit-1.0/webinspector/SummaryBar.js
-share/webkit-1.0/webinspector/TestController.js
-share/webkit-1.0/webinspector/TextEditorHighlighter.js
-share/webkit-1.0/webinspector/TextEditorModel.js
-share/webkit-1.0/webinspector/TextPrompt.js
-share/webkit-1.0/webinspector/TextViewer.js
-share/webkit-1.0/webinspector/TimelineAgent.js
-share/webkit-1.0/webinspector/TimelineGrid.js
-share/webkit-1.0/webinspector/TimelineOverviewPane.js
-share/webkit-1.0/webinspector/TimelinePanel.js
-share/webkit-1.0/webinspector/TopDownProfileDataGridTree.js
-share/webkit-1.0/webinspector/View.js
-share/webkit-1.0/webinspector/WatchExpressionsSidebarPane.js
-share/webkit-1.0/webinspector/WelcomeView.js
-share/webkit-1.0/webinspector/WorkersSidebarPane.js
-share/webkit-1.0/webinspector/audits.css
-share/webkit-1.0/webinspector/inspector.css
-share/webkit-1.0/webinspector/inspector.html
-share/webkit-1.0/webinspector/inspector.js
-share/webkit-1.0/webinspector/inspectorSyntaxHighlight.css
-share/webkit-1.0/webinspector/localizedStrings.js
-share/webkit-1.0/webinspector/popover.css
-share/webkit-1.0/webinspector/textViewer.css
-share/webkit-1.0/webinspector/treeoutline.js
-share/webkit-1.0/webinspector/utilities.js
+share/webkitgtk-1.0/images/deleteButton.png
+share/webkitgtk-1.0/images/inputSpeech.png
+share/webkitgtk-1.0/images/missingImage.png
+share/webkitgtk-1.0/images/nullPlugin.png
+share/webkitgtk-1.0/images/panIcon.png
+share/webkitgtk-1.0/images/textAreaResizeCorner.png
+share/webkitgtk-1.0/images/urlIcon.png
+share/webkitgtk-1.0/webinspector/ApplicationCacheItemsView.js
+share/webkitgtk-1.0/webinspector/AuditCategories.js
+share/webkitgtk-1.0/webinspector/AuditFormatters.js
+share/webkitgtk-1.0/webinspector/AuditLauncherView.js
+share/webkitgtk-1.0/webinspector/AuditResultView.js
+share/webkitgtk-1.0/webinspector/AuditRules.js
+share/webkitgtk-1.0/webinspector/AuditsPanel.js
+share/webkitgtk-1.0/webinspector/BottomUpProfileDataGridTree.js
+share/webkitgtk-1.0/webinspector/Breakpoint.js
+share/webkitgtk-1.0/webinspector/BreakpointManager.js
+share/webkitgtk-1.0/webinspector/BreakpointsSidebarPane.js
+share/webkitgtk-1.0/webinspector/CSSCompletions.js
+share/webkitgtk-1.0/webinspector/CSSKeywordCompletions.js
+share/webkitgtk-1.0/webinspector/CSSStyleModel.js
+share/webkitgtk-1.0/webinspector/CallStackSidebarPane.js
+share/webkitgtk-1.0/webinspector/Checkbox.js
+share/webkitgtk-1.0/webinspector/Color.js
+share/webkitgtk-1.0/webinspector/ConsolePanel.js
+share/webkitgtk-1.0/webinspector/ConsoleView.js
+share/webkitgtk-1.0/webinspector/ContextMenu.js
+share/webkitgtk-1.0/webinspector/CookieItemsView.js
+share/webkitgtk-1.0/webinspector/CookieParser.js
+share/webkitgtk-1.0/webinspector/CookiesTable.js
+share/webkitgtk-1.0/webinspector/DOMAgent.js
+share/webkitgtk-1.0/webinspector/DOMStorage.js
+share/webkitgtk-1.0/webinspector/DOMStorageItemsView.js
+share/webkitgtk-1.0/webinspector/DOMSyntaxHighlighter.js
+share/webkitgtk-1.0/webinspector/DataGrid.js
+share/webkitgtk-1.0/webinspector/Database.js
+share/webkitgtk-1.0/webinspector/DatabaseQueryView.js
+share/webkitgtk-1.0/webinspector/DatabaseTableView.js
+share/webkitgtk-1.0/webinspector/DebuggerModel.js
+share/webkitgtk-1.0/webinspector/DebuggerPresentationModel.js
+share/webkitgtk-1.0/webinspector/DetailedHeapshotGridNodes.js
+share/webkitgtk-1.0/webinspector/DetailedHeapshotView.js
+share/webkitgtk-1.0/webinspector/Drawer.js
+share/webkitgtk-1.0/webinspector/ElementsPanel.js
+share/webkitgtk-1.0/webinspector/ElementsTreeOutline.js
+share/webkitgtk-1.0/webinspector/EventListenersSidebarPane.js
+share/webkitgtk-1.0/webinspector/ExtensionAPI.js
+share/webkitgtk-1.0/webinspector/ExtensionAuditCategory.js
+share/webkitgtk-1.0/webinspector/ExtensionCommon.js
+share/webkitgtk-1.0/webinspector/ExtensionPanel.js
+share/webkitgtk-1.0/webinspector/ExtensionRegistryStub.js
+share/webkitgtk-1.0/webinspector/ExtensionServer.js
+share/webkitgtk-1.0/webinspector/FontView.js
+share/webkitgtk-1.0/webinspector/GoToLineDialog.js
+share/webkitgtk-1.0/webinspector/HAREntry.js
+share/webkitgtk-1.0/webinspector/HeapSnapshot.js
+share/webkitgtk-1.0/webinspector/HeapSnapshotView.js
+share/webkitgtk-1.0/webinspector/HelpScreen.js
+share/webkitgtk-1.0/webinspector/ImageView.js
+share/webkitgtk-1.0/webinspector/Images/applicationCache.png
+share/webkitgtk-1.0/webinspector/Images/auditsIcon.png
+share/webkitgtk-1.0/webinspector/Images/back.png
+share/webkitgtk-1.0/webinspector/Images/breakpointBorder.png
+share/webkitgtk-1.0/webinspector/Images/breakpointConditionalBorder.png
+share/webkitgtk-1.0/webinspector/Images/breakpointConditionalCounterBorder.png
+share/webkitgtk-1.0/webinspector/Images/breakpointCounterBorder.png
+share/webkitgtk-1.0/webinspector/Images/breakpointsActivateButtonGlyph.png
+share/webkitgtk-1.0/webinspector/Images/breakpointsDeactivateButtonGlyph.png
+share/webkitgtk-1.0/webinspector/Images/checker.png
+share/webkitgtk-1.0/webinspector/Images/clearConsoleButtonGlyph.png
+share/webkitgtk-1.0/webinspector/Images/closeButtons.png
+share/webkitgtk-1.0/webinspector/Images/consoleButtonGlyph.png
+share/webkitgtk-1.0/webinspector/Images/consoleIcon.png
+share/webkitgtk-1.0/webinspector/Images/cookie.png
+share/webkitgtk-1.0/webinspector/Images/database.png
+share/webkitgtk-1.0/webinspector/Images/databaseTable.png
+share/webkitgtk-1.0/webinspector/Images/debuggerContinue.png
+share/webkitgtk-1.0/webinspector/Images/debuggerPause.png
+share/webkitgtk-1.0/webinspector/Images/debuggerStepInto.png
+share/webkitgtk-1.0/webinspector/Images/debuggerStepOut.png
+share/webkitgtk-1.0/webinspector/Images/debuggerStepOver.png
+share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallDown.png
+share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallDownBlack.png
+share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallDownWhite.png
+share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallRight.png
+share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallRightBlack.png
+share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallRightDown.png
+share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallRightDownBlack.png
+share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallRightDownWhite.png
+share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallRightWhite.png
+share/webkitgtk-1.0/webinspector/Images/dockButtonGlyph.png
+share/webkitgtk-1.0/webinspector/Images/elementsIcon.png
+share/webkitgtk-1.0/webinspector/Images/enableOutlineButtonGlyph.png
+share/webkitgtk-1.0/webinspector/Images/enableSolidButtonGlyph.png
+share/webkitgtk-1.0/webinspector/Images/errorIcon.png
+share/webkitgtk-1.0/webinspector/Images/errorMediumIcon.png
+share/webkitgtk-1.0/webinspector/Images/errorRedDot.png
+share/webkitgtk-1.0/webinspector/Images/excludeButtonGlyph.png
+share/webkitgtk-1.0/webinspector/Images/focusButtonGlyph.png
+share/webkitgtk-1.0/webinspector/Images/forward.png
+share/webkitgtk-1.0/webinspector/Images/frame.png
+share/webkitgtk-1.0/webinspector/Images/garbageCollectButtonGlyph.png
+share/webkitgtk-1.0/webinspector/Images/gearButtonGlyph.png
+share/webkitgtk-1.0/webinspector/Images/glossyHeader.png
+share/webkitgtk-1.0/webinspector/Images/glossyHeaderPressed.png
+share/webkitgtk-1.0/webinspector/Images/glossyHeaderSelected.png
+share/webkitgtk-1.0/webinspector/Images/glossyHeaderSelectedPressed.png
+share/webkitgtk-1.0/webinspector/Images/goArrow.png
+share/webkitgtk-1.0/webinspector/Images/graphLabelCalloutLeft.png
+share/webkitgtk-1.0/webinspector/Images/graphLabelCalloutRight.png
+share/webkitgtk-1.0/webinspector/Images/helpButtonGlyph.png
+share/webkitgtk-1.0/webinspector/Images/largerResourcesButtonGlyph.png
+share/webkitgtk-1.0/webinspector/Images/localStorage.png
+share/webkitgtk-1.0/webinspector/Images/networkIcon.png
+share/webkitgtk-1.0/webinspector/Images/nodeSearchButtonGlyph.png
+share/webkitgtk-1.0/webinspector/Images/paneAddButtons.png
+share/webkitgtk-1.0/webinspector/Images/paneBottomGrow.png
+share/webkitgtk-1.0/webinspector/Images/paneBottomGrowActive.png
+share/webkitgtk-1.0/webinspector/Images/paneGrowHandleLine.png
+share/webkitgtk-1.0/webinspector/Images/paneSettingsButtons.png
+share/webkitgtk-1.0/webinspector/Images/pauseOnExceptionButtonGlyph.png
+share/webkitgtk-1.0/webinspector/Images/percentButtonGlyph.png
+share/webkitgtk-1.0/webinspector/Images/popoverArrows.png
+share/webkitgtk-1.0/webinspector/Images/popoverBackground.png
+share/webkitgtk-1.0/webinspector/Images/profileGroupIcon.png
+share/webkitgtk-1.0/webinspector/Images/profileIcon.png
+share/webkitgtk-1.0/webinspector/Images/profileSmallIcon.png
+share/webkitgtk-1.0/webinspector/Images/profilesIcon.png
+share/webkitgtk-1.0/webinspector/Images/profilesSilhouette.png
+share/webkitgtk-1.0/webinspector/Images/programCounterBorder.png
+share/webkitgtk-1.0/webinspector/Images/radioDot.png
+share/webkitgtk-1.0/webinspector/Images/recordButtonGlyph.png
+share/webkitgtk-1.0/webinspector/Images/recordToggledButtonGlyph.png
+share/webkitgtk-1.0/webinspector/Images/reloadButtonGlyph.png
+share/webkitgtk-1.0/webinspector/Images/resourceCSSIcon.png
+share/webkitgtk-1.0/webinspector/Images/resourceDocumentIcon.png
+share/webkitgtk-1.0/webinspector/Images/resourceDocumentIconSmall.png
+share/webkitgtk-1.0/webinspector/Images/resourceJSIcon.png
+share/webkitgtk-1.0/webinspector/Images/resourcePlainIcon.png
+share/webkitgtk-1.0/webinspector/Images/resourcePlainIconSmall.png
+share/webkitgtk-1.0/webinspector/Images/resourcesIcon.png
+share/webkitgtk-1.0/webinspector/Images/resourcesSizeGraphIcon.png
+share/webkitgtk-1.0/webinspector/Images/resourcesTimeGraphIcon.png
+share/webkitgtk-1.0/webinspector/Images/scriptsIcon.png
+share/webkitgtk-1.0/webinspector/Images/scriptsSilhouette.png
+share/webkitgtk-1.0/webinspector/Images/searchSmallBlue.png
+share/webkitgtk-1.0/webinspector/Images/searchSmallBrightBlue.png
+share/webkitgtk-1.0/webinspector/Images/searchSmallGray.png
+share/webkitgtk-1.0/webinspector/Images/searchSmallWhite.png
+share/webkitgtk-1.0/webinspector/Images/segment.png
+share/webkitgtk-1.0/webinspector/Images/segmentEnd.png
+share/webkitgtk-1.0/webinspector/Images/segmentHover.png
+share/webkitgtk-1.0/webinspector/Images/segmentHoverEnd.png
+share/webkitgtk-1.0/webinspector/Images/segmentSelected.png
+share/webkitgtk-1.0/webinspector/Images/segmentSelectedEnd.png
+share/webkitgtk-1.0/webinspector/Images/sessionStorage.png
+share/webkitgtk-1.0/webinspector/Images/spinner.gif
+share/webkitgtk-1.0/webinspector/Images/splitviewDimple.png
+share/webkitgtk-1.0/webinspector/Images/splitviewDividerBackground.png
+share/webkitgtk-1.0/webinspector/Images/statusbarBackground.png
+share/webkitgtk-1.0/webinspector/Images/statusbarBottomBackground.png
+share/webkitgtk-1.0/webinspector/Images/statusbarButtons.png
+share/webkitgtk-1.0/webinspector/Images/statusbarMenuButton.png
+share/webkitgtk-1.0/webinspector/Images/statusbarMenuButtonSelected.png
+share/webkitgtk-1.0/webinspector/Images/statusbarResizerHorizontal.png
+share/webkitgtk-1.0/webinspector/Images/statusbarResizerVertical.png
+share/webkitgtk-1.0/webinspector/Images/successGreenDot.png
+share/webkitgtk-1.0/webinspector/Images/thumbActiveHoriz.png
+share/webkitgtk-1.0/webinspector/Images/thumbActiveVert.png
+share/webkitgtk-1.0/webinspector/Images/thumbHoriz.png
+share/webkitgtk-1.0/webinspector/Images/thumbHoverHoriz.png
+share/webkitgtk-1.0/webinspector/Images/thumbHoverVert.png
+share/webkitgtk-1.0/webinspector/Images/thumbVert.png
+share/webkitgtk-1.0/webinspector/Images/timelineBarBlue.png
+share/webkitgtk-1.0/webinspector/Images/timelineBarGray.png
+share/webkitgtk-1.0/webinspector/Images/timelineBarGreen.png
+share/webkitgtk-1.0/webinspector/Images/timelineBarOrange.png
+share/webkitgtk-1.0/webinspector/Images/timelineBarPurple.png
+share/webkitgtk-1.0/webinspector/Images/timelineBarRed.png
+share/webkitgtk-1.0/webinspector/Images/timelineBarYellow.png
+share/webkitgtk-1.0/webinspector/Images/timelineCheckmarks.png
+share/webkitgtk-1.0/webinspector/Images/timelineDots.png
+share/webkitgtk-1.0/webinspector/Images/timelineHollowPillBlue.png
+share/webkitgtk-1.0/webinspector/Images/timelineHollowPillGray.png
+share/webkitgtk-1.0/webinspector/Images/timelineHollowPillGreen.png
+share/webkitgtk-1.0/webinspector/Images/timelineHollowPillOrange.png
+share/webkitgtk-1.0/webinspector/Images/timelineHollowPillPurple.png
+share/webkitgtk-1.0/webinspector/Images/timelineHollowPillRed.png
+share/webkitgtk-1.0/webinspector/Images/timelineHollowPillYellow.png
+share/webkitgtk-1.0/webinspector/Images/timelineIcon.png
+share/webkitgtk-1.0/webinspector/Images/timelinePillBlue.png
+share/webkitgtk-1.0/webinspector/Images/timelinePillGray.png
+share/webkitgtk-1.0/webinspector/Images/timelinePillGreen.png
+share/webkitgtk-1.0/webinspector/Images/timelinePillOrange.png
+share/webkitgtk-1.0/webinspector/Images/timelinePillPurple.png
+share/webkitgtk-1.0/webinspector/Images/timelinePillRed.png
+share/webkitgtk-1.0/webinspector/Images/timelinePillYellow.png
+share/webkitgtk-1.0/webinspector/Images/toolbarItemSelected.png
+share/webkitgtk-1.0/webinspector/Images/trackHoriz.png
+share/webkitgtk-1.0/webinspector/Images/trackVert.png
+share/webkitgtk-1.0/webinspector/Images/treeDownTriangleBlack.png
+share/webkitgtk-1.0/webinspector/Images/treeDownTriangleWhite.png
+share/webkitgtk-1.0/webinspector/Images/treeRightTriangleBlack.png
+share/webkitgtk-1.0/webinspector/Images/treeRightTriangleWhite.png
+share/webkitgtk-1.0/webinspector/Images/treeUpTriangleBlack.png
+share/webkitgtk-1.0/webinspector/Images/treeUpTriangleWhite.png
+share/webkitgtk-1.0/webinspector/Images/undockButtonGlyph.png
+share/webkitgtk-1.0/webinspector/Images/userInputIcon.png
+share/webkitgtk-1.0/webinspector/Images/userInputPreviousIcon.png
+share/webkitgtk-1.0/webinspector/Images/userInputResultIcon.png
+share/webkitgtk-1.0/webinspector/Images/warningIcon.png
+share/webkitgtk-1.0/webinspector/Images/warningMediumIcon.png
+share/webkitgtk-1.0/webinspector/Images/warningOrangeDot.png
+share/webkitgtk-1.0/webinspector/Images/warningsErrors.png
+share/webkitgtk-1.0/webinspector/InjectedFakeWorker.js
+share/webkitgtk-1.0/webinspector/InspectorBackendStub.js
+share/webkitgtk-1.0/webinspector/InspectorFrontendHostStub.js
+share/webkitgtk-1.0/webinspector/KeyboardShortcut.js
+share/webkitgtk-1.0/webinspector/MetricsSidebarPane.js
+share/webkitgtk-1.0/webinspector/NetworkItemView.js
+share/webkitgtk-1.0/webinspector/NetworkManager.js
+share/webkitgtk-1.0/webinspector/NetworkPanel.js
+share/webkitgtk-1.0/webinspector/Object.js
+share/webkitgtk-1.0/webinspector/ObjectPropertiesSection.js
+share/webkitgtk-1.0/webinspector/Panel.js
+share/webkitgtk-1.0/webinspector/PanelEnablerView.js
+share/webkitgtk-1.0/webinspector/Placard.js
+share/webkitgtk-1.0/webinspector/PleaseWaitMessage.js
+share/webkitgtk-1.0/webinspector/Popover.js
+share/webkitgtk-1.0/webinspector/ProfileDataGridTree.js
+share/webkitgtk-1.0/webinspector/ProfileView.js
+share/webkitgtk-1.0/webinspector/ProfilesPanel.js
+share/webkitgtk-1.0/webinspector/PropertiesSection.js
+share/webkitgtk-1.0/webinspector/PropertiesSidebarPane.js
+share/webkitgtk-1.0/webinspector/RemoteObject.js
+share/webkitgtk-1.0/webinspector/Resource.js
+share/webkitgtk-1.0/webinspector/ResourceCategory.js
+share/webkitgtk-1.0/webinspector/ResourceCookiesView.js
+share/webkitgtk-1.0/webinspector/ResourceHeadersView.js
+share/webkitgtk-1.0/webinspector/ResourceTimingView.js
+share/webkitgtk-1.0/webinspector/ResourceTreeModel.js
+share/webkitgtk-1.0/webinspector/ResourceView.js
+share/webkitgtk-1.0/webinspector/ResourcesPanel.js
+share/webkitgtk-1.0/webinspector/ScopeChainSidebarPane.js
+share/webkitgtk-1.0/webinspector/Script.js
+share/webkitgtk-1.0/webinspector/ScriptFormatter.js
+share/webkitgtk-1.0/webinspector/ScriptFormatterWorker.js
+share/webkitgtk-1.0/webinspector/ScriptsPanel.js
+share/webkitgtk-1.0/webinspector/SearchController.js
+share/webkitgtk-1.0/webinspector/Section.js
+share/webkitgtk-1.0/webinspector/Settings.js
+share/webkitgtk-1.0/webinspector/ShortcutsHelp.js
+share/webkitgtk-1.0/webinspector/ShowMoreDataGridNode.js
+share/webkitgtk-1.0/webinspector/SidebarPane.js
+share/webkitgtk-1.0/webinspector/SidebarTreeElement.js
+share/webkitgtk-1.0/webinspector/SourceCSSTokenizer.js
+share/webkitgtk-1.0/webinspector/SourceFrame.js
+share/webkitgtk-1.0/webinspector/SourceFrameContent.js
+share/webkitgtk-1.0/webinspector/SourceHTMLTokenizer.js
+share/webkitgtk-1.0/webinspector/SourceJavaScriptTokenizer.js
+share/webkitgtk-1.0/webinspector/SourceTokenizer.js
+share/webkitgtk-1.0/webinspector/StatusBarButton.js
+share/webkitgtk-1.0/webinspector/StylesSidebarPane.js
+share/webkitgtk-1.0/webinspector/SummaryBar.js
+share/webkitgtk-1.0/webinspector/TabbedPane.js
+share/webkitgtk-1.0/webinspector/TestController.js
+share/webkitgtk-1.0/webinspector/TextEditorHighlighter.js
+share/webkitgtk-1.0/webinspector/TextEditorModel.js
+share/webkitgtk-1.0/webinspector/TextPrompt.js
+share/webkitgtk-1.0/webinspector/TextViewer.js
+share/webkitgtk-1.0/webinspector/TimelineAgent.js
+share/webkitgtk-1.0/webinspector/TimelineGrid.js
+share/webkitgtk-1.0/webinspector/TimelineOverviewPane.js
+share/webkitgtk-1.0/webinspector/TimelinePanel.js
+share/webkitgtk-1.0/webinspector/Toolbar.js
+share/webkitgtk-1.0/webinspector/TopDownProfileDataGridTree.js
+share/webkitgtk-1.0/webinspector/View.js
+share/webkitgtk-1.0/webinspector/WatchExpressionsSidebarPane.js
+share/webkitgtk-1.0/webinspector/WelcomeView.js
+share/webkitgtk-1.0/webinspector/WorkersSidebarPane.js
+share/webkitgtk-1.0/webinspector/audits.css
+share/webkitgtk-1.0/webinspector/goToLineDialog.css
+share/webkitgtk-1.0/webinspector/heapProfiler.css
+share/webkitgtk-1.0/webinspector/helpScreen.css
+share/webkitgtk-1.0/webinspector/inspector.css
+share/webkitgtk-1.0/webinspector/inspector.html
+share/webkitgtk-1.0/webinspector/inspector.js
+share/webkitgtk-1.0/webinspector/inspectorSyntaxHighlight.css
+share/webkitgtk-1.0/webinspector/localizedStrings.js
+share/webkitgtk-1.0/webinspector/networkPanel.css
+share/webkitgtk-1.0/webinspector/popover.css
+share/webkitgtk-1.0/webinspector/textViewer.css
+share/webkitgtk-1.0/webinspector/treeoutline.js
+share/webkitgtk-1.0/webinspector/utilities.js
+@pkgdir share/glib-2.0/schemas
diff --git a/www/webkit-gtk/buildlink3.mk b/www/webkit-gtk/buildlink3.mk
index f05050bb7fd..97832099e1b 100644
--- a/www/webkit-gtk/buildlink3.mk
+++ b/www/webkit-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2011/04/22 13:42:34 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2011/06/09 11:00:00 drochner Exp $
BUILDLINK_TREE+= webkit-gtk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= webkit-gtk
WEBKIT_GTK_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.webkit-gtk+= webkit-gtk>=1.1.3
-BUILDLINK_ABI_DEPENDS.webkit-gtk?= webkit-gtk>=1.2.7nb4
+BUILDLINK_ABI_DEPENDS.webkit-gtk?= webkit-gtk>=1.2.7nb3
BUILDLINK_PKGSRCDIR.webkit-gtk?= ../../www/webkit-gtk
.include "../../databases/sqlite3/buildlink3.mk"
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index d7d5b84ae79..7ec7327d9f3 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,31 +1,8 @@
-$NetBSD: distinfo,v 1.34 2011/04/14 18:11:45 drochner Exp $
+$NetBSD: distinfo,v 1.35 2011/06/09 11:00:00 drochner Exp $
-SHA1 (webkit-1.2.7.tar.gz) = e9afc573d2459794c3749ba404f2187f9dcc9ed3
-RMD160 (webkit-1.2.7.tar.gz) = f36b3ae05693e0eeb4d1936ceee52b6fe1517e57
-Size (webkit-1.2.7.tar.gz) = 6615990 bytes
-SHA1 (patch-ab) = 92a6d6e0def4c3fd77a692a199359255319f7f21
-SHA1 (patch-ad) = ef727a30bf78b747402a23fea7bddcc37d70e77d
-SHA1 (patch-af) = 7971cf7d873703e17c002fa660a949f6f6d1c684
-SHA1 (patch-ag) = 0da0f8e1299ab061118e0338af521a1f07f4722b
-SHA1 (patch-ah) = 9e0178a9fe7175e29e16155bd190b852ced7d01f
-SHA1 (patch-ba) = 6caffef625e9c04e971fbbd0763b4f9c834491e3
-SHA1 (patch-bb) = 5e59576629e9ecfbbe576c3d0afe047bda449291
-SHA1 (patch-bc) = 0d6d3e2e2f5b2d199aaa94084f9d5a96b39c2708
-SHA1 (patch-bd) = 2e105ade29ff04cdcb5385d19aee467090b6765a
-SHA1 (patch-ca) = c3a8367582064a66d9b30486449d80571062c950
-SHA1 (patch-cb) = 1d106ae16375e7812078bdcacaed1c18ba75c5f1
-SHA1 (patch-cc) = d552f68d28a8ac6e3af795e99dd7f90617a57f5c
-SHA1 (patch-cd) = 1d7664fef8a9158ba71d49cd771d6b55e685b29e
-SHA1 (patch-ce) = 36c174a7a085fdfedd3dc8e06363bda3ba4aa96e
-SHA1 (patch-cf) = d011ace602c71a3063d6d2db70260b87142a6b20
-SHA1 (patch-cg) = 463f851254e78ae51496706f0c139fd39ebb761e
-SHA1 (patch-ch) = 856a4788273ed0ed8f7151634313d6898696490a
-SHA1 (patch-ci) = d0bc0a61725d319e985606ca751affe5a0c9b0ea
-SHA1 (patch-cj) = bc1a1ce7e9d32c074817abde9dffe646a6c19d78
-SHA1 (patch-ck) = 675cb023883b2afeaa850cb5bd087cc37d241ca7
-SHA1 (patch-cl) = 4188b727b9517a6d34fbc33ec1509f491abafb68
-SHA1 (patch-cm) = 66ee43d6fb56a850467a29f998e40cebd50ef8c0
-SHA1 (patch-cn) = 33167472bd2a34756aa120939fbce048cf58d95c
-SHA1 (patch-co) = 194f0ae8d262cffb790a420970d3f63342ebfd05
-SHA1 (patch-cp) = 6e25f5c3b05ce77f2c16d400e010dafb5124256e
-SHA1 (patch-cq) = 5258c761ab68183af8762232f5e53a9a7c63c52a
+SHA1 (webkit-1.4.1.tar.gz) = 5813112e94315db747c68d6b45ca763a45774357
+RMD160 (webkit-1.4.1.tar.gz) = da77eea6b7abb0e1ffeb322d747386a2c4b7cc9c
+Size (webkit-1.4.1.tar.gz) = 8494373 bytes
+SHA1 (patch-ab) = 1d31748ce0d300425f12cc800219954d7128adb8
+SHA1 (patch-ag) = a09f7fc1336750bc707b1bcc57aa6dc3e02a0460
+SHA1 (patch-ah) = 03e7863ad0b0a1de9a95a6b370e4259a6f7c34ac
diff --git a/www/webkit-gtk/patches/patch-ab b/www/webkit-gtk/patches/patch-ab
index cd5a0ae6d20..6d8a7d3026c 100644
--- a/www/webkit-gtk/patches/patch-ab
+++ b/www/webkit-gtk/patches/patch-ab
@@ -1,11 +1,17 @@
-$NetBSD: patch-ab,v 1.8 2011/02/27 23:42:10 wiz Exp $
+$NetBSD: patch-ab,v 1.9 2011/06/09 11:00:01 drochner Exp $
-Fix build with png-1.5. From John Bowler.
-https://bugs.webkit.org/show_bug.cgi?id=54406
-
---- WebCore/platform/image-decoders/png/PNGImageDecoder.cpp.orig 2010-12-28 12:28:51.000000000 +0000
-+++ WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
-@@ -216,18 +220,18 @@ void PNGImageDecoder::headerAvailable()
+--- Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp.orig 2011-03-21 18:43:07.000000000 +0000
++++ Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
+@@ -226,7 +226,7 @@ static ColorProfile readColorProfile(png
+ #ifdef PNG_iCCP_SUPPORTED
+ char* profileName;
+ int compressionType;
+- char* profile;
++ png_byte* profile;
+ png_uint_32 profileLength;
+ if (png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) {
+ ColorProfile colorProfile;
+@@ -241,11 +241,11 @@ void PNGImageDecoder::headerAvailable()
{
png_structp png = m_reader->pngPtr();
png_infop info = m_reader->infoPtr();
@@ -20,14 +26,7 @@ https://bugs.webkit.org/show_bug.cgi?id=54406
longjmp(JMPBUF(png), 1);
return;
}
-
- // We can fill in the size now that the header is available.
- if (!setSize(width, height)) {
- longjmp(JMPBUF(png), 1);
- return;
- }
-
-@@ -277,8 +289,7 @@ void PNGImageDecoder::headerAvailable()
+@@ -319,8 +319,7 @@ void PNGImageDecoder::headerAvailable()
if (m_reader->decodingSizeOnly()) {
// If we only needed the size, halt the reader.
@@ -37,9 +36,9 @@ https://bugs.webkit.org/show_bug.cgi?id=54406
}
}
-@@ -300,7 +315,8 @@ void PNGImageDecoder::rowAvailable(unsig
+@@ -343,7 +342,8 @@ void PNGImageDecoder::rowAvailable(unsig
// For PNGs, the frame always fills the entire image.
- buffer.setRect(IntRect(IntPoint(), size()));
+ buffer.setOriginalFrameRect(IntRect(IntPoint(), size()));
- if (m_reader->pngPtr()->interlaced)
+ if (png_get_interlace_type(m_reader->pngPtr(), m_reader->infoPtr())
diff --git a/www/webkit-gtk/patches/patch-ad b/www/webkit-gtk/patches/patch-ad
deleted file mode 100644
index 45a6368a1b2..00000000000
--- a/www/webkit-gtk/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2011/02/14 20:05:54 wiz Exp $
-
-https://bugs.webkit.org/show_bug.cgi?id=54407
-
---- JavaScriptCore/wtf/Platform.h.orig 2010-04-12 13:25:16.000000000 +0000
-+++ JavaScriptCore/wtf/Platform.h
-@@ -346,7 +346,7 @@
- #endif
-
- /* OS(FREEBSD) - FreeBSD */
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #define WTF_OS_FREEBSD 1
- #endif
-
-@@ -362,7 +362,7 @@
-
- /* OS(NETBSD) - NetBSD */
- #if defined(__NetBSD__)
--#define WTF_PLATFORM_NETBSD 1
-+#define WTF_OS_NETBSD 1
- #endif
-
- /* OS(OPENBSD) - OpenBSD */
diff --git a/www/webkit-gtk/patches/patch-af b/www/webkit-gtk/patches/patch-af
deleted file mode 100644
index 894af47bc7b..00000000000
--- a/www/webkit-gtk/patches/patch-af
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-af,v 1.2 2011/02/14 20:05:54 wiz Exp $
-
-https://bugs.webkit.org/show_bug.cgi?id=54407
-
---- JavaScriptCore/jit/JITOpcodes.cpp.orig 2010-04-12 13:49:15.000000000 +0000
-+++ JavaScriptCore/jit/JITOpcodes.cpp
-@@ -165,7 +165,7 @@ void JIT::privateCompileCTIMachineTrampo
- * stack pointer by the right amount after the call.
- */
-
--#if COMPILER(MSVC) || OS(LINUX)
-+#if COMPILER(MSVC) || OS(LINUX) || OS(NETBSD)
- #if COMPILER(MSVC)
- #pragma pack(push)
- #pragma pack(4)
-@@ -228,7 +228,7 @@ void JIT::privateCompileCTIMachineTrampo
- storePtr(regT2, Address(stackPointerRegister, OBJECT_OFFSETOF(NativeCallFrameStructure, thisValue) + OBJECT_OFFSETOF(JSValue, u.asBits.payload)));
- storePtr(regT3, Address(stackPointerRegister, OBJECT_OFFSETOF(NativeCallFrameStructure, thisValue) + OBJECT_OFFSETOF(JSValue, u.asBits.tag)));
-
--#if COMPILER(MSVC) || OS(LINUX)
-+#if COMPILER(MSVC) || OS(LINUX) || OS(NETBSD)
- // ArgList is passed by reference so is stackPointerRegister + 4 * sizeof(Register)
- addPtr(Imm32(OBJECT_OFFSETOF(NativeCallFrameStructure, result)), stackPointerRegister, X86Registers::ecx);
-
diff --git a/www/webkit-gtk/patches/patch-ag b/www/webkit-gtk/patches/patch-ag
index 62e5334c6b5..3c1e569cf0e 100644
--- a/www/webkit-gtk/patches/patch-ag
+++ b/www/webkit-gtk/patches/patch-ag
@@ -1,18 +1,13 @@
-$NetBSD: patch-ag,v 1.2 2011/03/14 00:15:32 wiz Exp $
+$NetBSD: patch-ag,v 1.3 2011/06/09 11:00:01 drochner Exp $
-It would be easier to list the CPUs where unaligned access is both allowed
-and actually faster!
-
-https://bugs.webkit.org/show_bug.cgi?id=56247
-
---- WebCore/platform/text/AtomicString.cpp.orig 2010-09-10 15:20:33.000000000 +0200
-+++ WebCore/platform/text/AtomicString.cpp 2011-03-12 12:54:41.000000000 +0100
-@@ -105,7 +105,7 @@ static inline bool equal(StringImpl* str
+--- Source/JavaScriptCore/wtf/text/AtomicString.cpp.orig 2011-03-21 18:41:46.000000000 +0000
++++ Source/JavaScriptCore/wtf/text/AtomicString.cpp
+@@ -142,7 +142,7 @@ static inline bool equal(StringImpl* str
// FIXME: perhaps we should have a more abstract macro that indicates when
// going 4 bytes at a time is unsafe
--#if CPU(ARM) || CPU(SH4)
-+#if CPU(ARM) || CPU(SH4) || CPU(PPC) || CPU(PPC64) || CPU(SPARC) || CPU(SPARC64) || CPU(MIPS)
+-#if CPU(ARM) || CPU(SH4) || CPU(MIPS)
++#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(PPC) || CPU(PPC64) || CPU(SPARC) || CPU(SPARC64)
const UChar* stringCharacters = string->characters();
for (unsigned i = 0; i != length; ++i) {
if (*stringCharacters++ != *characters++)
diff --git a/www/webkit-gtk/patches/patch-ah b/www/webkit-gtk/patches/patch-ah
index d825427440d..4bbeee7aded 100644
--- a/www/webkit-gtk/patches/patch-ah
+++ b/www/webkit-gtk/patches/patch-ah
@@ -1,17 +1,13 @@
-$NetBSD: patch-ah,v 1.2 2011/03/14 00:15:32 wiz Exp $
+$NetBSD: patch-ah,v 1.3 2011/06/09 11:00:01 drochner Exp $
-Same as patch-ag.
-
-https://bugs.webkit.org/show_bug.cgi?id=56247
-
---- WebCore/platform/text/StringHash.h.orig 2010-09-10 15:20:33.000000000 +0200
-+++ WebCore/platform/text/StringHash.h 2011-03-12 13:04:40.000000000 +0100
-@@ -54,7 +54,7 @@ namespace WebCore {
+--- Source/JavaScriptCore/wtf/text/StringHash.h.orig 2011-03-21 18:41:46.000000000 +0000
++++ Source/JavaScriptCore/wtf/text/StringHash.h
+@@ -55,7 +55,7 @@ namespace WTF {
// FIXME: perhaps we should have a more abstract macro that indicates when
// going 4 bytes at a time is unsafe
--#if CPU(ARM) || CPU(SH4)
-+#if CPU(ARM) || CPU(SH4) || CPU(PPC) || CPU(PPC64) || CPU(SPARC) || CPU(SPARC64) || CPU(MIPS)
+-#if CPU(ARM) || CPU(SH4) || CPU(MIPS)
++#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(PPC) || CPU(PPC64) || CPU(SPARC) || CPU(SPARC64)
const UChar* aChars = a->characters();
const UChar* bChars = b->characters();
for (unsigned i = 0; i != aLength; ++i) {
diff --git a/www/webkit-gtk/patches/patch-ba b/www/webkit-gtk/patches/patch-ba
deleted file mode 100644
index a69fcfd8a07..00000000000
--- a/www/webkit-gtk/patches/patch-ba
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ba,v 1.3 2011/03/15 21:58:56 drochner Exp $
-
---- WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp.orig 2011-02-07 17:29:58.000000000 +0000
-+++ WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp
-@@ -343,7 +343,7 @@ bool GIFImageDecoder::initFrameBuffer(un
-
- if ((prevMethod == RGBA32Buffer::DisposeNotSpecified) || (prevMethod == RGBA32Buffer::DisposeKeep)) {
- // Preserve the last frame as the starting state for this frame.
-- if (!buffer->copyBitmapData(*prevBuffer));
-+ if (!buffer->copyBitmapData(*prevBuffer))
- return setFailed();
- } else {
- // We want to clear the previous frame to transparent, without
-@@ -357,7 +357,7 @@ bool GIFImageDecoder::initFrameBuffer(un
- return setFailed();
- } else {
- // Copy the whole previous buffer, then clear just its frame.
-- if (!buffer->copyBitmapData(*prevBuffer));
-+ if (!buffer->copyBitmapData(*prevBuffer))
- return setFailed();
- for (int y = prevRect.y(); y < prevRect.bottom(); ++y) {
- for (int x = prevRect.x(); x < prevRect.right(); ++x)
diff --git a/www/webkit-gtk/patches/patch-bb b/www/webkit-gtk/patches/patch-bb
deleted file mode 100644
index f0967e652e8..00000000000
--- a/www/webkit-gtk/patches/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bb,v 1.3 2011/03/15 21:58:56 drochner Exp $
-
---- WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp.orig 2010-09-10 13:20:33.000000000 +0000
-+++ WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
-@@ -184,6 +184,8 @@ static inline void drawPathShadow(Graphi
-
- // Create suitably-sized ImageBuffer to hold the shadow.
- OwnPtr<ImageBuffer> shadowBuffer = ImageBuffer::create(shadowBufferSize);
-+ if (!shadowBuffer)
-+ return;
-
- // Draw shadow into a new ImageBuffer.
- cairo_t* shadowContext = shadowBuffer->context()->platformContext();
diff --git a/www/webkit-gtk/patches/patch-bc b/www/webkit-gtk/patches/patch-bc
deleted file mode 100644
index 7dfc1d0933d..00000000000
--- a/www/webkit-gtk/patches/patch-bc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-bc,v 1.3 2011/04/13 16:19:15 drochner Exp $
-
-CVE-2010-1806
-
---- WebCore/rendering/RenderObjectChildList.cpp.orig 2010-09-28 21:44:50.000000000 +0000
-+++ WebCore/rendering/RenderObjectChildList.cpp
-@@ -52,7 +52,11 @@ void RenderObjectChildList::destroyLefto
- while (firstChild()) {
- if (firstChild()->isListMarker() || (firstChild()->style()->styleType() == FIRST_LETTER && !firstChild()->isText()))
- firstChild()->remove(); // List markers are owned by their enclosing list and so don't get destroyed by this container. Similarly, first letters are destroyed by their remaining text fragment.
-- else {
-+ else if (firstChild()->isRunIn() && firstChild()->node()) {
-+ firstChild()->node()->setRenderer(0);
-+ firstChild()->node()->setNeedsStyleRecalc();
-+ firstChild()->destroy();
-+ } else {
- // Destroy any anonymous children remaining in the render tree, as well as implicit (shadow) DOM elements like those used in the engine-based text fields.
- if (firstChild()->node())
- firstChild()->node()->setRenderer(0);
diff --git a/www/webkit-gtk/patches/patch-bd b/www/webkit-gtk/patches/patch-bd
deleted file mode 100644
index c9668249c8c..00000000000
--- a/www/webkit-gtk/patches/patch-bd
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bd,v 1.3 2011/04/13 16:19:15 drochner Exp $
-
-CVE-2010-1806
-
---- WebCore/rendering/RenderBlock.cpp.orig 2011-02-07 17:29:58.000000000 +0000
-+++ WebCore/rendering/RenderBlock.cpp
-@@ -544,6 +544,8 @@ void RenderBlock::removeChild(RenderObje
- (!oldChild->isRenderBlock() || !toRenderBlock(oldChild)->inlineContinuation()) &&
- (!prev || (prev->isAnonymousBlock() && prev->childrenInline())) &&
- (!next || (next->isAnonymousBlock() && next->childrenInline()));
-+ if (prev && prev->firstChild() && prev->firstChild()->isInline() && prev->firstChild()->isRunIn())
-+ canDeleteAnonymousBlocks = false;
- if (canDeleteAnonymousBlocks && prev && next) {
- // Take all the children out of the |next| block and put them in
- // the |prev| block.
diff --git a/www/webkit-gtk/patches/patch-ca b/www/webkit-gtk/patches/patch-ca
deleted file mode 100644
index b2014e2545d..00000000000
--- a/www/webkit-gtk/patches/patch-ca
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ca,v 1.3 2011/04/14 18:11:45 drochner Exp $
-
---- WebCore/css/CSSCanvasValue.cpp.orig 2010-09-10 13:20:33.000000000 +0000
-+++ WebCore/css/CSSCanvasValue.cpp
-@@ -34,7 +34,7 @@ namespace WebCore {
- CSSCanvasValue::~CSSCanvasValue()
- {
- if (m_element)
-- m_element->setObserver(0);
-+ m_element->removeObserver(this);
- }
-
- String CSSCanvasValue::cssText() const
-@@ -79,7 +79,7 @@ HTMLCanvasElement* CSSCanvasValue::eleme
- m_element = document->getCSSCanvasElement(m_name);
- if (!m_element)
- return 0;
-- m_element->setObserver(this);
-+ m_element->addObserver(this);
- }
- return m_element;
- }
diff --git a/www/webkit-gtk/patches/patch-cb b/www/webkit-gtk/patches/patch-cb
deleted file mode 100644
index dc9c9d59f83..00000000000
--- a/www/webkit-gtk/patches/patch-cb
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-cb,v 1.1 2011/04/14 18:11:45 drochner Exp $
-
---- WebCore/css/CSSFontFaceSource.cpp.orig 2010-09-10 13:20:33.000000000 +0000
-+++ WebCore/css/CSSFontFaceSource.cpp
-@@ -75,6 +75,18 @@ void CSSFontFaceSource::pruneTable()
- m_fontDataTable.clear();
- }
-
-+#if ENABLE(SVG_FONTS)
-+SVGFontFaceElement* CSSFontFaceSource::svgFontFaceElement() const
-+{
-+ return m_svgFontFaceElement.get();
-+}
-+
-+void CSSFontFaceSource::setSVGFontFaceElement(PassRefPtr<SVGFontFaceElement> element)
-+{
-+ m_svgFontFaceElement = element;
-+}
-+#endif
-+
- bool CSSFontFaceSource::isLoaded() const
- {
- if (m_font)
-@@ -168,7 +180,7 @@ SimpleFontData* CSSFontFaceSource::getFo
- #if ENABLE(SVG_FONTS)
- // In-Document SVG Fonts
- if (m_svgFontFaceElement) {
-- SVGFontData* svgFontData = new SVGFontData(m_svgFontFaceElement);
-+ SVGFontData* svgFontData = new SVGFontData(m_svgFontFaceElement.get());
- fontData.set(new SimpleFontData(FontPlatformData(fontDescription.computedPixelSize(), syntheticBold, syntheticItalic), true, false, svgFontData));
- }
- #endif
diff --git a/www/webkit-gtk/patches/patch-cc b/www/webkit-gtk/patches/patch-cc
deleted file mode 100644
index fd2e70ca6cb..00000000000
--- a/www/webkit-gtk/patches/patch-cc
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-cc,v 1.1 2011/04/14 18:11:45 drochner Exp $
-
---- WebCore/css/CSSFontFaceSource.h.orig 2010-09-10 13:20:33.000000000 +0000
-+++ WebCore/css/CSSFontFaceSource.h
-@@ -62,8 +62,8 @@ public:
- void pruneTable();
-
- #if ENABLE(SVG_FONTS)
-- SVGFontFaceElement* svgFontFaceElement() const { return m_svgFontFaceElement; }
-- void setSVGFontFaceElement(SVGFontFaceElement* element) { m_svgFontFaceElement = element; }
-+ SVGFontFaceElement* svgFontFaceElement() const;
-+ void setSVGFontFaceElement(PassRefPtr<SVGFontFaceElement>);
- #endif
-
- private:
-@@ -73,7 +73,7 @@ private:
- HashMap<unsigned, SimpleFontData*> m_fontDataTable; // The hash key is composed of size synthetic styles.
-
- #if ENABLE(SVG_FONTS)
-- SVGFontFaceElement* m_svgFontFaceElement;
-+ RefPtr<SVGFontFaceElement> m_svgFontFaceElement;
- RefPtr<SVGFontElement> m_externalSVGFontElement;
- #endif
- };
diff --git a/www/webkit-gtk/patches/patch-cd b/www/webkit-gtk/patches/patch-cd
deleted file mode 100644
index a404ec71b4d..00000000000
--- a/www/webkit-gtk/patches/patch-cd
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-cd,v 1.1 2011/04/14 18:11:45 drochner Exp $
-
---- WebCore/dom/Document.cpp.orig 2011-04-14 10:45:05.000000000 +0000
-+++ WebCore/dom/Document.cpp
-@@ -2870,6 +2870,18 @@ void Document::detachNodeIterator(NodeIt
- m_nodeIterators.remove(ni);
- }
-
-+void Document::moveNodeIteratorsToNewDocument(Node* node, Document* newDocument)
-+{
-+ HashSet<NodeIterator*> nodeIteratorsList = m_nodeIterators;
-+ HashSet<NodeIterator*>::const_iterator nodeIteratorsEnd = nodeIteratorsList.end();
-+ for (HashSet<NodeIterator*>::const_iterator it = nodeIteratorsList.begin(); it != nodeIteratorsEnd; ++it) {
-+ if ((*it)->root() == node) {
-+ detachNodeIterator(*it);
-+ newDocument->attachNodeIterator(*it);
-+ }
-+ }
-+}
-+
- void Document::nodeChildrenChanged(ContainerNode* container)
- {
- if (!disableRangeMutation(page())) {
diff --git a/www/webkit-gtk/patches/patch-ce b/www/webkit-gtk/patches/patch-ce
deleted file mode 100644
index 277a4aae952..00000000000
--- a/www/webkit-gtk/patches/patch-ce
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ce,v 1.1 2011/04/14 18:11:45 drochner Exp $
-
---- WebCore/dom/Document.h.orig 2010-09-10 13:20:33.000000000 +0000
-+++ WebCore/dom/Document.h
-@@ -606,6 +606,7 @@ public:
-
- void attachNodeIterator(NodeIterator*);
- void detachNodeIterator(NodeIterator*);
-+ void moveNodeIteratorsToNewDocument(Node*, Document*);
-
- void attachRange(Range*);
- void detachRange(Range*);
diff --git a/www/webkit-gtk/patches/patch-cf b/www/webkit-gtk/patches/patch-cf
deleted file mode 100644
index 024025cf2c6..00000000000
--- a/www/webkit-gtk/patches/patch-cf
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-cf,v 1.1 2011/04/14 18:11:45 drochner Exp $
-
---- WebCore/dom/Node.cpp.orig 2010-09-28 21:45:32.000000000 +0000
-+++ WebCore/dom/Node.cpp
-@@ -522,8 +522,10 @@ void Node::setDocument(Document* documen
- document->addNodeListCache();
- }
-
-- if (m_document)
-+ if (m_document) {
-+ m_document->moveNodeIteratorsToNewDocument(this, document);
- m_document->selfOnlyDeref();
-+ }
-
- m_document = document;
-
diff --git a/www/webkit-gtk/patches/patch-cg b/www/webkit-gtk/patches/patch-cg
deleted file mode 100644
index 89cc9e27993..00000000000
--- a/www/webkit-gtk/patches/patch-cg
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-cg,v 1.1 2011/04/14 18:11:45 drochner Exp $
-
---- WebCore/html/HTMLCanvasElement.cpp.orig 2010-09-10 13:20:33.000000000 +0000
-+++ WebCore/html/HTMLCanvasElement.cpp
-@@ -67,7 +67,6 @@ const float HTMLCanvasElement::MaxCanvas
- HTMLCanvasElement::HTMLCanvasElement(const QualifiedName& tagName, Document* doc)
- : HTMLElement(tagName, doc)
- , m_size(defaultWidth, defaultHeight)
-- , m_observer(0)
- , m_originClean(true)
- , m_ignoreReset(false)
- , m_createdImageBuffer(false)
-@@ -77,8 +76,9 @@ HTMLCanvasElement::HTMLCanvasElement(con
-
- HTMLCanvasElement::~HTMLCanvasElement()
- {
-- if (m_observer)
-- m_observer->canvasDestroyed(this);
-+ HashSet<CanvasObserver*>::iterator end = m_observers.end();
-+ for (HashSet<CanvasObserver*>::iterator it = m_observers.begin(); it != end; ++it)
-+ (*it)->canvasDestroyed(this);
- }
-
- #if ENABLE(DASHBOARD_SUPPORT)
-@@ -123,6 +123,16 @@ RenderObject* HTMLCanvasElement::createR
- return HTMLElement::createRenderer(arena, style);
- }
-
-+void HTMLCanvasElement::addObserver(CanvasObserver* observer)
-+{
-+ m_observers.add(observer);
-+}
-+
-+void HTMLCanvasElement::removeObserver(CanvasObserver* observer)
-+{
-+ m_observers.remove(observer);
-+}
-+
- void HTMLCanvasElement::setHeight(int value)
- {
- setAttribute(heightAttr, String::number(value));
-@@ -206,9 +216,10 @@ void HTMLCanvasElement::willDraw(const F
- m_dirtyRect.unite(r);
- ro->repaintRectangle(enclosingIntRect(m_dirtyRect));
- }
--
-- if (m_observer)
-- m_observer->canvasChanged(this, rect);
-+
-+ HashSet<CanvasObserver*>::iterator end = m_observers.end();
-+ for (HashSet<CanvasObserver*>::iterator it = m_observers.begin(); it != end; ++it)
-+ (*it)->canvasChanged(this, rect);
- }
-
- void HTMLCanvasElement::reset()
-@@ -247,8 +258,9 @@ void HTMLCanvasElement::reset()
- }
- }
-
-- if (m_observer)
-- m_observer->canvasResized(this);
-+ HashSet<CanvasObserver*>::iterator end = m_observers.end();
-+ for (HashSet<CanvasObserver*>::iterator it = m_observers.begin(); it != end; ++it)
-+ (*it)->canvasResized(this);
- }
-
- void HTMLCanvasElement::paint(GraphicsContext* context, const IntRect& r)
diff --git a/www/webkit-gtk/patches/patch-ch b/www/webkit-gtk/patches/patch-ch
deleted file mode 100644
index c81b9a20269..00000000000
--- a/www/webkit-gtk/patches/patch-ch
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ch,v 1.1 2011/04/14 18:11:45 drochner Exp $
-
---- WebCore/html/HTMLCanvasElement.h.orig 2010-09-10 13:20:33.000000000 +0000
-+++ WebCore/html/HTMLCanvasElement.h
-@@ -99,7 +99,8 @@ public:
- void setOriginTainted() { m_originClean = false; }
- bool originClean() const { return m_originClean; }
-
-- void setObserver(CanvasObserver* observer) { m_observer = observer; }
-+ void addObserver(CanvasObserver* observer);
-+ void removeObserver(CanvasObserver* observer);
-
- AffineTransform baseTransform() const;
-
-@@ -127,7 +128,7 @@ private:
-
- OwnPtr<CanvasRenderingContext> m_context;
- IntSize m_size;
-- CanvasObserver* m_observer;
-+ HashSet<CanvasObserver*> m_observers;
-
- bool m_originClean;
- bool m_ignoreReset;
diff --git a/www/webkit-gtk/patches/patch-ci b/www/webkit-gtk/patches/patch-ci
deleted file mode 100644
index af7e494ffb7..00000000000
--- a/www/webkit-gtk/patches/patch-ci
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ci,v 1.1 2011/04/14 18:11:45 drochner Exp $
-
---- WebCore/inspector/InspectorDOMStorageResource.cpp.orig 2010-09-10 13:20:33.000000000 +0000
-+++ WebCore/inspector/InspectorDOMStorageResource.cpp
-@@ -101,7 +101,9 @@ void InspectorDOMStorageResource::startR
- void InspectorDOMStorageResource::handleEvent(ScriptExecutionContext*, Event* event)
- {
- ASSERT(m_frontend);
-- ASSERT(eventNames().storageEvent == event->type());
-+ if (event->type() != eventNames().storageEvent || !event->isStorageEvent())
-+ return;
-+
- StorageEvent* storageEvent = static_cast<StorageEvent*>(event);
- Storage* storage = storageEvent->storageArea();
- ExceptionCode ec = 0;
diff --git a/www/webkit-gtk/patches/patch-cj b/www/webkit-gtk/patches/patch-cj
deleted file mode 100644
index f90198cd002..00000000000
--- a/www/webkit-gtk/patches/patch-cj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cj,v 1.1 2011/04/14 18:11:45 drochner Exp $
-
---- WebCore/loader/ImageDocument.cpp.orig 2010-09-10 13:20:33.000000000 +0000
-+++ WebCore/loader/ImageDocument.cpp
-@@ -368,7 +368,7 @@ void ImageEventListener::handleEvent(Scr
- {
- if (event->type() == eventNames().resizeEvent)
- m_doc->windowSizeChanged();
-- else if (event->type() == eventNames().clickEvent) {
-+ else if (event->type() == eventNames().clickEvent && event->isMouseEvent()) {
- MouseEvent* mouseEvent = static_cast<MouseEvent*>(event);
- m_doc->imageClicked(mouseEvent->x(), mouseEvent->y());
- }
diff --git a/www/webkit-gtk/patches/patch-ck b/www/webkit-gtk/patches/patch-ck
deleted file mode 100644
index 5ffeb239f78..00000000000
--- a/www/webkit-gtk/patches/patch-ck
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ck,v 1.1 2011/04/14 18:11:45 drochner Exp $
-
---- WebCore/page/animation/AnimationController.cpp.orig 2010-09-10 13:20:33.000000000 +0000
-+++ WebCore/page/animation/AnimationController.cpp
-@@ -138,16 +138,16 @@ void AnimationControllerPrivate::updateS
- RefPtr<Frame> protector = m_frame;
-
- // fire all the events
-- Vector<EventToDispatch>::const_iterator eventsToDispatchEnd = m_eventsToDispatch.end();
-- for (Vector<EventToDispatch>::const_iterator it = m_eventsToDispatch.begin(); it != eventsToDispatchEnd; ++it) {
-+ Vector<EventToDispatch> eventsToDispatch = m_eventsToDispatch;
-+ m_eventsToDispatch.clear();
-+ Vector<EventToDispatch>::const_iterator eventsToDispatchEnd = eventsToDispatch.end();
-+ for (Vector<EventToDispatch>::const_iterator it = eventsToDispatch.begin(); it != eventsToDispatchEnd; ++it) {
- if (it->eventType == eventNames().webkitTransitionEndEvent)
- it->element->dispatchEvent(WebKitTransitionEvent::create(it->eventType, it->name, it->elapsedTime));
- else
- it->element->dispatchEvent(WebKitAnimationEvent::create(it->eventType, it->name, it->elapsedTime));
- }
-
-- m_eventsToDispatch.clear();
--
- // call setChanged on all the elements
- Vector<RefPtr<Node> >::const_iterator nodeChangesToDispatchEnd = m_nodeChangesToDispatch.end();
- for (Vector<RefPtr<Node> >::const_iterator it = m_nodeChangesToDispatch.begin(); it != nodeChangesToDispatchEnd; ++it)
diff --git a/www/webkit-gtk/patches/patch-cl b/www/webkit-gtk/patches/patch-cl
deleted file mode 100644
index 1347bea888d..00000000000
--- a/www/webkit-gtk/patches/patch-cl
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-cl,v 1.1 2011/04/14 18:11:45 drochner Exp $
-
---- WebCore/svg/SVGElementInstance.cpp.orig 2010-09-10 13:20:33.000000000 +0000
-+++ WebCore/svg/SVGElementInstance.cpp
-@@ -103,7 +103,8 @@ void SVGElementInstance::invalidateAllIn
- const HashSet<SVGElementInstance*>::const_iterator end = set.end();
- for (HashSet<SVGElementInstance*>::const_iterator it = set.begin(); it != end; ++it) {
- ASSERT((*it)->correspondingElement() == element);
-- (*it)->correspondingUseElement()->invalidateShadowTree();
-+ if (SVGUseElement* element = (*it)->correspondingUseElement())
-+ element->invalidateShadowTree();
- }
- }
-
diff --git a/www/webkit-gtk/patches/patch-cm b/www/webkit-gtk/patches/patch-cm
deleted file mode 100644
index fc4c835cde9..00000000000
--- a/www/webkit-gtk/patches/patch-cm
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-cm,v 1.1 2011/04/14 18:11:45 drochner Exp $
-
---- WebCore/svg/SVGElementInstance.h.orig 2010-09-10 13:20:33.000000000 +0000
-+++ WebCore/svg/SVGElementInstance.h
-@@ -57,6 +57,7 @@ namespace WebCore {
- SVGElement* correspondingElement() const { return m_element.get(); }
- SVGUseElement* correspondingUseElement() const { return m_useElement; }
- SVGElement* shadowTreeElement() const { return m_shadowTreeElement.get(); }
-+ void clearUseElement() { m_useElement = 0; }
-
- SVGElementInstance* parentNode() const { return parent(); }
- PassRefPtr<SVGElementInstanceList> childNodes();
diff --git a/www/webkit-gtk/patches/patch-cn b/www/webkit-gtk/patches/patch-cn
deleted file mode 100644
index 2c976f7f113..00000000000
--- a/www/webkit-gtk/patches/patch-cn
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-cn,v 1.1 2011/04/14 18:11:45 drochner Exp $
-
---- WebCore/svg/SVGFontFaceElement.cpp.orig 2010-09-10 13:20:33.000000000 +0000
-+++ WebCore/svg/SVGFontFaceElement.cpp
-@@ -262,6 +262,11 @@ String SVGFontFaceElement::fontFamily()
- return m_styleDeclaration->getPropertyValue(CSSPropertyFontFamily);
- }
-
-+SVGFontElement* SVGFontFaceElement::associatedFontElement() const
-+{
-+ return m_fontElement.get();
-+}
-+
- void SVGFontFaceElement::rebuildFontFace()
- {
- ASSERT(inDocument());
diff --git a/www/webkit-gtk/patches/patch-co b/www/webkit-gtk/patches/patch-co
deleted file mode 100644
index d2b3ca8bbd1..00000000000
--- a/www/webkit-gtk/patches/patch-co
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-co,v 1.1 2011/04/14 18:11:45 drochner Exp $
-
---- WebCore/svg/SVGFontFaceElement.h.orig 2010-09-10 13:20:33.000000000 +0000
-+++ WebCore/svg/SVGFontFaceElement.h
-@@ -54,7 +54,7 @@ namespace WebCore {
- int descent() const;
- String fontFamily() const;
-
-- SVGFontElement* associatedFontElement() const { return m_fontElement; }
-+ SVGFontElement* associatedFontElement() const;
- void rebuildFontFace();
- void removeFromMappedElementSheet();
-
-@@ -62,7 +62,7 @@ namespace WebCore {
- RefPtr<CSSFontFaceRule> m_fontFaceRule;
- RefPtr<CSSMutableStyleDeclaration> m_styleDeclaration;
-
-- SVGFontElement* m_fontElement;
-+ RefPtr<SVGFontElement> m_fontElement;
- };
-
- } // namespace WebCore
diff --git a/www/webkit-gtk/patches/patch-cp b/www/webkit-gtk/patches/patch-cp
deleted file mode 100644
index e9a6d1d2052..00000000000
--- a/www/webkit-gtk/patches/patch-cp
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-cp,v 1.1 2011/04/14 18:11:45 drochner Exp $
-
---- WebCore/svg/SVGUseElement.cpp.orig 2011-02-07 17:29:58.000000000 +0000
-+++ WebCore/svg/SVGUseElement.cpp
-@@ -128,7 +128,7 @@ void SVGUseElement::insertedIntoDocument
-
- void SVGUseElement::removedFromDocument()
- {
-- m_targetElementInstance = 0;
-+ detachInstance();
- SVGElement::removedFromDocument();
- }
-
-@@ -455,8 +455,7 @@ void SVGUseElement::buildShadowAndInstan
- if (targetElement && targetElement->isSVGElement())
- target = static_cast<SVGElement*>(targetElement);
-
-- if (m_targetElementInstance)
-- m_targetElementInstance = 0;
-+ detachInstance();
-
- // Do not allow self-referencing.
- // 'target' may be null, if it's a non SVG namespaced element.
-@@ -482,7 +481,7 @@ void SVGUseElement::buildShadowAndInstan
- // SVG specification does not say a word about <use> & cycles. My view on this is: just ignore it!
- // Non-appearing <use> content is easier to debug, then half-appearing content.
- if (foundProblem) {
-- m_targetElementInstance = 0;
-+ detachInstance();
- return;
- }
-
-@@ -515,7 +514,7 @@ void SVGUseElement::buildShadowAndInstan
- // Do NOT leave an inconsistent instance tree around, instead destruct it.
- if (!m_targetElementInstance->shadowTreeElement()) {
- shadowRoot->removeAllChildren();
-- m_targetElementInstance = 0;
-+ detachInstance();
- return;
- }
-
-@@ -551,6 +550,14 @@ void SVGUseElement::buildShadowAndInstan
- updateContainerSizes();
- }
-
-+void SVGUseElement::detachInstance()
-+{
-+ if (!m_targetElementInstance)
-+ return;
-+ m_targetElementInstance->clearUseElement();
-+ m_targetElementInstance = 0;
-+}
-+
- RenderObject* SVGUseElement::createRenderer(RenderArena* arena, RenderStyle*)
- {
- return new (arena) RenderSVGShadowTreeRootContainer(this);
-@@ -572,7 +579,7 @@ void SVGUseElement::attach()
-
- void SVGUseElement::detach()
- {
-- m_targetElementInstance = 0;
-+ detachInstance();
- SVGStyledTransformableElement::detach();
- }
-
diff --git a/www/webkit-gtk/patches/patch-cq b/www/webkit-gtk/patches/patch-cq
deleted file mode 100644
index fc17865829b..00000000000
--- a/www/webkit-gtk/patches/patch-cq
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-cq,v 1.1 2011/04/14 18:11:45 drochner Exp $
-
---- WebCore/svg/SVGUseElement.h.orig 2010-09-10 13:20:33.000000000 +0000
-+++ WebCore/svg/SVGUseElement.h
-@@ -71,6 +71,7 @@ namespace WebCore {
- friend class RenderSVGShadowTreeRootContainer;
- bool isPendingResource() const { return m_isPendingResource; }
- void buildShadowAndInstanceTree(SVGShadowTreeRootElement*);
-+ void detachInstance();
-
- private:
- virtual bool hasRelativeValues() const;