Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Side by Side Diff: third_party/WebKit/WebCore/bindings/js/JSDocumentCustom.cpp

Issue 20076: WebKit merge 40500:40539 [WebKit side] (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 String str = value.toString(exec); 67 String str = value.toString(exec);
68 68
69 // IE and Mozilla both resolve the URL relative to the source frame, 69 // IE and Mozilla both resolve the URL relative to the source frame,
70 // not the target frame. 70 // not the target frame.
71 Frame* activeFrame = asJSDOMWindow(exec->dynamicGlobalObject())->impl()->fra me(); 71 Frame* activeFrame = asJSDOMWindow(exec->dynamicGlobalObject())->impl()->fra me();
72 if (activeFrame) 72 if (activeFrame)
73 str = activeFrame->document()->completeURL(str).string(); 73 str = activeFrame->document()->completeURL(str).string();
74 74
75 bool userGesture = activeFrame->script()->processingUserGesture(); 75 bool userGesture = activeFrame->script()->processingUserGesture();
76 frame->loader()->scheduleLocationChange(str, activeFrame->loader()->outgoing Referrer(), false, false, userGesture); 76 frame->loader()->scheduleLocationChange(str, activeFrame->loader()->outgoing Referrer(), !activeFrame->script()->anyPageIsProcessingUserGesture(), false, use rGesture);
77 } 77 }
78 78
79 JSValuePtr toJS(ExecState* exec, Document* document) 79 JSValuePtr toJS(ExecState* exec, Document* document)
80 { 80 {
81 if (!document) 81 if (!document)
82 return jsNull(); 82 return jsNull();
83 83
84 DOMObject* wrapper = getCachedDOMObjectWrapper(exec->globalData(), document) ; 84 DOMObject* wrapper = getCachedDOMObjectWrapper(exec->globalData(), document) ;
85 if (wrapper) 85 if (wrapper)
86 return wrapper; 86 return wrapper;
(...skipping 14 matching lines...) Expand all
101 for (Node* n = document; n; n = n->traverseNextNode()) 101 for (Node* n = document; n; n = n->traverseNextNode())
102 nodeCount++; 102 nodeCount++;
103 103
104 exec->heap()->reportExtraMemoryCost(nodeCount * sizeof(Node)); 104 exec->heap()->reportExtraMemoryCost(nodeCount * sizeof(Node));
105 } 105 }
106 106
107 return wrapper; 107 return wrapper;
108 } 108 }
109 109
110 } // namespace WebCore 110 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698