| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 | 102 |
| 103 touchEvent.y = 260; // A text input box. | 103 touchEvent.y = 260; // A text input box. |
| 104 webViewImpl->enableTapHighlightAtPoint(getTargetedEvent(webViewImpl, touchEv
ent)); | 104 webViewImpl->enableTapHighlightAtPoint(getTargetedEvent(webViewImpl, touchEv
ent)); |
| 105 ASSERT_EQ(0U, webViewImpl->numLinkHighlights()); | 105 ASSERT_EQ(0U, webViewImpl->numLinkHighlights()); |
| 106 | 106 |
| 107 Platform::current()->unitTestSupport()->unregisterAllMockedURLs(); | 107 Platform::current()->unitTestSupport()->unregisterAllMockedURLs(); |
| 108 } | 108 } |
| 109 | 109 |
| 110 namespace { | 110 namespace { |
| 111 | 111 |
| 112 class FakeWebFrameClient : public WebFrameClient { | |
| 113 // To make the destructor public. | |
| 114 }; | |
| 115 | |
| 116 class FakeCompositingWebViewClient : public FrameTestHelpers::TestWebViewClient
{ | 112 class FakeCompositingWebViewClient : public FrameTestHelpers::TestWebViewClient
{ |
| 117 public: | 113 public: |
| 118 FakeWebFrameClient m_fakeWebFrameClient; | 114 FrameTestHelpers::TestWebFrameClient m_fakeWebFrameClient; |
| 119 }; | 115 }; |
| 120 | 116 |
| 121 FakeCompositingWebViewClient* compositingWebViewClient() | 117 FakeCompositingWebViewClient* compositingWebViewClient() |
| 122 { | 118 { |
| 123 DEFINE_STATIC_LOCAL(FakeCompositingWebViewClient, client, ()); | 119 DEFINE_STATIC_LOCAL(FakeCompositingWebViewClient, client, ()); |
| 124 return &client; | 120 return &client; |
| 125 } | 121 } |
| 126 | 122 |
| 127 } // anonymous namespace | 123 } // anonymous namespace |
| 128 | 124 |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 IntRect boundingBox(touchEvent.x - touchEvent.data.tap.width / 2, touchEvent
.y - touchEvent.data.tap.height / 2, touchEvent.data.tap.width, touchEvent.data.
tap.height); | 226 IntRect boundingBox(touchEvent.x - touchEvent.data.tap.width / 2, touchEvent
.y - touchEvent.data.tap.height / 2, touchEvent.data.tap.width, touchEvent.data.
tap.height); |
| 231 findGoodTouchTargets(boundingBox, webViewImpl->mainFrameImpl()->frame(), goo
dTargets, highlightNodes); | 227 findGoodTouchTargets(boundingBox, webViewImpl->mainFrameImpl()->frame(), goo
dTargets, highlightNodes); |
| 232 | 228 |
| 233 webViewImpl->enableTapHighlights(highlightNodes); | 229 webViewImpl->enableTapHighlights(highlightNodes); |
| 234 EXPECT_EQ(2U, webViewImpl->numLinkHighlights()); | 230 EXPECT_EQ(2U, webViewImpl->numLinkHighlights()); |
| 235 | 231 |
| 236 Platform::current()->unitTestSupport()->unregisterAllMockedURLs(); | 232 Platform::current()->unitTestSupport()->unregisterAllMockedURLs(); |
| 237 } | 233 } |
| 238 | 234 |
| 239 } // namespace blink | 235 } // namespace blink |
| OLD | NEW |