Attachment #15392 for bug #13250




}

bool Document::setFocusedNode(PassRefPtr<Node> newFocusedNode)
{
    ASSERT(!m_inPageCache);

    // If newFocusedNode is not in this document, just return true without doing anything.
    if (newFocusedNode && newFocusedNode->document() != this)
        return true;

    if (m_focusedNode == newFocusedNode)
        return true;

    bool focusChangeBlocked = false;
    RefPtr<Node> oldFocusedNode = m_focusedNode.release();
    m_focusedNode = 0;

    // Remove focus from the existing focus node (if any)
    if (oldFocusedNode && !oldFocusedNode->m_inDetach) { 

        oldFocusedNode->setFocus(false);
                
        // Dispatch a change event for text fields or textareas that have been edited
        RenderObject* r = static_cast<RenderObject*>(oldFocusedNode->renderer());
        if (r && (r->isTextArea() || r->isTextField()) && r->isEdited()) {
            EventTargetNodeCast(oldFocusedNode.get())->dispatchHTMLEvent(changeEvent, true, false);
            if ((r = static_cast<RenderObject*>(oldFocusedNode->renderer())))
                r->setEdited(false);
        }


            focusChangeBlocked = true;
            newFocusedNode = 0;
        }
        if (oldFocusedNode == this && oldFocusedNode->hasOneRef())
            return true;
            
        if (oldFocusedNode == oldFocusedNode->rootEditableElement())
            frame()->editor()->didEndEditing();
    }


            focusChangeBlocked = true;
            goto SetFocusedNodeDone;
        }

        // Set focus on the new node
        m_focusedNode = newFocusedNode.get();


            focusChangeBlocked = true;
            goto SetFocusedNodeDone;
        }

        EventTargetNodeCast(m_focusedNode.get())->dispatchUIEvent(DOMFocusInEvent);

        if (m_focusedNode != newFocusedNode) { 
            // handler shifted focus
            focusChangeBlocked = true;
            goto SetFocusedNodeDone;
        }

        m_focusedNode->setFocus();

        if (m_focusedNode == m_focusedNode->rootEditableElement())
            frame()->editor()->didBeginEditing();

        // eww, I suck. set the qt focus correctly
        // ### find a better place in the code for this
        if (view()) {
            Widget *focusWidget = widgetForNode(m_focusedNode.get());
            if (focusWidget) {

SetFocusedNodeDone:
    updateRendering();
    return !focusChangeBlocked;
}
  
void Document::setCSSTarget(Node* n)
{




/*
 * Copyright (C) 2007 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions

        "%tag1 is not allowed inside %tag2. Moving %tag1 into the nearest enclosing <table>.",
        "<head> must be a child of <html>. Content ignored.",
        "%tag1 is not allowed inside %tag2. Moving %tag1 into the <head>.",
        "Extra %tag1 encountered. Migrating attributes back to the original %tag1 element and ignoring the tag.",
        "<area> is not allowed inside %tag1. Moving the <area> into the nearest enclosing <map>.",
        "%tag1 is not allowed inside %tag2. Content ignored.",
        "%tag1 is not allowed in a <frameset> page. Content ignored.",

        "<table> is not allowed inside %tag1. Closing the current <table> and inserting the new <table> as a sibling.",
        "%tag1 is not allowed inside %tag2. Inserting %tag1 before the <table> instead.",
        "%tag1 misplaced in <table>. Creating %tag2 and putting %tag1 inside it.",
        "</br> encountered. Converting </br> into <br>.",
        "XML self-closing tag syntax used on %tag1. The tag will not be closed.",
        "Unmatched </p> encountered. Converting </p> into <p></p>.",
        "Unmatched %tag1 encountered. Ignoring tag.",
        "%tag1 misnested or not properly closed. Cloning %tag1 in order to preserve the styles applied by it.",
        "<form> cannot act as a container inside %tag1 without disrupting the table. The children of the <form> will be placed inside the %tag1 instead.",
        "XML self-closing tag syntax used on <script>. The tag will be closed by WebKit, but not all browsers do this. Change to <script></script> instead for best cross-browser compatibility."
    };
     
    if (errorCode >= MisplacedTablePartError && errorCode <= IncorrectXMLCloseScriptWarning)

Lines 700-706 static JSObjectRef objectForResponse(JSC Link Here

(-)WebCore/page/InspectorController.cpp (-1 / +4 lines)
700	JSObjectRef InspectorController::addScriptResource(InspectorResource* resource)	700	JSObjectRef InspectorController::addScriptResource(InspectorResource* resource)
701	{	701	{
702	ASSERT_ARG(resource, resource);	702	ASSERT_ARG(resource, resource);
703	ASSERT(!resource->scriptObject);	703
		704	// This happens for pages loaded from the back/forward cache.
		705	if (resource->scriptObject)
		706	return resource->scriptObject;
704		707
705	ASSERT(m_scriptContext);	708	ASSERT(m_scriptContext);
706	ASSERT(m_scriptObject);	709	ASSERT(m_scriptObject);

Lines 1317-1323 Link Here

(-)WebKit/WebKit.xcodeproj/project.pbxproj (-1 lines)
1317	0867D690FE84028FC02AAC07 /* Project object */ = {	1317	0867D690FE84028FC02AAC07 /* Project object */ = {
1318	isa = PBXProject;	1318	isa = PBXProject;
1319	buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKit" */;	1319	buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKit" */;
1320	compatibilityVersion = "Xcode 2.4";
1321	hasScannedForEncodings = 1;	1320	hasScannedForEncodings = 1;
1322	knownRegions = (	1321	knownRegions = (
1323	English,	1322	English,

Lines 2568-2574 static NSURL* uniqueURLWithRelativePart( Link Here

(-)WebKit/WebView/WebHTMLView.mm (-1 / +7 lines)
2568	Document* document = coreFrame->document();	2568	Document* document = coreFrame->document();
2569	if (!document)	2569	if (!document)
2570	return;	2570	return;
2571		2571
		2572	// FIXME: This can only happen because dispatchDidCommitLoad gets called while the Frame still points
		2573	// to a document that has been moved into the back/forward cache. If we fix that, then we can remove
		2574	// those code.
		2575	if (document->inPageCache())
		2576	return;
		2577
2572	document->setFocusedNode(0);	2578	document->setFocusedNode(0);
2573	}	2579	}
2574		2580

Return to bug 13250

Lines 2127-2143 void Document::setDashboardRegions(const Link Here

(-)WebCore/dom/Document.cpp (-14 / +17 lines)
2127	}	2127	}
2128		2128
2129	bool Document::setFocusedNode(PassRefPtr<Node> newFocusedNode)	2129	bool Document::setFocusedNode(PassRefPtr<Node> newFocusedNode)
2130	{	2130	{
2131	// Make sure newFocusedNode is actually in this document	2131	ASSERT(!m_inPageCache);
2132	if (newFocusedNode && (newFocusedNode->document() != this))	2132
		2133	// If newFocusedNode is not in this document, just return true without doing anything.
		2134	if (newFocusedNode && newFocusedNode->document() != this)
2133	return true;	2135	return true;
2134		2136
2135	if (m_focusedNode == newFocusedNode)	2137	if (m_focusedNode == newFocusedNode)
2136	return true;	2138	return true;
2137		2139
2138	bool focusChangeBlocked = false;	2140	bool focusChangeBlocked = false;
2139	RefPtr<Node> oldFocusedNode = m_focusedNode;	2141	RefPtr<Node> oldFocusedNode = m_focusedNode.release();
2140	m_focusedNode = 0;
2141		2142
2142	// Remove focus from the existing focus node (if any)	2143	// Remove focus from the existing focus node (if any)
2143	if (oldFocusedNode && !oldFocusedNode->m_inDetach) {	2144	if (oldFocusedNode && !oldFocusedNode->m_inDetach) {
Lines 2147-2156 bool Document::setFocusedNode(PassRefPtr Link Here
2147	oldFocusedNode->setFocus(false);	2148	oldFocusedNode->setFocus(false);
2148		2149
2149	// Dispatch a change event for text fields or textareas that have been edited	2150	// Dispatch a change event for text fields or textareas that have been edited
2150	RenderObject r = static_cast<RenderObject>(oldFocusedNode.get()->renderer());	2151	RenderObject* r = static_cast<RenderObject*>(oldFocusedNode->renderer());
2151	if (r && (r->isTextArea() \|\| r->isTextField()) && r->isEdited()) {	2152	if (r && (r->isTextArea() \|\| r->isTextField()) && r->isEdited()) {
2152	EventTargetNodeCast(oldFocusedNode.get())->dispatchHTMLEvent(changeEvent, true, false);	2153	EventTargetNodeCast(oldFocusedNode.get())->dispatchHTMLEvent(changeEvent, true, false);
2153	if ((r = static_cast<RenderObject*>(oldFocusedNode.get()->renderer())))	2154	if ((r = static_cast<RenderObject*>(oldFocusedNode->renderer())))
2154	r->setEdited(false);	2155	r->setEdited(false);
2155	}	2156	}
2156		2157
Lines 2168-2177 bool Document::setFocusedNode(PassRefPtr Link Here
2168	focusChangeBlocked = true;	2169	focusChangeBlocked = true;
2169	newFocusedNode = 0;	2170	newFocusedNode = 0;
2170	}	2171	}
2171	if ((oldFocusedNode.get() == this) && oldFocusedNode->hasOneRef())	2172	if (oldFocusedNode == this && oldFocusedNode->hasOneRef())
2172	return true;	2173	return true;
2173		2174
2174	if (oldFocusedNode.get() == oldFocusedNode->rootEditableElement())	2175	if (oldFocusedNode == oldFocusedNode->rootEditableElement())
2175	frame()->editor()->didEndEditing();	2176	frame()->editor()->didEndEditing();
2176	}	2177	}
2177		2178
Lines 2181-2186 bool Document::setFocusedNode(PassRefPtr Link Here
2181	focusChangeBlocked = true;	2182	focusChangeBlocked = true;
2182	goto SetFocusedNodeDone;	2183	goto SetFocusedNodeDone;
2183	}	2184	}
		2185
2184	// Set focus on the new node	2186	// Set focus on the new node
2185	m_focusedNode = newFocusedNode.get();	2187	m_focusedNode = newFocusedNode.get();
2186		2188
Lines 2192-2210 bool Document::setFocusedNode(PassRefPtr Link Here
2192	focusChangeBlocked = true;	2194	focusChangeBlocked = true;
2193	goto SetFocusedNodeDone;	2195	goto SetFocusedNodeDone;
2194	}	2196	}
		2197
2195	EventTargetNodeCast(m_focusedNode.get())->dispatchUIEvent(DOMFocusInEvent);	2198	EventTargetNodeCast(m_focusedNode.get())->dispatchUIEvent(DOMFocusInEvent);
		2199
2196	if (m_focusedNode != newFocusedNode) {	2200	if (m_focusedNode != newFocusedNode) {
2197	// handler shifted focus	2201	// handler shifted focus
2198	focusChangeBlocked = true;	2202	focusChangeBlocked = true;
2199	goto SetFocusedNodeDone;	2203	goto SetFocusedNodeDone;
2200	}	2204	}
		2205
2201	m_focusedNode->setFocus();	2206	m_focusedNode->setFocus();
2202		2207
2203	if (m_focusedNode.get() == m_focusedNode->rootEditableElement())	2208	if (m_focusedNode == m_focusedNode->rootEditableElement())
2204	frame()->editor()->didBeginEditing();	2209	frame()->editor()->didBeginEditing();
2205		2210
2206	// eww, I suck. set the qt focus correctly
2207	// ### find a better place in the code for this
2208	if (view()) {	2211	if (view()) {
2209	Widget *focusWidget = widgetForNode(m_focusedNode.get());	2212	Widget *focusWidget = widgetForNode(m_focusedNode.get());
2210	if (focusWidget) {	2213	if (focusWidget) {
Lines 2230-2236 bool Document::setFocusedNode(PassRefPtr Link Here
2230	SetFocusedNodeDone:	2233	SetFocusedNodeDone:
2231	updateRendering();	2234	updateRendering();
2232	return !focusChangeBlocked;	2235	return !focusChangeBlocked;
2233	}	2236	}
2234		2237
2235	void Document::setCSSTarget(Node* n)	2238	void Document::setCSSTarget(Node* n)
2236	{	2239	{

Lines 421-426 __ZN7WebCore6WidgetC1Ev Link Here

(-)WebCore/WebCore.exp (-4 / +5 lines)
421	__ZN7WebCore7IntSizeC1ERK7_NSSize	421	__ZN7WebCore7IntSizeC1ERK7_NSSize
422	__ZN7WebCore7nsColorERKNS_5ColorE	422	__ZN7WebCore7nsColorERKNS_5ColorE
423	__ZN7WebCore8Document11completeURLERKNS_16DeprecatedStringE	423	__ZN7WebCore8Document11completeURLERKNS_16DeprecatedStringE
		424	__ZN7WebCore8Document11inPageCacheEv
424	__ZN7WebCore8Document13removeMarkersENS_14DocumentMarker10MarkerTypeE	425	__ZN7WebCore8Document13removeMarkersENS_14DocumentMarker10MarkerTypeE
425	__ZN7WebCore8Document14setFocusedNodeEN3WTF10PassRefPtrINS_4NodeEEE	426	__ZN7WebCore8Document14setFocusedNodeEN3WTF10PassRefPtrINS_4NodeEEE
426	__ZN7WebCore8Document4bodyEv	427	__ZN7WebCore8Document4bodyEv
Lines 571-579 __ZNK7WebCore14ResourceHandle10connectio Link Here
571	__ZNK7WebCore14ResourceLoader11frameLoaderEv	572	__ZNK7WebCore14ResourceLoader11frameLoaderEv
572	__ZNK7WebCore15ProgressTracker17estimatedProgressEv	573	__ZNK7WebCore15ProgressTracker17estimatedProgressEv
573	__ZNK7WebCore15ResourceRequest12nsURLRequestEv	574	__ZNK7WebCore15ResourceRequest12nsURLRequestEv
574	__ZNK7WebCore19ResourceRequestBase16httpHeaderFieldsEv
575	__ZNK7WebCore19ResourceRequestBase3urlEv
576	__ZNK7WebCore19ResourceRequestBase7isEmptyEv
577	__ZNK7WebCore16DeprecatedString11getNSStringEv	575	__ZNK7WebCore16DeprecatedString11getNSStringEv
578	__ZNK7WebCore16DeprecatedString2atEj	576	__ZNK7WebCore16DeprecatedString2atEj
579	__ZNK7WebCore16DeprecatedString3midEjj	577	__ZNK7WebCore16DeprecatedString3midEjj
Lines 586-591 __ZNK7WebCore16ResourceResponse17suggest Link Here
586	__ZNK7WebCore16ResourceResponse21expectedContentLengthEv	584	__ZNK7WebCore16ResourceResponse21expectedContentLengthEv
587	__ZNK7WebCore16ResourceResponse3urlEv	585	__ZNK7WebCore16ResourceResponse3urlEv
588	__ZNK7WebCore16ResourceResponse8mimeTypeEv	586	__ZNK7WebCore16ResourceResponse8mimeTypeEv
		587	__ZNK7WebCore19ResourceRequestBase16httpHeaderFieldsEv
		588	__ZNK7WebCore19ResourceRequestBase3urlEv
		589	__ZNK7WebCore19ResourceRequestBase7isEmptyEv
589	__ZNK7WebCore19SelectionController17isInPasswordFieldEv	590	__ZNK7WebCore19SelectionController17isInPasswordFieldEv
590	__ZNK7WebCore26NetscapePlugInStreamLoader6isDoneEv	591	__ZNK7WebCore26NetscapePlugInStreamLoader6isDoneEv
591	__ZNK7WebCore4Font11primaryFontEv	592	__ZNK7WebCore4Font11primaryFontEv
Lines 597-606 __ZNK7WebCore5Frame10isFrameSetEv Link Here
597	__ZNK7WebCore5Frame12eventHandlerEv	598	__ZNK7WebCore5Frame12eventHandlerEv
598	__ZNK7WebCore5Frame12ownerElementEv	599	__ZNK7WebCore5Frame12ownerElementEv
599	__ZNK7WebCore5Frame13selectionRectEb	600	__ZNK7WebCore5Frame13selectionRectEb
600	__ZNK7WebCore5Frame18selectionTextRectsERN3WTF6VectorINS_9FloatRectELm0EEEb
601	__ZNK7WebCore5Frame14selectionImageEb	601	__ZNK7WebCore5Frame14selectionImageEb
602	__ZNK7WebCore5Frame15revealSelectionERKNS_11RenderLayer15ScrollAlignmentE	602	__ZNK7WebCore5Frame15revealSelectionERKNS_11RenderLayer15ScrollAlignmentE
603	__ZNK7WebCore5Frame16inViewSourceModeEv	603	__ZNK7WebCore5Frame16inViewSourceModeEv
		604	__ZNK7WebCore5Frame18selectionTextRectsERN3WTF6VectorINS_9FloatRectELm0EEEb
604	__ZNK7WebCore5Frame19selectionControllerEv	605	__ZNK7WebCore5Frame19selectionControllerEv
605	__ZNK7WebCore5Frame19setInViewSourceModeEb	606	__ZNK7WebCore5Frame19setInViewSourceModeEb
606	__ZNK7WebCore5Frame30applyEditingStyleToBodyElementEv	607	__ZNK7WebCore5Frame30applyEditingStyleToBodyElementEv

Lines 1-5 Link Here

(-)WebCore/html/HTMLParserErrorCodes.cpp (-8 / +8 lines)
1	/*	1	/*
2	* Copyright (C) 2007 Apple Computer, Inc. All rights reserved.	2	* Copyright (C) 2007 Apple Inc. All rights reserved.
3	*	3	*
4	* Redistribution and use in source and binary forms, with or without	4	* Redistribution and use in source and binary forms, with or without
5	* modification, are permitted provided that the following conditions	5	* modification, are permitted provided that the following conditions
Lines 34-40 const char* htmlParserErrorMessageTempla Link Here
34	"%tag1 is not allowed inside %tag2. Moving %tag1 into the nearest enclosing <table>.",	34	"%tag1 is not allowed inside %tag2. Moving %tag1 into the nearest enclosing <table>.",
35	"<head> must be a child of <html>. Content ignored.",	35	"<head> must be a child of <html>. Content ignored.",
36	"%tag1 is not allowed inside %tag2. Moving %tag1 into the <head>.",	36	"%tag1 is not allowed inside %tag2. Moving %tag1 into the <head>.",
37	"Extra %tag1 encountered. Migrating attributes back to the original %tag1 element and ignoring the tag.",	37	"Extra %tag1 encountered. Migrating attributes back to the original %tag1 element and ignoring the tag.",
38	"<area> is not allowed inside %tag1. Moving the <area> into the nearest enclosing <map>.",	38	"<area> is not allowed inside %tag1. Moving the <area> into the nearest enclosing <map>.",
39	"%tag1 is not allowed inside %tag2. Content ignored.",	39	"%tag1 is not allowed inside %tag2. Content ignored.",
40	"%tag1 is not allowed in a <frameset> page. Content ignored.",	40	"%tag1 is not allowed in a <frameset> page. Content ignored.",
Lines 43-55 const char* htmlParserErrorMessageTempla Link Here
43	"<table> is not allowed inside %tag1. Closing the current <table> and inserting the new <table> as a sibling.",	43	"<table> is not allowed inside %tag1. Closing the current <table> and inserting the new <table> as a sibling.",
44	"%tag1 is not allowed inside %tag2. Inserting %tag1 before the <table> instead.",	44	"%tag1 is not allowed inside %tag2. Inserting %tag1 before the <table> instead.",
45	"%tag1 misplaced in <table>. Creating %tag2 and putting %tag1 inside it.",	45	"%tag1 misplaced in <table>. Creating %tag2 and putting %tag1 inside it.",
46	"</br> encountered. Converting </br> into <br>.",	46	"</br> encountered. Converting </br> into <br>.",
47	"XML self-closing tag syntax used on %tag1. The tag will not be closed.",	47	"XML self-closing tag syntax used on %tag1. The tag will not be closed.",
48	"Unmatched </p> encountered. Converting </p> into <p></p>.",	48	"Unmatched </p> encountered. Converting </p> into <p></p>.",
49	"Unmatched %tag1 encountered. Ignoring tag.",	49	"Unmatched %tag1 encountered. Ignoring tag.",
50	"%tag1 misnested or not properly closed. Cloning %tag1 in order to preserve the styles applied by it.",	50	"%tag1 misnested or not properly closed. Cloning %tag1 in order to preserve the styles applied by it.",
51	"<form> cannot act as a container inside %tag1 without disrupting the table. The children of the <form> will be placed inside the %tag1 instead.",	51	"<form> cannot act as a container inside %tag1 without disrupting the table. The children of the <form> will be placed inside the %tag1 instead.",
52	"XML self-closing tag syntax used on <script>. The tag will be closed by WebKit, but not all browsers do this. Change to <script></script> instead for best cross-browser compatibility."	52	"XML self-closing tag syntax used on <script>. The tag will be closed by WebKit, but not all browsers do this. Change to <script></script> instead for best cross-browser compatibility."
53	};	53	};
54		54
55	if (errorCode >= MisplacedTablePartError && errorCode <= IncorrectXMLCloseScriptWarning)	55	if (errorCode >= MisplacedTablePartError && errorCode <= IncorrectXMLCloseScriptWarning)