Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 4509 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4520 EXPECT_EQ(startRect, initialStartRect); | 4520 EXPECT_EQ(startRect, initialStartRect); |
| 4521 EXPECT_EQ(endRect, initialEndRect); | 4521 EXPECT_EQ(endRect, initialEndRect); |
| 4522 } | 4522 } |
| 4523 #endif | 4523 #endif |
| 4524 | 4524 |
| 4525 class CompositedSelectionBoundsTestLayerTreeView : public WebLayerTreeView { | 4525 class CompositedSelectionBoundsTestLayerTreeView : public WebLayerTreeView { |
| 4526 public: | 4526 public: |
| 4527 CompositedSelectionBoundsTestLayerTreeView() : m_selectionCleared(false) { } | 4527 CompositedSelectionBoundsTestLayerTreeView() : m_selectionCleared(false) { } |
| 4528 ~CompositedSelectionBoundsTestLayerTreeView() override { } | 4528 ~CompositedSelectionBoundsTestLayerTreeView() override { } |
| 4529 | 4529 |
| 4530 void setRootLayer(const WebLayer&) override { } | |
|
pdr.
2015/08/19 23:46:01
Can't you just copy this code in your test? I like
| |
| 4531 void clearRootLayer() override { } | |
| 4532 void setViewportSize(const WebSize& deviceViewportSize) override { } | |
| 4533 WebSize deviceViewportSize() const override { return WebSize(); } | |
| 4534 void setDeviceScaleFactor(float) override { } | |
| 4535 float deviceScaleFactor() const override { return 1.f; } | |
| 4536 void setBackgroundColor(WebColor) override { } | |
| 4537 void setHasTransparentBackground(bool) override { } | |
| 4538 void setVisible(bool) override { } | |
| 4539 void setPageScaleFactorAndLimits(float pageScaleFactor, float minimum, float maximum) override { } | |
| 4540 void startPageScaleAnimation(const WebPoint& destination, bool useAnchor, fl oat newPageScale, double durationSec) override { } | |
| 4541 void finishAllRendering() override { } | |
| 4542 void registerSelection(const WebSelection& selection) override | 4530 void registerSelection(const WebSelection& selection) override |
| 4543 { | 4531 { |
| 4544 m_selection = adoptPtr(new WebSelection(selection)); | 4532 m_selection = adoptPtr(new WebSelection(selection)); |
| 4545 } | 4533 } |
| 4534 | |
| 4546 void clearSelection() override | 4535 void clearSelection() override |
| 4547 { | 4536 { |
| 4548 m_selectionCleared = true; | 4537 m_selectionCleared = true; |
| 4549 m_selection.clear(); | 4538 m_selection.clear(); |
| 4550 } | 4539 } |
| 4551 | 4540 |
| 4552 bool getAndResetSelectionCleared() | 4541 bool getAndResetSelectionCleared() |
| 4553 { | 4542 { |
| 4554 bool selectionCleared = m_selectionCleared; | 4543 bool selectionCleared = m_selectionCleared; |
| 4555 m_selectionCleared = false; | 4544 m_selectionCleared = false; |
| (...skipping 3485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 8041 | 8030 |
| 8042 TEST_F(WebFrameTest, MaxFramesDetach) | 8031 TEST_F(WebFrameTest, MaxFramesDetach) |
| 8043 { | 8032 { |
| 8044 registerMockedHttpURLLoad("max-frames-detach.html"); | 8033 registerMockedHttpURLLoad("max-frames-detach.html"); |
| 8045 FrameTestHelpers::WebViewHelper webViewHelper; | 8034 FrameTestHelpers::WebViewHelper webViewHelper; |
| 8046 WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "max- frames-detach.html", true); | 8035 WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "max- frames-detach.html", true); |
| 8047 webViewImpl->mainFrameImpl()->collectGarbage(); | 8036 webViewImpl->mainFrameImpl()->collectGarbage(); |
| 8048 } | 8037 } |
| 8049 | 8038 |
| 8050 } // namespace blink | 8039 } // namespace blink |
| OLD | NEW |