Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(562)

Side by Side Diff: third_party/WebKit/Source/web/tests/WebFrameTest.cpp

Issue 1746283002: Rename enums/functions that collide in chromium style in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get-names-13-platform: . Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1544 matching lines...) Expand 10 before | Expand all | Expand 10 after
1555 1555
1556 IntPoint hitPoint = IntPoint(30, 30); // button size is 100x100 1556 IntPoint hitPoint = IntPoint(30, 30); // button size is 100x100
1557 1557
1558 WebLocalFrameImpl* frame = toWebLocalFrameImpl(webViewHelper.webView()->main Frame()); 1558 WebLocalFrameImpl* frame = toWebLocalFrameImpl(webViewHelper.webView()->main Frame());
1559 Document* document = frame->frame()->document(); 1559 Document* document = frame->frame()->document();
1560 Element* element = document->getElementById("tap_button"); 1560 Element* element = document->getElementById("tap_button");
1561 1561
1562 ASSERT_NE(nullptr, element); 1562 ASSERT_NE(nullptr, element);
1563 EXPECT_EQ(String("oldValue"), element->innerText()); 1563 EXPECT_EQ(String("oldValue"), element->innerText());
1564 1564
1565 PlatformGestureEvent gestureEvent(PlatformEvent::Type::GestureTap, hitPoint, hitPoint, IntSize(0, 0), 0, PlatformEvent::NoModifiers, PlatformGestureSourceTo uchscreen); 1565 PlatformGestureEvent gestureEvent(PlatformEvent::EventType::GestureTap, hitP oint, hitPoint, IntSize(0, 0), 0, PlatformEvent::NoModifiers, PlatformGestureSou rceTouchscreen);
1566 webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().handle GestureEvent(gestureEvent); 1566 webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().handle GestureEvent(gestureEvent);
1567 // when pressed, the button changes its own text to "updatedValue" 1567 // when pressed, the button changes its own text to "updatedValue"
1568 EXPECT_EQ(String("updatedValue"), element->innerText()); 1568 EXPECT_EQ(String("updatedValue"), element->innerText());
1569 } 1569 }
1570 1570
1571 TEST_F(WebFrameTest, FrameOwnerPropertiesMargin) 1571 TEST_F(WebFrameTest, FrameOwnerPropertiesMargin)
1572 { 1572 {
1573 FrameTestHelpers::TestWebViewClient viewClient; 1573 FrameTestHelpers::TestWebViewClient viewClient;
1574 FrameTestHelpers::TestWebRemoteFrameClient remoteClient; 1574 FrameTestHelpers::TestWebRemoteFrameClient remoteClient;
1575 WebView* view = WebView::create(&viewClient); 1575 WebView* view = WebView::create(&viewClient);
(...skipping 6921 matching lines...) Expand 10 before | Expand all | Expand 10 after
8497 } 8497 }
8498 8498
8499 TEST_F(WebFrameVisibilityChangeTest, RemoteFrameParentVisibilityChange) 8499 TEST_F(WebFrameVisibilityChangeTest, RemoteFrameParentVisibilityChange)
8500 { 8500 {
8501 swapLocalFrameToRemoteFrame(); 8501 swapLocalFrameToRemoteFrame();
8502 executeScriptOnMainFrame(WebScriptSource("document.querySelector('iframe').p arentElement.style.display = 'none';")); 8502 executeScriptOnMainFrame(WebScriptSource("document.querySelector('iframe').p arentElement.style.display = 'none';"));
8503 EXPECT_FALSE(remoteFrameClient()->isVisible()); 8503 EXPECT_FALSE(remoteFrameClient()->isVisible());
8504 } 8504 }
8505 8505
8506 } // namespace blink 8506 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698