Changeset 50946 in webkit
- Timestamp:
- Nov 13, 2009 9:10:48 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r50939 r50946 1 2009-11-13 Pavel Feldman <pfeldman@chromium.org> 2 3 Reviewed by Adam Barth. 4 5 Chromium: [REGRESSION] Crash while stopping on a breakpoint. 6 Rolling back r50890. 7 8 https://bugs.webkit.org/show_bug.cgi?id=31467 9 10 * http/tests/security/calling-versus-current-expected.txt: Removed. 11 * http/tests/security/calling-versus-current.html: Removed. 12 1 13 2009-11-13 Dirk Schulze <krit@webkit.org> 2 14 -
trunk/WebCore/ChangeLog
r50939 r50946 1 2009-11-13 Pavel Feldman <pfeldman@chromium.org> 2 3 Reviewed by Adam Barth. 4 5 Chromium: [REGRESSION] Crash while stopping on a breakpoint. 6 Rolling back r50890. 7 8 https://bugs.webkit.org/show_bug.cgi?id=31467 9 10 * bindings/v8/V8Proxy.cpp: 11 (WebCore::V8Proxy::canAccessPrivate): 12 1 13 2009-11-13 Dirk Schulze <krit@webkit.org> 2 14 -
trunk/WebCore/bindings/v8/V8Proxy.cpp
r50897 r50946 881 881 String message; 882 882 883 v8::Local<v8::Context> activeContext = v8::Context::GetCalling(); 884 if (activeContext.IsEmpty()) { 885 // There is a single activation record on the stack, so that must 886 // be the activeContext. 887 activeContext = v8::Context::GetCurrent(); 888 } 889 DOMWindow* activeWindow = retrieveWindow(activeContext); 890 if (activeWindow == targetWindow) 883 DOMWindow* originWindow = retrieveWindow(currentContext()); 884 if (originWindow == targetWindow) 891 885 return true; 892 886 893 if (! activeWindow)894 return false; 895 896 const SecurityOrigin* activeSecurityOrigin = activeWindow->securityOrigin();887 if (!originWindow) 888 return false; 889 890 const SecurityOrigin* activeSecurityOrigin = originWindow->securityOrigin(); 897 891 const SecurityOrigin* targetSecurityOrigin = targetWindow->securityOrigin(); 898 892 … … 907 901 // Allow access to a "about:blank" page if the dynamic context is a 908 902 // detached context of the same frame as the blank page. 909 if (targetSecurityOrigin->isEmpty() && activeWindow->frame() == targetWindow->frame())903 if (targetSecurityOrigin->isEmpty() && originWindow->frame() == targetWindow->frame()) 910 904 return true; 911 905
Note: See TracChangeset
for help on using the changeset viewer.