OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved. |
3 * Copyright (C) 2009 Apple Inc. All rights reserved. | 3 * Copyright (C) 2009 Apple Inc. All rights reserved. |
4 * Copyright (C) 2014 Opera Software ASA. All rights reserved. | 4 * Copyright (C) 2014 Opera Software ASA. All rights reserved. |
5 * | 5 * |
6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
7 * modification, are permitted provided that the following conditions are | 7 * modification, are permitted provided that the following conditions are |
8 * met: | 8 * met: |
9 * | 9 * |
10 * * Redistributions of source code must retain the above copyright | 10 * * Redistributions of source code must retain the above copyright |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 #include "core/html/HTMLPlugInElement.h" | 47 #include "core/html/HTMLPlugInElement.h" |
48 #include "core/inspector/ConsoleMessage.h" | 48 #include "core/inspector/ConsoleMessage.h" |
49 #include "core/inspector/InspectorTraceEvents.h" | 49 #include "core/inspector/InspectorTraceEvents.h" |
50 #include "core/inspector/MainThreadDebugger.h" | 50 #include "core/inspector/MainThreadDebugger.h" |
51 #include "core/loader/DocumentLoader.h" | 51 #include "core/loader/DocumentLoader.h" |
52 #include "core/loader/FrameLoader.h" | 52 #include "core/loader/FrameLoader.h" |
53 #include "core/loader/NavigationScheduler.h" | 53 #include "core/loader/NavigationScheduler.h" |
54 #include "core/loader/ProgressTracker.h" | 54 #include "core/loader/ProgressTracker.h" |
55 #include "core/plugins/PluginView.h" | 55 #include "core/plugins/PluginView.h" |
56 #include "core/probe/CoreProbes.h" | 56 #include "core/probe/CoreProbes.h" |
57 #include "platform/FrameViewBase.h" | |
58 #include "platform/Histogram.h" | 57 #include "platform/Histogram.h" |
59 #include "platform/UserGestureIndicator.h" | 58 #include "platform/UserGestureIndicator.h" |
60 #include "platform/instrumentation/tracing/TraceEvent.h" | 59 #include "platform/instrumentation/tracing/TraceEvent.h" |
61 #include "platform/weborigin/SecurityOrigin.h" | 60 #include "platform/weborigin/SecurityOrigin.h" |
62 #include "platform/wtf/CurrentTime.h" | 61 #include "platform/wtf/CurrentTime.h" |
63 #include "platform/wtf/StdLibExtras.h" | 62 #include "platform/wtf/StdLibExtras.h" |
64 #include "platform/wtf/StringExtras.h" | 63 #include "platform/wtf/StringExtras.h" |
65 #include "platform/wtf/text/CString.h" | 64 #include "platform/wtf/text/CString.h" |
66 #include "platform/wtf/text/StringBuilder.h" | 65 #include "platform/wtf/text/StringBuilder.h" |
67 | 66 |
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
369 if (!world_name.IsEmpty()) { | 368 if (!world_name.IsEmpty()) { |
370 DOMWrapperWorld::SetIsolatedWorldHumanReadableName(world->GetWorldId(), | 369 DOMWrapperWorld::SetIsolatedWorldHumanReadableName(world->GetWorldId(), |
371 world_name); | 370 world_name); |
372 } | 371 } |
373 // Make sure the execution context exists. | 372 // Make sure the execution context exists. |
374 WindowProxy(*world); | 373 WindowProxy(*world); |
375 return world->GetWorldId(); | 374 return world->GetWorldId(); |
376 } | 375 } |
377 | 376 |
378 } // namespace blink | 377 } // namespace blink |
OLD | NEW |