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

Side by Side Diff: Source/bindings/core/v8/V8Binding.cpp

Issue 1005223002: Blink: Replace all "plug-in" with "plugin". (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Revert netscape-dom-access tests. Created 5 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 670
671 LocalDOMWindow* currentDOMWindow(v8::Isolate* isolate) 671 LocalDOMWindow* currentDOMWindow(v8::Isolate* isolate)
672 { 672 {
673 return toLocalDOMWindow(toDOMWindow(isolate->GetCurrentContext())); 673 return toLocalDOMWindow(toDOMWindow(isolate->GetCurrentContext()));
674 } 674 }
675 675
676 LocalDOMWindow* callingDOMWindow(v8::Isolate* isolate) 676 LocalDOMWindow* callingDOMWindow(v8::Isolate* isolate)
677 { 677 {
678 v8::Handle<v8::Context> context = isolate->GetCallingContext(); 678 v8::Handle<v8::Context> context = isolate->GetCallingContext();
679 if (context.IsEmpty()) { 679 if (context.IsEmpty()) {
680 // Unfortunately, when processing script from a plug-in, we might not 680 // Unfortunately, when processing script from a plugin, we might not
681 // have a calling context. In those cases, we fall back to the 681 // have a calling context. In those cases, we fall back to the
682 // entered context. 682 // entered context.
683 context = isolate->GetEnteredContext(); 683 context = isolate->GetEnteredContext();
684 } 684 }
685 return toLocalDOMWindow(toDOMWindow(context)); 685 return toLocalDOMWindow(toDOMWindow(context));
686 } 686 }
687 687
688 ExecutionContext* toExecutionContext(v8::Handle<v8::Context> context) 688 ExecutionContext* toExecutionContext(v8::Handle<v8::Context> context)
689 { 689 {
690 if (context.IsEmpty()) 690 if (context.IsEmpty())
(...skipping 11 matching lines...) Expand all
702 702
703 ExecutionContext* currentExecutionContext(v8::Isolate* isolate) 703 ExecutionContext* currentExecutionContext(v8::Isolate* isolate)
704 { 704 {
705 return toExecutionContext(isolate->GetCurrentContext()); 705 return toExecutionContext(isolate->GetCurrentContext());
706 } 706 }
707 707
708 ExecutionContext* callingExecutionContext(v8::Isolate* isolate) 708 ExecutionContext* callingExecutionContext(v8::Isolate* isolate)
709 { 709 {
710 v8::Handle<v8::Context> context = isolate->GetCallingContext(); 710 v8::Handle<v8::Context> context = isolate->GetCallingContext();
711 if (context.IsEmpty()) { 711 if (context.IsEmpty()) {
712 // Unfortunately, when processing script from a plug-in, we might not 712 // Unfortunately, when processing script from a plugin, we might not
713 // have a calling context. In those cases, we fall back to the 713 // have a calling context. In those cases, we fall back to the
714 // entered context. 714 // entered context.
715 context = isolate->GetEnteredContext(); 715 context = isolate->GetEnteredContext();
716 } 716 }
717 return toExecutionContext(context); 717 return toExecutionContext(context);
718 } 718 }
719 719
720 Frame* toFrameIfNotDetached(v8::Handle<v8::Context> context) 720 Frame* toFrameIfNotDetached(v8::Handle<v8::Context> context)
721 { 721 {
722 DOMWindow* window = toDOMWindow(context); 722 DOMWindow* window = toDOMWindow(context);
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
943 v8::Local<v8::Value> data = info.Data(); 943 v8::Local<v8::Value> data = info.Data();
944 ASSERT(data->IsExternal()); 944 ASSERT(data->IsExternal());
945 V8PerContextData* perContextData = V8PerContextData::from(info.Holder()->Cre ationContext()); 945 V8PerContextData* perContextData = V8PerContextData::from(info.Holder()->Cre ationContext());
946 if (!perContextData) 946 if (!perContextData)
947 return; 947 return;
948 v8SetReturnValue(info, perContextData->constructorForType(WrapperTypeInfo::u nwrap(data))); 948 v8SetReturnValue(info, perContextData->constructorForType(WrapperTypeInfo::u nwrap(data)));
949 TRACE_EVENT_SET_SAMPLING_STATE("v8", "V8Execution"); 949 TRACE_EVENT_SET_SAMPLING_STATE("v8", "V8Execution");
950 } 950 }
951 951
952 } // namespace blink 952 } // namespace blink
OLDNEW
« no previous file with comments | « ManualTests/resources/nested-plugins-outer-frame.html ('k') | Source/core/dom/DOMImplementation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698