OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 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 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
175 #include "platform/graphics/GraphicsContext.h" | 175 #include "platform/graphics/GraphicsContext.h" |
176 #include "platform/graphics/GraphicsLayerClient.h" | 176 #include "platform/graphics/GraphicsLayerClient.h" |
177 #include "platform/graphics/paint/ClipRecorder.h" | 177 #include "platform/graphics/paint/ClipRecorder.h" |
178 #include "platform/graphics/paint/DrawingRecorder.h" | 178 #include "platform/graphics/paint/DrawingRecorder.h" |
179 #include "platform/graphics/paint/SkPictureBuilder.h" | 179 #include "platform/graphics/paint/SkPictureBuilder.h" |
180 #include "platform/graphics/skia/SkiaUtils.h" | 180 #include "platform/graphics/skia/SkiaUtils.h" |
181 #include "platform/heap/Handle.h" | 181 #include "platform/heap/Handle.h" |
182 #include "platform/network/ResourceRequest.h" | 182 #include "platform/network/ResourceRequest.h" |
183 #include "platform/scroll/ScrollTypes.h" | 183 #include "platform/scroll/ScrollTypes.h" |
184 #include "platform/scroll/ScrollbarTheme.h" | 184 #include "platform/scroll/ScrollbarTheme.h" |
185 #include "platform/vr/vr_dispatcher.h" | |
185 #include "platform/weborigin/KURL.h" | 186 #include "platform/weborigin/KURL.h" |
186 #include "platform/weborigin/SchemeRegistry.h" | 187 #include "platform/weborigin/SchemeRegistry.h" |
187 #include "platform/weborigin/SecurityPolicy.h" | 188 #include "platform/weborigin/SecurityPolicy.h" |
188 #include "public/platform/WebFloatPoint.h" | 189 #include "public/platform/WebFloatPoint.h" |
189 #include "public/platform/WebFloatRect.h" | 190 #include "public/platform/WebFloatRect.h" |
190 #include "public/platform/WebLayer.h" | 191 #include "public/platform/WebLayer.h" |
191 #include "public/platform/WebPoint.h" | 192 #include "public/platform/WebPoint.h" |
192 #include "public/platform/WebRect.h" | 193 #include "public/platform/WebRect.h" |
193 #include "public/platform/WebSecurityOrigin.h" | 194 #include "public/platform/WebSecurityOrigin.h" |
194 #include "public/platform/WebSize.h" | 195 #include "public/platform/WebSize.h" |
(...skipping 1354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1549 | 1550 |
1550 if (RuntimeEnabledFeatures::screenOrientationEnabled()) | 1551 if (RuntimeEnabledFeatures::screenOrientationEnabled()) |
1551 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client->we bScreenOrientationClient() : nullptr); | 1552 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client->we bScreenOrientationClient() : nullptr); |
1552 if (RuntimeEnabledFeatures::presentationEnabled()) | 1553 if (RuntimeEnabledFeatures::presentationEnabled()) |
1553 PresentationController::provideTo(*m_frame, m_client ? m_client->present ationClient() : nullptr); | 1554 PresentationController::provideTo(*m_frame, m_client ? m_client->present ationClient() : nullptr); |
1554 if (RuntimeEnabledFeatures::permissionsEnabled()) | 1555 if (RuntimeEnabledFeatures::permissionsEnabled()) |
1555 PermissionController::provideTo(*m_frame, m_client ? m_client->permissio nClient() : nullptr); | 1556 PermissionController::provideTo(*m_frame, m_client ? m_client->permissio nClient() : nullptr); |
1556 if (RuntimeEnabledFeatures::webUSBEnabled()) | 1557 if (RuntimeEnabledFeatures::webUSBEnabled()) |
1557 USBController::provideTo(*m_frame, m_client ? m_client->usbClient() : nu llptr); | 1558 USBController::provideTo(*m_frame, m_client ? m_client->usbClient() : nu llptr); |
1558 if (RuntimeEnabledFeatures::webVREnabled()) | 1559 if (RuntimeEnabledFeatures::webVREnabled()) |
1559 VRController::provideTo(*m_frame, m_client ? m_client->webVRClient() : n ullptr); | 1560 VRController::provideTo(*m_frame, VRDispatcher::create()); |
Yuki
2016/03/22 07:15:03
I think you no longer need this line. The clients
RaviKasibhatla
2016/03/23 15:20:51
I am sorry but I didn't understood the concern her
Yuki
2016/03/25 09:49:05
Yes. As you're moving the implementation from con
| |
1560 if (RuntimeEnabledFeatures::wakeLockEnabled()) | 1561 if (RuntimeEnabledFeatures::wakeLockEnabled()) |
1561 ScreenWakeLock::provideTo(*m_frame, m_client ? m_client->wakeLockClient( ) : nullptr); | 1562 ScreenWakeLock::provideTo(*m_frame, m_client ? m_client->wakeLockClient( ) : nullptr); |
1562 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) | 1563 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) |
1563 provideAudioOutputDeviceClientTo(*m_frame, AudioOutputDeviceClientImpl:: create()); | 1564 provideAudioOutputDeviceClientTo(*m_frame, AudioOutputDeviceClientImpl:: create()); |
1564 if (RuntimeEnabledFeatures::installedAppEnabled()) | 1565 if (RuntimeEnabledFeatures::installedAppEnabled()) |
1565 InstalledAppController::provideTo(*m_frame, m_client ? m_client->install edAppClient() : nullptr); | 1566 InstalledAppController::provideTo(*m_frame, m_client ? m_client->install edAppClient() : nullptr); |
1566 } | 1567 } |
1567 | 1568 |
1568 void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host, FrameOwner* owner, const AtomicString& name, const AtomicString& uniqueName) | 1569 void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host, FrameOwner* owner, const AtomicString& name, const AtomicString& uniqueName) |
1569 { | 1570 { |
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2187 return WebSandboxFlags::None; | 2188 return WebSandboxFlags::None; |
2188 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); | 2189 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); |
2189 } | 2190 } |
2190 | 2191 |
2191 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) | 2192 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) |
2192 { | 2193 { |
2193 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); | 2194 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); |
2194 } | 2195 } |
2195 | 2196 |
2196 } // namespace blink | 2197 } // namespace blink |
OLD | NEW |