| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 WebFrameWidget::create(widgetClient, frame); | 183 WebFrameWidget::create(widgetClient, frame); |
| 184 | 184 |
| 185 return frame; | 185 return frame; |
| 186 } | 186 } |
| 187 | 187 |
| 188 WebRemoteFrameImpl* createRemoteChild(WebRemoteFrame* parent, WebRemoteFrameClie
nt* client, const WebString& name) | 188 WebRemoteFrameImpl* createRemoteChild(WebRemoteFrame* parent, WebRemoteFrameClie
nt* client, const WebString& name) |
| 189 { | 189 { |
| 190 return toWebRemoteFrameImpl(parent->createRemoteChild(WebTreeScopeType::Docu
ment, name, nameToUniqueName(name), WebSandboxFlags::None, client, nullptr)); | 190 return toWebRemoteFrameImpl(parent->createRemoteChild(WebTreeScopeType::Docu
ment, name, nameToUniqueName(name), WebSandboxFlags::None, client, nullptr)); |
| 191 } | 191 } |
| 192 | 192 |
| 193 void DefaultSettingOverride(WebSettings*) | |
| 194 { | |
| 195 } | |
| 196 | |
| 197 void RootLayerScrollsSettingOverride(WebSettings *settings) | |
| 198 { | |
| 199 settings->setRootLayerScrolls(true); | |
| 200 } | |
| 201 | |
| 202 WebViewHelper::WebViewHelper(SettingOverrider* settingOverrider) | 193 WebViewHelper::WebViewHelper(SettingOverrider* settingOverrider) |
| 203 : m_webView(nullptr) | 194 : m_webView(nullptr) |
| 204 , m_settingOverrider(settingOverrider) | 195 , m_settingOverrider(settingOverrider) |
| 205 { | 196 { |
| 206 } | 197 } |
| 207 | 198 |
| 208 WebViewHelper::~WebViewHelper() | 199 WebViewHelper::~WebViewHelper() |
| 209 { | 200 { |
| 210 reset(); | 201 reset(); |
| 211 } | 202 } |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 345 m_testWebViewClient->scheduleAnimation(); | 336 m_testWebViewClient->scheduleAnimation(); |
| 346 } | 337 } |
| 347 | 338 |
| 348 void TestWebViewWidgetClient::didMeaningfulLayout(WebMeaningfulLayout layoutType
) | 339 void TestWebViewWidgetClient::didMeaningfulLayout(WebMeaningfulLayout layoutType
) |
| 349 { | 340 { |
| 350 m_testWebViewClient->didMeaningfulLayout(layoutType); | 341 m_testWebViewClient->didMeaningfulLayout(layoutType); |
| 351 } | 342 } |
| 352 | 343 |
| 353 } // namespace FrameTestHelpers | 344 } // namespace FrameTestHelpers |
| 354 } // namespace blink | 345 } // namespace blink |
| OLD | NEW |