Bindings: Separate WorldIdConstants into WorldTypes and WorldId

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 653 matching lines @@
   frame()->script().executeScriptInMainWorld(
       ScriptSourceCode(source.code, source.url, position));
 }
 
 void WebLocalFrameImpl::executeScriptInIsolatedWorld(
     int worldID,
     const WebScriptSource* sourcesIn,
     unsigned numSources) {
   DCHECK(frame());
   CHECK_GT(worldID, 0);
-  CHECK_LT(worldID, EmbedderWorldIdLimit);
+  CHECK_LT(worldID, DOMWrapperWorld::EmbedderWorldIdLimit);
 
   HeapVector<ScriptSourceCode> sources =
       createSourcesVector(sourcesIn, numSources);
   v8::HandleScope handleScope(toIsolate(frame()));
   frame()->script().executeScriptInIsolatedWorld(worldID, sources, 0);
 }
 
 void WebLocalFrameImpl::setIsolatedWorldSecurityOrigin(
     int worldID,
     const WebSecurityOrigin& securityOrigin) {
@@ skipping 83 matching lines @@
                                           callback);
 }
 
 void WebLocalFrameImpl::executeScriptInIsolatedWorld(
     int worldID,
     const WebScriptSource* sourcesIn,
     unsigned numSources,
     WebVector<v8::Local<v8::Value>>* results) {
   DCHECK(frame());
   CHECK_GT(worldID, 0);
-  CHECK_LT(worldID, EmbedderWorldIdLimit);
+  CHECK_LT(worldID, DOMWrapperWorld::EmbedderWorldIdLimit);
 
   HeapVector<ScriptSourceCode> sources =
       createSourcesVector(sourcesIn, numSources);
 
   if (results) {
     Vector<v8::Local<v8::Value>> scriptResults;
     frame()->script().executeScriptInIsolatedWorld(worldID, sources,
                                                    &scriptResults);
     WebVector<v8::Local<v8::Value>> v8Results(scriptResults.size());
     for (unsigned i = 0; i < scriptResults.size(); i++)
       v8Results[i] =
           v8::Local<v8::Value>::New(toIsolate(frame()), scriptResults[i]);
     results->swap(v8Results);
   } else {
     v8::HandleScope handleScope(toIsolate(frame()));
     frame()->script().executeScriptInIsolatedWorld(worldID, sources, 0);
   }
 }
 
 void WebLocalFrameImpl::requestExecuteScriptInIsolatedWorld(
     int worldID,
     const WebScriptSource* sourcesIn,
     unsigned numSources,
     bool userGesture,
     WebScriptExecutionCallback* callback) {
   DCHECK(frame());
   CHECK_GT(worldID, 0);
-  CHECK_LT(worldID, EmbedderWorldIdLimit);
+  CHECK_LT(worldID, DOMWrapperWorld::EmbedderWorldIdLimit);
 
   SuspendableScriptExecutor::createAndRun(
       frame(), worldID, createSourcesVector(sourcesIn, numSources), userGesture,
       callback);
 }
 
 // TODO(bashi): Consider returning MaybeLocal.
 v8::Local<v8::Value> WebLocalFrameImpl::callFunctionEvenIfScriptDisabled(
     v8::Local<v8::Function> function,
     v8::Local<v8::Value> receiver,
@@ skipping 1643 matching lines @@
         createMarkup(startPosition, endPosition, AnnotateForInterchange,
                      ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
   } else {
     clipHtml =
         createMarkup(endPosition, startPosition, AnnotateForInterchange,
                      ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
   }
 }
 
 }  // namespace blink