From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 24 May 2011 11:24:40 +0100 Subject: Merge WebKit at r80534: Intial merge by Git Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61 --- Source/WebCore/WebCore.order | 38 +++++--------------------------------- 1 file changed, 5 insertions(+), 33 deletions(-) (limited to 'Source/WebCore/WebCore.order') diff --git a/Source/WebCore/WebCore.order b/Source/WebCore/WebCore.order index 136a34d..65c7d84 100644 --- a/Source/WebCore/WebCore.order +++ b/Source/WebCore/WebCore.order @@ -4397,8 +4397,6 @@ __ZN3WTF9HashTableIPNS_15ListHashSetNodeIPN7WebCore9RenderBoxEEES6_NS_17Identity __ZN3WTF11ListHashSetIPN7WebCore9RenderBoxENS_7PtrHashIS3_EEE10appendNodeEPNS_15ListHashSetNodeIS3_EE __ZN7WebCore11RenderBlock21adjustPositionedBlockEPNS_9RenderBoxERKNS0_10MarginInfoE __ZN7WebCore11RenderBlock20insertFloatingObjectEPNS_9RenderBoxE -__ZN7WebCore21DeprecatedPtrListImplC1EPFvPvE -__ZN7WebCore21DeprecatedPtrListImplC2EPFvPvE __ZN7WebCore11RenderBlock14calcPrefWidthsEv __ZN7WebCore11RenderBlock20calcInlinePrefWidthsEv __ZN7WebCore20InlineMinMaxIterator4nextEv @@ -4412,24 +4410,9 @@ __ZN7WebCore9InlineBox6removeEv __ZN7WebCore13InlineFlowBox11removeChildEPNS_9InlineBoxE __ZN7WebCore9InlineBox14dirtyLineBoxesEv __ZN7WebCore13RootInlineBox12childRemovedEPNS_9InlineBoxE -__ZN7WebCore21DeprecatedPtrListImpl6appendEPKv -__ZN7WebCore21DeprecatedPtrListImpl6insertEjPKv __ZN7WebCore11RenderBlock19adjustFloatingBlockERKNS0_10MarginInfoE -__ZN7WebCore21DeprecatedPtrListImpl4lastEv -__ZNK7WebCore21DeprecatedPtrListImpl7currentEv -__ZNK7WebCore21DeprecatedPtrListImpl7getPrevEv -__ZN7WebCore29DeprecatedPtrListImplIteratorC1ERKNS_21DeprecatedPtrListImplE -__ZN7WebCore29DeprecatedPtrListImplIteratorC2ERKNS_21DeprecatedPtrListImplE -__ZNK7WebCore21DeprecatedPtrListImpl11addIteratorEPNS_29DeprecatedPtrListImplIteratorE -__ZNK7WebCore29DeprecatedPtrListImplIterator7currentEv -__ZN7WebCore29DeprecatedPtrListImplIteratorppEv -__ZN7WebCore29DeprecatedPtrListImplIteratorD1Ev -__ZN7WebCore29DeprecatedPtrListImplIteratorD2Ev -__ZNK7WebCore21DeprecatedPtrListImpl14removeIteratorEPNS_29DeprecatedPtrListImplIteratorE -__ZN7WebCore21DeprecatedPtrListImpl4nextEv __ZN7WebCore11RenderBlock37markAllDescendantsWithFloatsForLayoutEPNS_9RenderBoxEb __ZN7WebCore11RenderBlock18addIntrudingFloatsEPS0_ii -__ZN7WebCore21DeprecatedPtrListImpl5firstEv __ZNK3WTF7HashMapIPN7WebCore12RenderObjectEPNS1_11RenderBlock14FloatingObjectENS_7PtrHashIS3_EENS_10HashTraitsIS3_EENS9_IS6_EEE __ZN7WebCore14RenderReplaced6layoutEv __ZNK7WebCore11RenderImage21minimumReplacedHeightEv @@ -5563,10 +5546,6 @@ __ZN7WebCore7cookiesEPKNS_8DocumentERKNS_4KURLE __ZThn120_N7WebCore17HTMLScriptElement17dispatchLoadEventEv __ZN7WebCore17HTMLScriptElement17dispatchLoadEventEv __ZN3WTF6VectorISt4pairIPN7WebCore17ScriptElementDataENS2_20CachedResourceHandleINS2_12CachedScriptEEEELm0EE6shrinkEm -__ZN7WebCore21DeprecatedPtrListImpl5clearEb -__ZN7WebCore17DeprecatedPtrListINS_11RenderBlock14FloatingObjectEE10deleteFuncEPv -__ZN7WebCore21DeprecatedPtrListImpl4takeEv -__ZN7WebCore21DeprecatedPtrListImpl6removeEb __ZN3WTF7HashMapIPN7WebCore12RenderObjectEPNS1_11RenderBlock14FloatingObjectENS_7PtrHashIS3_EENS_10HashTraitsIS3_EENS9_IS6_EEE3 __ZN7WebCore15RenderTableCell29clippedOverflowRectForRepaintEPNS_20RenderBoxModelObjectE __ZN7WebCore9RenderBox12imageChangedEPvPKNS_7IntRectE @@ -6906,8 +6885,6 @@ __ZN7WebCore12PluginHalter13didStopPluginEPNS_14HaltablePluginE __ZN7WebCore16ScriptController29cleanupScriptObjectsForPluginEPv __ZN7WebCore11RenderFrameD0Ev __ZN7WebCore14RenderFrameSetD0Ev -__ZN7WebCore21DeprecatedPtrListImplD1Ev -__ZN7WebCore21DeprecatedPtrListImplD2Ev __ZN7WebCore29CSSMappedAttributeDeclarationD0Ev __ZN7WebCore13StyledElement25removeMappedAttributeDeclENS_20MappedAttributeEntryERKNS_13QualifiedNameERKNS_12AtomicStringE __ZN7WebCore15HTMLLinkElementD0Ev @@ -8434,7 +8411,6 @@ __ZThn440_N7WebCore11CachedImage20shouldPauseAnimationEPKNS_5ImageE __ZN7WebCore11CachedImage20shouldPauseAnimationEPKNS_5ImageE __ZN7WebCore12RenderObject15willRenderImageEPNS_11CachedImageE __ZN7WebCore20CachedResourceClient15willRenderImageEPNS_11CachedImageE -__ZN7WebCore21DeprecatedPtrListImpl4prevEv __ZNK7WebCore13RootInlineBox19lineBreakBidiStatusEv __ZNK7WebCore13InlineFlowBox13lastLeafChildEv __ZN7WebCore9RenderBox19clearLayoutOverflowEv @@ -9093,8 +9069,6 @@ __ZN7WebCore27JSHTMLLabelElementPrototypeD1Ev __ZN7WebCore18JSHTMLLabelElementD1Ev __ZN7WebCore27JSHTMLDListElementPrototypeD1Ev __ZN7WebCore18JSHTMLDListElementD1Ev -__ZN7WebCore29DeprecatedPtrListImplIterator6toLastEv -__ZN7WebCore29DeprecatedPtrListImplIteratormmEv __ZN7WebCore15DatabaseTracker7originsERN3WTF6VectorINS1_6RefPtrINS_14SecurityOriginEEELm0EEE __ZN7WebCore17HTMLButtonElementD0Ev __ZN7WebCore12RenderInline11nodeAtPointERKNS_14HitTestRequestERNS_13HitTestResultEiiiiNS_13HitTestActionE @@ -9862,7 +9836,6 @@ __ZNK7WebCore5XPath9LogicalOp14shortCircuitOnEv __ZN7WebCore5XPath9LogicalOpD0Ev __ZN7WebCore5XPath12FunLocalNameD0Ev __ZN7WebCore14RenderListItem11updateValueEv -__ZN7WebCore21DeprecatedPtrListImpl9removeRefEPKvb __ZN7WebCore23jsHTMLAnchorElementHrefEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE __ZN7WebCore38jsDocumentPrototypeFunctionCreateEventEPN3JSC9ExecStateEPNS0_8JSObjectENS0_7JSValueERKNS0_7ArgListE __ZN7WebCore8Document11createEventERKNS_6StringERi @@ -11566,8 +11539,8 @@ __ZN7WebCore19JSHTMLAppletElement26getOwnPropertySlotDelegateEPN3JSC9ExecStateER __ZNK7WebCore17HTMLAppletElement25renderWidgetForJSBindingsEv __ZN3JSC8Bindings12JavaInstanceC1EP8_jobjectN3WTF10PassRefPtrINS0_10RootObjectEEE __ZN3JSC8Bindings12JavaInstanceC2EP8_jobjectN3WTF10PassRefPtrINS0_10RootObjectEEE -__ZN3JSC8Bindings14JObjectWrapperC1EP8_jobject -__ZN3JSC8Bindings14JObjectWrapperC2EP8_jobject +__ZN3JSC8Bindings14JobjectWrapperC1EP8_jobject +__ZN3JSC8Bindings14JobjectWrapperC2EP8_jobject __ZN3JSC8Bindings9getJNIEnvEv __ZN3JSC8Bindings9getJavaVMEv __ZN3JSC8BindingsL20KJSGetCreatedJavaVMsEPP7JavaVM_iPi @@ -11615,8 +11588,8 @@ __ZN3JSC8Bindings12JavaInstanceD0Ev __ZN3JSC8Bindings9JavaClassD0Ev __ZN3WTF20deleteAllPairSecondsIPN3JSC8Bindings5FieldEKNS_7HashMapINS_6RefPtrIN7WebCore10StringImplEEES4_NS7_10StringHashENS_10H __ZN3JSC8Bindings9JavaFieldD0Ev -__ZN3JSC8Bindings14JObjectWrapperD1Ev -__ZN3JSC8Bindings14JObjectWrapperD2Ev +__ZN3JSC8Bindings14JobjectWrapperD1Ev +__ZN3JSC8Bindings14JobjectWrapperD2Ev __ZN3WTF15deleteAllValuesIPN3JSC8Bindings6MethodELm0EEEvRKNS_6VectorIT_XT0_EEE __ZN3JSC8Bindings10JavaMethodD0Ev __ZN3JSC8Bindings13JavaParameterD1Ev @@ -12959,7 +12932,7 @@ __ZN7WebCore44jsDocumentPrototypeFunctionQueryCommandStateEPN3JSC9ExecStateEPNS0 __ZN7WebCore8Document17queryCommandStateERKNS_6StringE __ZN7WebCoreL9stateBoldEPNS_5FrameEPNS_5EventE __ZN7WebCoreL10stateStyleEPNS_5FrameEiPKc -__ZNK7WebCore6Editor17selectionHasStyleEPNS_19CSSStyleDeclarationE +__ZNK7WebCore6Editor17selectionHasStyleEiRKN3WTF6StringE __ZNK7WebCore5Frame22selectionComputedStyleERPNS_4NodeE __ZN7WebCoreL11stateItalicEPNS_5FrameEPNS_5EventE __ZN7WebCoreL14stateUnderlineEPNS_5FrameEPNS_5EventE @@ -17668,7 +17641,6 @@ __ZNK7WebCore17InsertListCommand20preservesTypingStyleEv __ZNK7WebCore17InsertListCommand13editingActionEv __ZN7WebCoreL17executeToggleBoldEPNS_5FrameEPNS_5EventENS_19EditorCommandSourceERKNS_6StringE __ZN7WebCoreL18executeToggleStyleEPNS_5FrameENS_19EditorCommandSourceENS_10EditActionEiPKcS5_ -__ZNK7WebCore6Editor22selectionStartHasStyleEPNS_19CSSStyleDeclarationE __ZN7WebCoreL30triStateOfStyleInComputedStyleEPNS_19CSSStyleDeclarationEPNS_27CSSComputedStyleDeclarationEb __ZN7WebCoreL14executeOutdentEPNS_5FrameEPNS_5EventENS_19EditorCommandSourceERKNS_6StringE __ZN7WebCore20IndentOutdentCommand13outdentRegionERKNS_15VisiblePositionES3_ -- cgit v1.1