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

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

Issue 1818233003: Merge WTF::initializeMainThread into WTF::initialize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "core/dom/QualifiedName.h" 52 #include "core/dom/QualifiedName.h"
53 #include "core/frame/LocalDOMWindow.h" 53 #include "core/frame/LocalDOMWindow.h"
54 #include "core/frame/LocalFrame.h" 54 #include "core/frame/LocalFrame.h"
55 #include "core/frame/Settings.h" 55 #include "core/frame/Settings.h"
56 #include "core/inspector/InspectorTraceEvents.h" 56 #include "core/inspector/InspectorTraceEvents.h"
57 #include "core/loader/FrameLoader.h" 57 #include "core/loader/FrameLoader.h"
58 #include "core/loader/FrameLoaderClient.h" 58 #include "core/loader/FrameLoaderClient.h"
59 #include "core/workers/WorkerGlobalScope.h" 59 #include "core/workers/WorkerGlobalScope.h"
60 #include "core/xml/XPathNSResolver.h" 60 #include "core/xml/XPathNSResolver.h"
61 #include "platform/TracedValue.h" 61 #include "platform/TracedValue.h"
62 #include "wtf/MainThread.h"
63 #include "wtf/MathExtras.h" 62 #include "wtf/MathExtras.h"
64 #include "wtf/StdLibExtras.h" 63 #include "wtf/StdLibExtras.h"
65 #include "wtf/Threading.h" 64 #include "wtf/Threading.h"
66 #include "wtf/text/AtomicString.h" 65 #include "wtf/text/AtomicString.h"
67 #include "wtf/text/CString.h" 66 #include "wtf/text/CString.h"
68 #include "wtf/text/CharacterNames.h" 67 #include "wtf/text/CharacterNames.h"
69 #include "wtf/text/StringBuffer.h" 68 #include "wtf/text/StringBuffer.h"
70 #include "wtf/text/StringHash.h" 69 #include "wtf/text/StringHash.h"
71 #include "wtf/text/Unicode.h" 70 #include "wtf/text/Unicode.h"
72 #include "wtf/text/WTFString.h" 71 #include "wtf/text/WTFString.h"
(...skipping 885 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 { 957 {
959 v8::Local<v8::Value> data = info.Data(); 958 v8::Local<v8::Value> data = info.Data();
960 ASSERT(data->IsExternal()); 959 ASSERT(data->IsExternal());
961 V8PerContextData* perContextData = V8PerContextData::from(info.Holder()->Cre ationContext()); 960 V8PerContextData* perContextData = V8PerContextData::from(info.Holder()->Cre ationContext());
962 if (!perContextData) 961 if (!perContextData)
963 return; 962 return;
964 v8SetReturnValue(info, perContextData->constructorForType(WrapperTypeInfo::u nwrap(data))); 963 v8SetReturnValue(info, perContextData->constructorForType(WrapperTypeInfo::u nwrap(data)));
965 } 964 }
966 965
967 } // namespace blink 966 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698