| 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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 WebFrameWidget::create(widgetClient, frame); | 185 WebFrameWidget::create(widgetClient, frame); |
| 186 | 186 |
| 187 return frame; | 187 return frame; |
| 188 } | 188 } |
| 189 | 189 |
| 190 WebRemoteFrame* createRemoteChild(WebRemoteFrame* parent, WebRemoteFrameClient*
client, const WebString& name) | 190 WebRemoteFrame* createRemoteChild(WebRemoteFrame* parent, WebRemoteFrameClient*
client, const WebString& name) |
| 191 { | 191 { |
| 192 return parent->createRemoteChild(WebTreeScopeType::Document, name, nameToUni
queName(name), WebSandboxFlags::None, client, nullptr); | 192 return parent->createRemoteChild(WebTreeScopeType::Document, name, nameToUni
queName(name), WebSandboxFlags::None, client, nullptr); |
| 193 } | 193 } |
| 194 | 194 |
| 195 void DefaultSettingOverride(WebSettings*) |
| 196 { |
| 197 } |
| 198 |
| 199 void RootLayerScrollsSettingOverride(WebSettings *settings) |
| 200 { |
| 201 settings->setRootLayerScrolls(true); |
| 202 } |
| 203 |
| 195 WebViewHelper::WebViewHelper(SettingOverrider* settingOverrider) | 204 WebViewHelper::WebViewHelper(SettingOverrider* settingOverrider) |
| 196 : m_webView(nullptr) | 205 : m_webView(nullptr) |
| 197 , m_settingOverrider(settingOverrider) | 206 , m_settingOverrider(settingOverrider) |
| 198 { | 207 { |
| 199 } | 208 } |
| 200 | 209 |
| 201 WebViewHelper::~WebViewHelper() | 210 WebViewHelper::~WebViewHelper() |
| 202 { | 211 { |
| 203 reset(); | 212 reset(); |
| 204 } | 213 } |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 m_testWebViewClient->scheduleAnimation(); | 347 m_testWebViewClient->scheduleAnimation(); |
| 339 } | 348 } |
| 340 | 349 |
| 341 void TestWebViewWidgetClient::didMeaningfulLayout(WebMeaningfulLayout layoutType
) | 350 void TestWebViewWidgetClient::didMeaningfulLayout(WebMeaningfulLayout layoutType
) |
| 342 { | 351 { |
| 343 m_testWebViewClient->didMeaningfulLayout(layoutType); | 352 m_testWebViewClient->didMeaningfulLayout(layoutType); |
| 344 } | 353 } |
| 345 | 354 |
| 346 } // namespace FrameTestHelpers | 355 } // namespace FrameTestHelpers |
| 347 } // namespace blink | 356 } // namespace blink |
| OLD | NEW |