diff --git a/chrome/android/java/res/layout/bottom_control_container.xml b/chrome/android/java/res/layout/bottom_control_container.xml index eae7a4a9..79b046c 100644 --- a/chrome/android/java/res/layout/bottom_control_container.xml +++ b/chrome/android/java/res/layout/bottom_control_container.xml
@@ -34,8 +34,7 @@ android:id="@+id/toolbar_holder" android:layout_width="match_parent" android:layout_height="@dimen/bottom_control_container_height" - android:layout_marginTop="@dimen/toolbar_shadow_height" - android:background="@color/default_primary_color" > + android:layout_marginTop="@dimen/toolbar_shadow_height" > <ViewStub android:id="@+id/toolbar_stub" @@ -67,8 +66,7 @@ android:id="@+id/bottom_sheet_content" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingBottom="@dimen/bottom_nav_height" - android:background="@color/default_primary_color" /> + android:paddingBottom="@dimen/bottom_nav_height" /> <ViewStub android:id="@+id/bottom_omnibox_results_container_stub"
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java index bcc8dbae..8f4e442 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
@@ -6,7 +6,6 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; -import android.animation.AnimatorSet; import android.animation.ObjectAnimator; import android.animation.ValueAnimator; import android.content.Context; @@ -21,7 +20,6 @@ import android.view.MotionEvent; import android.view.VelocityTracker; import android.view.View; -import android.view.ViewGroup; import android.view.Window; import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; @@ -51,8 +49,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import java.util.ArrayList; -import java.util.List; /** * This class defines the bottom sheet that has multiple states and a persistently showing toolbar. @@ -90,9 +86,6 @@ */ private static final long BASE_ANIMATION_DURATION_MS = 218; - /** The amount of time it takes to transition sheet content in or out. */ - private static final long TRANSITION_DURATION_MS = 150; - /** * The fraction of the way to the next state the sheet must be swiped to animate there when * released. This is the value used when there are 3 active states. A smaller value here means @@ -147,8 +140,8 @@ /** The animator used to move the sheet to a fixed state when released by the user. */ private ValueAnimator mSettleAnimator; - /** The animator set responsible for swapping the bottom sheet content. */ - private AnimatorSet mContentSwapAnimatorSet; + /** The animator used for the toolbar fades. */ + private ValueAnimator mToolbarFadeAnimator; /** The height of the toolbar. */ private float mToolbarHeight; @@ -564,7 +557,7 @@ LayoutParams placeHolderParams = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); mPlaceholder.setBackgroundColor( - ApiCompatibilityUtils.getColor(getResources(), R.color.default_primary_color)); + ApiCompatibilityUtils.getColor(getResources(), android.R.color.white)); mBottomSheetContentContainer.addView(mPlaceholder, placeHolderParams); mToolbarHolder = (FrameLayout) mControlContainer.findViewById(R.id.toolbar_holder); @@ -652,86 +645,83 @@ * Show content in the bottom sheet's content area. * @param content The {@link BottomSheetContent} to show. */ - public void showContent(final BottomSheetContent content) { + public void showContent(BottomSheetContent content) { // If the desired content is already showing, do nothing. if (mSheetContent == content) return; + View newToolbar = content.getToolbarView(); + View oldToolbar = null; + + if (mSheetContent != null) { + oldToolbar = mSheetContent.getToolbarView(); + mBottomSheetContentContainer.removeView(mSheetContent.getContentView()); + mSheetContent = null; + } + mBottomSheetContentContainer.removeView(mPlaceholder); + mSheetContent = content; + mBottomSheetContentContainer.addView(mSheetContent.getContentView()); - View newToolbar = - content.getToolbarView() != null ? content.getToolbarView() : mDefaultToolbarView; - View oldToolbar = mSheetContent != null && mSheetContent.getToolbarView() != null - ? mSheetContent.getToolbarView() - : mDefaultToolbarView; - View oldContent = mSheetContent != null ? mSheetContent.getContentView() : null; + doToolbarSwap(newToolbar, oldToolbar); - // If an animation is already running, end it. - if (mContentSwapAnimatorSet != null) mContentSwapAnimatorSet.end(); - - List<Animator> animators = new ArrayList<>(); - mContentSwapAnimatorSet = new AnimatorSet(); - mContentSwapAnimatorSet.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - mSheetContent = content; - for (BottomSheetObserver o : mObservers) { - o.onSheetContentChanged(content); - } - updateHandleTint(); - mContentSwapAnimatorSet = null; - } - }); - - // For the toolbar transition, make sure we don't detach the default toolbar view. - animators.add(getViewTransitionAnimator( - newToolbar, oldToolbar, mToolbarHolder, mDefaultToolbarView != oldToolbar)); - animators.add(getViewTransitionAnimator( - content.getContentView(), oldContent, mBottomSheetContentContainer, true)); - - mContentSwapAnimatorSet.playTogether(animators); - mContentSwapAnimatorSet.start(); + for (BottomSheetObserver o : mObservers) { + o.onSheetContentChanged(mSheetContent); + } } /** - * Creates a transition animation between two views. The old view is faded out completely - * before the new view is faded in. There is an option to detach the old view or not. - * @param newView The new view to transition to. - * @param oldView The old view to transition from. - * @param detachOldView Whether or not to detach the old view once faded out. - * @return An animator that runs the specified animation. + * Fade between a new toolbar and the old toolbar to be shown. A null parameter can be used to + * refer to the default omnibox toolbar. Normally, the new toolbar is attached to the toolbar + * container and faded in. In the case of the default toolbar, the old toolbar is faded out. + * This is because the default toolbar is always attached to the view hierarchy and sits behind + * the attach point for the other toolbars. + * @param newToolbar The toolbar that will be shown. + * @param oldToolbar The toolbar being replaced. */ - private Animator getViewTransitionAnimator(final View newView, final View oldView, - final ViewGroup parent, final boolean detachOldView) { - if (newView == oldView) return null; + private void doToolbarSwap(View newToolbar, View oldToolbar) { + if (mToolbarFadeAnimator != null) mToolbarFadeAnimator.end(); - AnimatorSet animatorSet = new AnimatorSet(); - List<Animator> animators = new ArrayList<>(); + final View targetToolbar = newToolbar != null ? newToolbar : mDefaultToolbarView; + final View currentToolbar = oldToolbar != null ? oldToolbar : mDefaultToolbarView; - // Fade out the old view. - if (oldView != null) { - ValueAnimator fadeOutAnimator = ObjectAnimator.ofFloat(oldView, View.ALPHA, 0); - fadeOutAnimator.setDuration(TRANSITION_DURATION_MS); - fadeOutAnimator.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - if (detachOldView && oldView.getParent() != null) { - parent.removeView(oldView); - } - } - }); - animators.add(fadeOutAnimator); + if (targetToolbar == currentToolbar) return; + + if (targetToolbar != mDefaultToolbarView) { + mToolbarHolder.addView(targetToolbar); + targetToolbar.setAlpha(0f); + } else { + targetToolbar.setVisibility(View.VISIBLE); + targetToolbar.setAlpha(1f); } - // Fade in the new view. - if (parent != newView.getParent()) parent.addView(newView); - newView.setAlpha(0); - ValueAnimator fadeInAnimator = ObjectAnimator.ofFloat(newView, View.ALPHA, 1); - fadeInAnimator.setDuration(TRANSITION_DURATION_MS); - animators.add(fadeInAnimator); + mToolbarFadeAnimator = ObjectAnimator.ofFloat(0, 1); + mToolbarFadeAnimator.setDuration(BASE_ANIMATION_DURATION_MS); + mToolbarFadeAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator animator) { + if (targetToolbar == mDefaultToolbarView) { + currentToolbar.setAlpha(1f - animator.getAnimatedFraction()); + } else { + targetToolbar.setAlpha(animator.getAnimatedFraction()); + } + } + }); + mToolbarFadeAnimator.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + targetToolbar.setAlpha(1f); + currentToolbar.setAlpha(0f); + if (currentToolbar != mDefaultToolbarView) { + mToolbarHolder.removeView(currentToolbar); + } else { + currentToolbar.setVisibility(View.GONE); + } + mToolbarFadeAnimator = null; + updateHandleTint(); + } + }); - animatorSet.playSequentially(animators); - - return animatorSet; + mToolbarFadeAnimator.start(); } /**
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index e160fe9c..84b5bee 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -3497,6 +3497,11 @@ "search/one_google_bar/one_google_bar_fetcher.h", "search/one_google_bar/one_google_bar_fetcher_impl.cc", "search/one_google_bar/one_google_bar_fetcher_impl.h", + "search/one_google_bar/one_google_bar_service.cc", + "search/one_google_bar/one_google_bar_service.h", + "search/one_google_bar/one_google_bar_service_factory.cc", + "search/one_google_bar/one_google_bar_service_factory.h", + "search/one_google_bar/one_google_bar_service_observer.h", "signin/signin_promo.cc", "signin/signin_promo.h", "signin/signin_ui_util.cc",
diff --git a/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc b/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc index 431f3a5..a945705 100644 --- a/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc +++ b/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc
@@ -710,10 +710,6 @@ // off focused. IN_PROC_BROWSER_TEST_P(WebViewFocusInteractiveTest, Focus_FocusBeforeNavigation) { - // TODO(avallee): Determine if test is relevant with OOPIF or fix the bug. - // http://crbug.com/672947 - if (GetParam()) - return; TestHelper("testFocusBeforeNavigation", "web_view/focus", NO_TEST_SERVER); }
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc index 89806379..6380fb6 100644 --- a/chrome/browser/chromeos/login/wizard_controller.cc +++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -340,7 +340,7 @@ SetShowMdOobe(true); // TODO(drcrash): Remove this after testing (http://crbug.com/647411). - if (IsRemoraPairingOobe() || IsSharkRequisition() || IsRemoraRequisition()) { + if (IsRemoraPairingOobe() || IsSharkRequisition()) { SetShowMdOobe(false); }
diff --git a/chrome/browser/plugins/plugin_prefs.cc b/chrome/browser/plugins/plugin_prefs.cc index 0c418d1cd..4dcae31 100644 --- a/chrome/browser/plugins/plugin_prefs.cc +++ b/chrome/browser/plugins/plugin_prefs.cc
@@ -136,9 +136,9 @@ continue; // Oops, don't know what to do with this item. } - bool enabled; - if (!plugin->GetBoolean("enabled", &enabled)) - enabled = true; + bool enabled = true; + if (plugin->GetBoolean("enabled", &enabled)) + plugin->Remove("enabled", nullptr); // Migrate disabled plugins and re-enable them all internally. // TODO(http://crbug.com/662006): Remove migration eventually.
diff --git a/chrome/browser/resources/local_ntp/most_visited_single.js b/chrome/browser/resources/local_ntp/most_visited_single.js index c2569164..55f3df4e 100644 --- a/chrome/browser/resources/local_ntp/most_visited_single.js +++ b/chrome/browser/resources/local_ntp/most_visited_single.js
@@ -51,8 +51,8 @@ ICON_REAL: 1, ICON_COLOR: 2, ICON_DEFAULT: 3, - THUMBNAIL: 4, - THUMBNAIL_FAILED: 5, + THUMBNAIL: 7, + THUMBNAIL_FAILED: 8, };
diff --git a/chrome/browser/search/one_google_bar/one_google_bar_data.cc b/chrome/browser/search/one_google_bar/one_google_bar_data.cc index eac69e8..a5738e3 100644 --- a/chrome/browser/search/one_google_bar/one_google_bar_data.cc +++ b/chrome/browser/search/one_google_bar/one_google_bar_data.cc
@@ -12,3 +12,16 @@ OneGoogleBarData& OneGoogleBarData::operator=(const OneGoogleBarData&) = default; OneGoogleBarData& OneGoogleBarData::operator=(OneGoogleBarData&&) = default; + +bool operator==(const OneGoogleBarData& lhs, const OneGoogleBarData& rhs) { + return lhs.bar_html == rhs.bar_html && + lhs.in_head_script == rhs.in_head_script && + lhs.in_head_style == rhs.in_head_style && + lhs.after_bar_script == rhs.after_bar_script && + lhs.end_of_body_html == rhs.end_of_body_html && + lhs.end_of_body_script == rhs.end_of_body_script; +} + +bool operator!=(const OneGoogleBarData& lhs, const OneGoogleBarData& rhs) { + return !(lhs == rhs); +}
diff --git a/chrome/browser/search/one_google_bar/one_google_bar_data.h b/chrome/browser/search/one_google_bar/one_google_bar_data.h index caf3a27..f37cbb39 100644 --- a/chrome/browser/search/one_google_bar/one_google_bar_data.h +++ b/chrome/browser/search/one_google_bar/one_google_bar_data.h
@@ -29,4 +29,7 @@ std::string end_of_body_script; }; +bool operator==(const OneGoogleBarData& lhs, const OneGoogleBarData& rhs); +bool operator!=(const OneGoogleBarData& lhs, const OneGoogleBarData& rhs); + #endif // CHROME_BROWSER_SEARCH_ONE_GOOGLE_BAR_ONE_GOOGLE_BAR_DATA_H_
diff --git a/chrome/browser/search/one_google_bar/one_google_bar_fetcher.h b/chrome/browser/search/one_google_bar/one_google_bar_fetcher.h index 4b42d421..21b6e34 100644 --- a/chrome/browser/search/one_google_bar/one_google_bar_fetcher.h +++ b/chrome/browser/search/one_google_bar/one_google_bar_fetcher.h
@@ -16,6 +16,8 @@ using OneGoogleCallback = base::OnceCallback<void(const base::Optional<OneGoogleBarData>&)>; + virtual ~OneGoogleBarFetcher() = default; + // Initiates a fetch from the network. On completion (successful or not), the // callback will be called with the result, which will be nullopt on failure. virtual void Fetch(OneGoogleCallback callback) = 0;
diff --git a/chrome/browser/search/one_google_bar/one_google_bar_fetcher_impl.h b/chrome/browser/search/one_google_bar/one_google_bar_fetcher_impl.h index 40538ef..e27d3f82 100644 --- a/chrome/browser/search/one_google_bar/one_google_bar_fetcher_impl.h +++ b/chrome/browser/search/one_google_bar/one_google_bar_fetcher_impl.h
@@ -35,7 +35,7 @@ OAuth2TokenService* token_service, net::URLRequestContextGetter* request_context, GoogleURLTracker* google_url_tracker); - ~OneGoogleBarFetcherImpl(); + ~OneGoogleBarFetcherImpl() override; void Fetch(OneGoogleCallback callback) override;
diff --git a/chrome/browser/search/one_google_bar/one_google_bar_service.cc b/chrome/browser/search/one_google_bar/one_google_bar_service.cc new file mode 100644 index 0000000..e585921b --- /dev/null +++ b/chrome/browser/search/one_google_bar/one_google_bar_service.cc
@@ -0,0 +1,87 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/search/one_google_bar/one_google_bar_service.h" + +#include <utility> + +#include "base/bind.h" +#include "base/callback.h" +#include "base/memory/ptr_util.h" +#include "chrome/browser/search/one_google_bar/one_google_bar_fetcher.h" +#include "components/signin/core/browser/signin_manager_base.h" + +class OneGoogleBarService::SigninObserver : public SigninManagerBase::Observer { + public: + using SigninStatusChangedCallback = base::Closure; + + SigninObserver(SigninManagerBase* signin_manager, + const SigninStatusChangedCallback& callback) + : signin_manager_(signin_manager), callback_(callback) { + signin_manager_->AddObserver(this); + } + + ~SigninObserver() override { signin_manager_->RemoveObserver(this); } + + private: + // SigninManagerBase::Observer implementation. + void GoogleSigninSucceeded(const std::string& account_id, + const std::string& username, + const std::string& password) override { + callback_.Run(); + } + + void GoogleSignedOut(const std::string& account_id, + const std::string& username) override { + callback_.Run(); + } + + SigninManagerBase* const signin_manager_; + SigninStatusChangedCallback callback_; +}; + +OneGoogleBarService::OneGoogleBarService( + SigninManagerBase* signin_manager, + std::unique_ptr<OneGoogleBarFetcher> fetcher) + : fetcher_(std::move(fetcher)), + signin_observer_(base::MakeUnique<SigninObserver>( + signin_manager, + base::Bind(&OneGoogleBarService::SigninStatusChanged, + base::Unretained(this)))) {} + +OneGoogleBarService::~OneGoogleBarService() = default; + +void OneGoogleBarService::Shutdown() { + signin_observer_.reset(); +} + +void OneGoogleBarService::Refresh() { + fetcher_->Fetch(base::BindOnce(&OneGoogleBarService::SetOneGoogleBarData, + base::Unretained(this))); +} + +void OneGoogleBarService::AddObserver(OneGoogleBarServiceObserver* observer) { + observers_.AddObserver(observer); +} + +void OneGoogleBarService::RemoveObserver( + OneGoogleBarServiceObserver* observer) { + observers_.RemoveObserver(observer); +} + +void OneGoogleBarService::SigninStatusChanged() { + SetOneGoogleBarData(base::nullopt); +} + +void OneGoogleBarService::SetOneGoogleBarData( + const base::Optional<OneGoogleBarData>& data) { + if (one_google_bar_data_ == data) { + return; + } + + one_google_bar_data_ = data; + for (auto& observer : observers_) { + observer.OnOneGoogleBarDataChanged(); + } +}
diff --git a/chrome/browser/search/one_google_bar/one_google_bar_service.h b/chrome/browser/search/one_google_bar/one_google_bar_service.h new file mode 100644 index 0000000..9884ab52 --- /dev/null +++ b/chrome/browser/search/one_google_bar/one_google_bar_service.h
@@ -0,0 +1,61 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_SEARCH_ONE_GOOGLE_BAR_ONE_GOOGLE_BAR_SERVICE_H_ +#define CHROME_BROWSER_SEARCH_ONE_GOOGLE_BAR_ONE_GOOGLE_BAR_SERVICE_H_ + +#include <memory> + +#include "base/observer_list.h" +#include "base/optional.h" +#include "chrome/browser/search/one_google_bar/one_google_bar_data.h" +#include "chrome/browser/search/one_google_bar/one_google_bar_service_observer.h" +#include "components/keyed_service/core/keyed_service.h" + +class OneGoogleBarFetcher; +class SigninManagerBase; + +// A service that downloads, caches, and hands out OneGoogleBarData. It never +// initiates a download automatically, only when Refresh is called. When the +// user signs in or out, the cached value is cleared. +class OneGoogleBarService : public KeyedService { + public: + OneGoogleBarService(SigninManagerBase* signin_manager, + std::unique_ptr<OneGoogleBarFetcher> fetcher); + ~OneGoogleBarService() override; + + // KeyedService implementation. + void Shutdown() override; + + // Returns the currently cached OneGoogleBarData, if any. + const base::Optional<OneGoogleBarData>& one_google_bar_data() const { + return one_google_bar_data_; + } + + // Requests an asynchronous refresh from the network. After the update + // completes, the observers will be notified only if something changed. + void Refresh(); + + // Add/remove observers. All observers must unregister themselves before the + // OneGoogleBarService is destroyed. + void AddObserver(OneGoogleBarServiceObserver* observer); + void RemoveObserver(OneGoogleBarServiceObserver* observer); + + private: + class SigninObserver; + + void SigninStatusChanged(); + + void SetOneGoogleBarData(const base::Optional<OneGoogleBarData>& data); + + std::unique_ptr<OneGoogleBarFetcher> fetcher_; + + std::unique_ptr<SigninObserver> signin_observer_; + + base::ObserverList<OneGoogleBarServiceObserver, true> observers_; + + base::Optional<OneGoogleBarData> one_google_bar_data_; +}; + +#endif // CHROME_BROWSER_SEARCH_ONE_GOOGLE_BAR_ONE_GOOGLE_BAR_SERVICE_H_
diff --git a/chrome/browser/search/one_google_bar/one_google_bar_service_factory.cc b/chrome/browser/search/one_google_bar/one_google_bar_service_factory.cc new file mode 100644 index 0000000..57c63b5 --- /dev/null +++ b/chrome/browser/search/one_google_bar/one_google_bar_service_factory.cc
@@ -0,0 +1,55 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/search/one_google_bar/one_google_bar_service_factory.h" + +#include "base/memory/ptr_util.h" +#include "chrome/browser/google/google_url_tracker_factory.h" +#include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/one_google_bar/one_google_bar_fetcher_impl.h" +#include "chrome/browser/search/one_google_bar/one_google_bar_service.h" +#include "chrome/browser/signin/profile_oauth2_token_service_factory.h" +#include "chrome/browser/signin/signin_manager_factory.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "components/signin/core/browser/profile_oauth2_token_service.h" +#include "components/signin/core/browser/signin_manager.h" +#include "content/public/browser/browser_context.h" + +// static +OneGoogleBarService* OneGoogleBarServiceFactory::GetForProfile( + Profile* profile) { + return static_cast<OneGoogleBarService*>( + GetInstance()->GetServiceForBrowserContext(profile, true)); +} + +// static +OneGoogleBarServiceFactory* OneGoogleBarServiceFactory::GetInstance() { + return base::Singleton<OneGoogleBarServiceFactory>::get(); +} + +OneGoogleBarServiceFactory::OneGoogleBarServiceFactory() + : BrowserContextKeyedServiceFactory( + "OneGoogleBarService", + BrowserContextDependencyManager::GetInstance()) { + DependsOn(SigninManagerFactory::GetInstance()); + DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance()); + DependsOn(GoogleURLTrackerFactory::GetInstance()); +} + +OneGoogleBarServiceFactory::~OneGoogleBarServiceFactory() = default; + +KeyedService* OneGoogleBarServiceFactory::BuildServiceInstanceFor( + content::BrowserContext* context) const { + Profile* profile = Profile::FromBrowserContext(context); + SigninManagerBase* signin_manager = + SigninManagerFactory::GetForProfile(profile); + OAuth2TokenService* token_service = + ProfileOAuth2TokenServiceFactory::GetForProfile(profile); + GoogleURLTracker* google_url_tracker = + GoogleURLTrackerFactory::GetForProfile(profile); + return new OneGoogleBarService( + signin_manager, base::MakeUnique<OneGoogleBarFetcherImpl>( + signin_manager, token_service, + profile->GetRequestContext(), google_url_tracker)); +}
diff --git a/chrome/browser/search/one_google_bar/one_google_bar_service_factory.h b/chrome/browser/search/one_google_bar/one_google_bar_service_factory.h new file mode 100644 index 0000000..94ac82b6 --- /dev/null +++ b/chrome/browser/search/one_google_bar/one_google_bar_service_factory.h
@@ -0,0 +1,35 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_SEARCH_ONE_GOOGLE_BAR_ONE_GOOGLE_BAR_SERVICE_FACTORY_H_ +#define CHROME_BROWSER_SEARCH_ONE_GOOGLE_BAR_ONE_GOOGLE_BAR_SERVICE_FACTORY_H_ + +#include "base/macros.h" +#include "base/memory/singleton.h" +#include "components/keyed_service/content/browser_context_keyed_service_factory.h" + +class OneGoogleBarService; +class Profile; + +class OneGoogleBarServiceFactory : public BrowserContextKeyedServiceFactory { + public: + // Returns the OneGoogleBarService for |profile|. + static OneGoogleBarService* GetForProfile(Profile* profile); + + static OneGoogleBarServiceFactory* GetInstance(); + + private: + friend struct base::DefaultSingletonTraits<OneGoogleBarServiceFactory>; + + OneGoogleBarServiceFactory(); + ~OneGoogleBarServiceFactory() override; + + // Overridden from BrowserContextKeyedServiceFactory: + KeyedService* BuildServiceInstanceFor( + content::BrowserContext* profile) const override; + + DISALLOW_COPY_AND_ASSIGN(OneGoogleBarServiceFactory); +}; + +#endif // CHROME_BROWSER_SEARCH_ONE_GOOGLE_BAR_ONE_GOOGLE_BAR_SERVICE_FACTORY_H_
diff --git a/chrome/browser/search/one_google_bar/one_google_bar_service_observer.h b/chrome/browser/search/one_google_bar/one_google_bar_service_observer.h new file mode 100644 index 0000000..9480231 --- /dev/null +++ b/chrome/browser/search/one_google_bar/one_google_bar_service_observer.h
@@ -0,0 +1,16 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_SEARCH_ONE_GOOGLE_BAR_ONE_GOOGLE_BAR_SERVICE_OBSERVER_H_ +#define CHROME_BROWSER_SEARCH_ONE_GOOGLE_BAR_ONE_GOOGLE_BAR_SERVICE_OBSERVER_H_ + +// Observer for OneGoogleBarService. +class OneGoogleBarServiceObserver { + public: + // Called when the OneGoogleBarData changes. You can get the new data via + // OneGoogleBarService::one_google_bar_data(). + virtual void OnOneGoogleBarDataChanged() = 0; +}; + +#endif // CHROME_BROWSER_SEARCH_ONE_GOOGLE_BAR_ONE_GOOGLE_BAR_SERVICE_OBSERVER_H_
diff --git a/chrome/browser/search/one_google_bar/one_google_bar_service_unittest.cc b/chrome/browser/search/one_google_bar/one_google_bar_service_unittest.cc new file mode 100644 index 0000000..a4cfe20 --- /dev/null +++ b/chrome/browser/search/one_google_bar/one_google_bar_service_unittest.cc
@@ -0,0 +1,219 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/search/one_google_bar/one_google_bar_service.h" + +#include <memory> +#include <utility> +#include <vector> + +#include "base/macros.h" +#include "base/memory/ptr_util.h" +#include "base/optional.h" +#include "chrome/browser/search/one_google_bar/one_google_bar_data.h" +#include "chrome/browser/search/one_google_bar/one_google_bar_fetcher.h" +#include "components/signin/core/browser/account_tracker_service.h" +#include "components/signin/core/browser/fake_profile_oauth2_token_service.h" +#include "components/signin/core/browser/fake_signin_manager.h" +#include "components/signin/core/browser/test_signin_client.h" +#include "components/sync_preferences/testing_pref_service_syncable.h" +#include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" + +using testing::Eq; +using testing::StrictMock; + +class FakeOneGoogleBarFetcher : public OneGoogleBarFetcher { + public: + void Fetch(OneGoogleCallback callback) override { + callbacks_.push_back(std::move(callback)); + } + + size_t GetCallbackCount() const { return callbacks_.size(); } + + void RespondToAllCallbacks(const base::Optional<OneGoogleBarData>& data) { + for (OneGoogleCallback& callback : callbacks_) { + std::move(callback).Run(data); + } + callbacks_.clear(); + } + + private: + std::vector<OneGoogleCallback> callbacks_; +}; + +class MockOneGoogleBarServiceObserver : public OneGoogleBarServiceObserver { + public: + MOCK_METHOD0(OnOneGoogleBarDataChanged, void()); +}; + +class OneGoogleBarServiceTest : public testing::Test { + public: + OneGoogleBarServiceTest() + : signin_client_(&pref_service_), + signin_manager_(&signin_client_, &account_tracker_) { + SigninManagerBase::RegisterProfilePrefs(pref_service_.registry()); + SigninManagerBase::RegisterPrefs(pref_service_.registry()); + + auto fetcher = base::MakeUnique<FakeOneGoogleBarFetcher>(); + fetcher_ = fetcher.get(); + service_ = base::MakeUnique<OneGoogleBarService>(&signin_manager_, + std::move(fetcher)); + } + + FakeOneGoogleBarFetcher* fetcher() { return fetcher_; } + OneGoogleBarService* service() { return service_.get(); } + + private: + sync_preferences::TestingPrefServiceSyncable pref_service_; + TestSigninClient signin_client_; + AccountTrackerService account_tracker_; + FakeSigninManagerBase signin_manager_; + + // Owned by the service. + FakeOneGoogleBarFetcher* fetcher_; + + std::unique_ptr<OneGoogleBarService> service_; +}; + +TEST_F(OneGoogleBarServiceTest, RefreshesOnRequest) { + ASSERT_THAT(service()->one_google_bar_data(), Eq(base::nullopt)); + + // Request a refresh. That should arrive at the fetcher. + service()->Refresh(); + EXPECT_THAT(fetcher()->GetCallbackCount(), Eq(1u)); + + // Fulfill it. + OneGoogleBarData data; + data.bar_html = "<div></div>"; + fetcher()->RespondToAllCallbacks(data); + EXPECT_THAT(service()->one_google_bar_data(), Eq(data)); + + // Request another refresh. + service()->Refresh(); + EXPECT_THAT(fetcher()->GetCallbackCount(), Eq(1u)); + + // For now, the old data should still be there. + EXPECT_THAT(service()->one_google_bar_data(), Eq(data)); + + // Fulfill the second request. + OneGoogleBarData other_data; + other_data.bar_html = "<div>Different!</div>"; + fetcher()->RespondToAllCallbacks(other_data); + EXPECT_THAT(service()->one_google_bar_data(), Eq(other_data)); +} + +TEST_F(OneGoogleBarServiceTest, NotifiesObserverOnChanges) { + ASSERT_THAT(service()->one_google_bar_data(), Eq(base::nullopt)); + + StrictMock<MockOneGoogleBarServiceObserver> observer; + service()->AddObserver(&observer); + + // Empty result from a fetch doesn't change anything (it's already empty), so + // should not result in a notification. + service()->Refresh(); + fetcher()->RespondToAllCallbacks(base::nullopt); + + // Non-empty response should result in a notification. + service()->Refresh(); + OneGoogleBarData data; + data.bar_html = "<div></div>"; + EXPECT_CALL(observer, OnOneGoogleBarDataChanged()); + fetcher()->RespondToAllCallbacks(data); + EXPECT_THAT(service()->one_google_bar_data(), Eq(data)); + + // Non-empty but identical response should not result in another notification. + service()->Refresh(); + OneGoogleBarData identical_data = data; + fetcher()->RespondToAllCallbacks(identical_data); + + // Different response should result in a notification. + service()->Refresh(); + OneGoogleBarData other_data; + data.bar_html = "<div>Different</div>"; + EXPECT_CALL(observer, OnOneGoogleBarDataChanged()); + fetcher()->RespondToAllCallbacks(other_data); + EXPECT_THAT(service()->one_google_bar_data(), Eq(other_data)); + + // Finally, an empty response should result in a notification now. + service()->Refresh(); + EXPECT_CALL(observer, OnOneGoogleBarDataChanged()); + fetcher()->RespondToAllCallbacks(base::nullopt); + EXPECT_THAT(service()->one_google_bar_data(), Eq(base::nullopt)); + + service()->RemoveObserver(&observer); +} + +#if !defined(OS_CHROMEOS) + +// Like OneGoogleBarServiceTest, but it has a FakeSigninManager (rather than +// FakeSigninManagerBase), so it can simulate sign-in and sign-out. +class OneGoogleBarServiceSignInTest : public testing::Test { + public: + OneGoogleBarServiceSignInTest() + : signin_client_(&pref_service_), + signin_manager_(&signin_client_, + &token_service_, + &account_tracker_, + nullptr) { + SigninManagerBase::RegisterProfilePrefs(pref_service_.registry()); + SigninManagerBase::RegisterPrefs(pref_service_.registry()); + AccountTrackerService::RegisterPrefs(pref_service_.registry()); + + account_tracker_.Initialize(&signin_client_); + + auto fetcher = base::MakeUnique<FakeOneGoogleBarFetcher>(); + fetcher_ = fetcher.get(); + service_ = base::MakeUnique<OneGoogleBarService>(&signin_manager_, + std::move(fetcher)); + } + + void SignIn() { signin_manager_.SignIn("account", "username", "pass"); } + void SignOut() { signin_manager_.ForceSignOut(); } + + FakeOneGoogleBarFetcher* fetcher() { return fetcher_; } + OneGoogleBarService* service() { return service_.get(); } + + private: + sync_preferences::TestingPrefServiceSyncable pref_service_; + TestSigninClient signin_client_; + FakeProfileOAuth2TokenService token_service_; + AccountTrackerService account_tracker_; + FakeSigninManager signin_manager_; + + // Owned by the service. + FakeOneGoogleBarFetcher* fetcher_; + + std::unique_ptr<OneGoogleBarService> service_; +}; + +TEST_F(OneGoogleBarServiceSignInTest, ResetsOnSignIn) { + // Load some data. + service()->Refresh(); + OneGoogleBarData data; + data.bar_html = "<div></div>"; + fetcher()->RespondToAllCallbacks(data); + ASSERT_THAT(service()->one_google_bar_data(), Eq(data)); + + // Sign in. This should clear the cached data. + SignIn(); + EXPECT_THAT(service()->one_google_bar_data(), Eq(base::nullopt)); +} + +TEST_F(OneGoogleBarServiceSignInTest, ResetsOnSignOut) { + SignIn(); + + // Load some data. + service()->Refresh(); + OneGoogleBarData data; + data.bar_html = "<div></div>"; + fetcher()->RespondToAllCallbacks(data); + ASSERT_THAT(service()->one_google_bar_data(), Eq(data)); + + // Sign out. This should clear the cached data. + SignOut(); + EXPECT_THAT(service()->one_google_bar_data(), Eq(base::nullopt)); +} + +#endif // OS_CHROMEOS
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index e529237..8aeb6fa 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn
@@ -3672,6 +3672,7 @@ "../browser/search/instant_unittest_base.cc", "../browser/search/instant_unittest_base.h", "../browser/search/one_google_bar/one_google_bar_fetcher_impl_unittest.cc", + "../browser/search/one_google_bar/one_google_bar_service_unittest.cc", "../browser/search/search_unittest.cc", "../browser/sessions/persistent_tab_restore_service_unittest.cc", "../browser/signin/mutable_profile_oauth2_token_service_delegate_unittest.cc",
diff --git a/components/doodle/doodle_fetcher_impl.cc b/components/doodle/doodle_fetcher_impl.cc index b1c8188..0109468 100644 --- a/components/doodle/doodle_fetcher_impl.cc +++ b/components/doodle/doodle_fetcher_impl.cc
@@ -87,11 +87,14 @@ "currently running Doodle." trigger: "Displaying the new tab page on Android." - data: "None." + data: + "The user's Google cookies. Used for example to show birthday " + "doodles at appropriate times." destination: GOOGLE_OWNED_SERVICE } policy { - cookies_allowed: false + cookies_allowed: true + cookies_store: "user" setting: "Choosing a non-Google search engine in Chromium settings under " "'Search Engine' will disable this feature." @@ -103,9 +106,8 @@ BuildDoodleURL(GetGoogleBaseUrl(), gray_background_, override_url_), URLFetcher::GET, this, traffic_annotation); fetcher_->SetRequestContext(download_context_.get()); - fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES | - net::LOAD_DO_NOT_SAVE_COOKIES | - net::LOAD_DO_NOT_SEND_AUTH_DATA); + // TODO(treib): Use OAuth2 authentication instead of cookies. crbug.com/711314 + fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_AUTH_DATA); fetcher_->SetAutomaticallyRetryOnNetworkChanges(1); data_use_measurement::DataUseUserData::AttachToFetcher( fetcher_.get(), data_use_measurement::DataUseUserData::DOODLE);
diff --git a/components/ntp_tiles/popular_sites.h b/components/ntp_tiles/popular_sites.h index 43dbc84a..f1e207f 100644 --- a/components/ntp_tiles/popular_sites.h +++ b/components/ntp_tiles/popular_sites.h
@@ -66,6 +66,7 @@ // Various internals exposed publicly for diagnostic pages only. virtual GURL GetLastURLFetched() const = 0; virtual GURL GetURLToFetch() = 0; + virtual std::string GetDirectoryToFetch() = 0; virtual std::string GetCountryToFetch() = 0; virtual std::string GetVersionToFetch() = 0; virtual const base::ListValue* GetCachedJson() = 0;
diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/popular_sites_impl.cc index f083770a..eb52b39 100644 --- a/components/ntp_tiles/popular_sites_impl.cc +++ b/components/ntp_tiles/popular_sites_impl.cc
@@ -52,7 +52,8 @@ namespace { const char kPopularSitesURLFormat[] = - "https://www.gstatic.com/chrome/ntp/suggested_sites_%s_%s.json"; + "https://www.gstatic.com/%ssuggested_sites_%s_%s.json"; +const char kPopularSitesDefaultDirectory[] = "chrome/ntp/"; const char kPopularSitesDefaultCountryCode[] = "DEFAULT"; const char kPopularSitesDefaultVersion[] = "5"; const int kPopularSitesRedownloadIntervalHours = 24; @@ -65,10 +66,11 @@ // versions of Chrome, no longer used. Remove after M61. const char kPopularSitesLocalFilenameToCleanup[] = "suggested_sites.json"; -GURL GetPopularSitesURL(const std::string& country, +GURL GetPopularSitesURL(const std::string& directory, + const std::string& country, const std::string& version) { - return GURL(base::StringPrintf(kPopularSitesURLFormat, country.c_str(), - version.c_str())); + return GURL(base::StringPrintf(kPopularSitesURLFormat, directory.c_str(), + country.c_str(), version.c_str())); } // Extract the country from the default search engine if the default search @@ -259,13 +261,25 @@ } GURL PopularSitesImpl::GetURLToFetch() { + const std::string directory = GetDirectoryToFetch(); const std::string country = GetCountryToFetch(); const std::string version = GetVersionToFetch(); const GURL override_url = GURL(prefs_->GetString(ntp_tiles::prefs::kPopularSitesOverrideURL)); - return override_url.is_valid() ? override_url - : GetPopularSitesURL(country, version); + return override_url.is_valid() + ? override_url + : GetPopularSitesURL(directory, country, version); +} + +std::string PopularSitesImpl::GetDirectoryToFetch() { + std::string directory = + prefs_->GetString(ntp_tiles::prefs::kPopularSitesOverrideDirectory); + + if (directory.empty()) + directory = kPopularSitesDefaultDirectory; + + return directory; } // Determine the country code to use. In order of precedence: @@ -325,6 +339,8 @@ user_prefs::PrefRegistrySyncable* user_prefs) { user_prefs->RegisterStringPref(ntp_tiles::prefs::kPopularSitesOverrideURL, std::string()); + user_prefs->RegisterStringPref( + ntp_tiles::prefs::kPopularSitesOverrideDirectory, std::string()); user_prefs->RegisterStringPref(ntp_tiles::prefs::kPopularSitesOverrideCountry, std::string()); user_prefs->RegisterStringPref(ntp_tiles::prefs::kPopularSitesOverrideVersion, @@ -413,7 +429,8 @@ if (!is_fallback_) { DLOG(WARNING) << "Download country site list failed"; is_fallback_ = true; - pending_url_ = GetPopularSitesURL(kPopularSitesDefaultCountryCode, + pending_url_ = GetPopularSitesURL(kPopularSitesDefaultDirectory, + kPopularSitesDefaultCountryCode, kPopularSitesDefaultVersion); FetchPopularSites(); } else {
diff --git a/components/ntp_tiles/popular_sites_impl.h b/components/ntp_tiles/popular_sites_impl.h index 1f0fbbe6..b045dea6a 100644 --- a/components/ntp_tiles/popular_sites_impl.h +++ b/components/ntp_tiles/popular_sites_impl.h
@@ -67,6 +67,7 @@ const SitesVector& sites() const override; GURL GetLastURLFetched() const override; GURL GetURLToFetch() override; + std::string GetDirectoryToFetch() override; std::string GetCountryToFetch() override; std::string GetVersionToFetch() override; const base::ListValue* GetCachedJson() override;
diff --git a/components/ntp_tiles/popular_sites_impl_unittest.cc b/components/ntp_tiles/popular_sites_impl_unittest.cc index 1deff6bd..044a5d6d 100644 --- a/components/ntp_tiles/popular_sites_impl_unittest.cc +++ b/components/ntp_tiles/popular_sites_impl_unittest.cc
@@ -458,5 +458,18 @@ EXPECT_THAT(sites[0].url, URLEq("https://www.chromium.org/")); } +TEST_F(PopularSitesTest, ShouldOverrideDirectory) { + SetCountryAndVersion("ZZ", "9"); + prefs_->SetString(prefs::kPopularSitesOverrideDirectory, "foo/bar/"); + RespondWithJSON("https://www.gstatic.com/foo/bar/suggested_sites_ZZ_9.json", + {kWikipedia}); + + PopularSites::SitesVector sites; + EXPECT_THAT(FetchPopularSites(/*force_download=*/false, &sites), + Eq(base::Optional<bool>(true))); + + EXPECT_THAT(sites.size(), Eq(1u)); +} + } // namespace } // namespace ntp_tiles
diff --git a/components/ntp_tiles/pref_names.cc b/components/ntp_tiles/pref_names.cc index 1988357..c8839987 100644 --- a/components/ntp_tiles/pref_names.cc +++ b/components/ntp_tiles/pref_names.cc
@@ -15,6 +15,10 @@ // overrides for country and version below. const char kPopularSitesOverrideURL[] = "popular_sites.override_url"; +// If set, this will override the URL path directory for popular sites. +const char kPopularSitesOverrideDirectory[] = + "popular_sites.override_directory"; + // If set, this will override the country detection for popular sites. const char kPopularSitesOverrideCountry[] = "popular_sites.override_country";
diff --git a/components/ntp_tiles/pref_names.h b/components/ntp_tiles/pref_names.h index cdaa896..9c4de063 100644 --- a/components/ntp_tiles/pref_names.h +++ b/components/ntp_tiles/pref_names.h
@@ -11,6 +11,7 @@ extern const char kNumPersonalTiles[]; extern const char kPopularSitesOverrideURL[]; +extern const char kPopularSitesOverrideDirectory[]; extern const char kPopularSitesOverrideCountry[]; extern const char kPopularSitesOverrideVersion[];
diff --git a/components/ntp_tiles/webui/ntp_tiles_internals_message_handler.cc b/components/ntp_tiles/webui/ntp_tiles_internals_message_handler.cc index 7cc00477..ea6ee51 100644 --- a/components/ntp_tiles/webui/ntp_tiles_internals_message_handler.cc +++ b/components/ntp_tiles/webui/ntp_tiles_internals_message_handler.cc
@@ -110,6 +110,15 @@ url_formatter::FixupURL(url, std::string()).spec()); } + std::string directory; + dict->GetString("popular.overrideDirectory", &directory); + if (directory.empty()) { + prefs->ClearPref(ntp_tiles::prefs::kPopularSitesOverrideDirectory); + } else { + prefs->SetString(ntp_tiles::prefs::kPopularSitesOverrideDirectory, + directory); + } + std::string country; dict->GetString("popular.overrideCountry", &country); if (country.empty()) { @@ -181,6 +190,7 @@ if (most_visited_sites_->DoesSourceExist(TileSource::POPULAR)) { auto* popular_sites = most_visited_sites_->popular_sites(); value.SetString("popular.url", popular_sites->GetURLToFetch().spec()); + value.SetString("popular.directory", popular_sites->GetDirectoryToFetch()); value.SetString("popular.country", popular_sites->GetCountryToFetch()); value.SetString("popular.version", popular_sites->GetVersionToFetch()); @@ -188,6 +198,9 @@ "popular.overrideURL", prefs->GetString(ntp_tiles::prefs::kPopularSitesOverrideURL)); value.SetString( + "popular.overrideDirectory", + prefs->GetString(ntp_tiles::prefs::kPopularSitesOverrideDirectory)); + value.SetString( "popular.overrideCountry", prefs->GetString(ntp_tiles::prefs::kPopularSitesOverrideCountry)); value.SetString(
diff --git a/components/ntp_tiles/webui/popular_sites_internals_message_handler.cc b/components/ntp_tiles/webui/popular_sites_internals_message_handler.cc index 7163b59..68cc2228 100644 --- a/components/ntp_tiles/webui/popular_sites_internals_message_handler.cc +++ b/components/ntp_tiles/webui/popular_sites_internals_message_handler.cc
@@ -59,7 +59,7 @@ void PopularSitesInternalsMessageHandler::HandleUpdate( const base::ListValue* args) { - DCHECK_EQ(3u, args->GetSize()); + DCHECK_EQ(4u, args->GetSize()); PrefService* prefs = web_ui_->GetPrefs(); @@ -71,15 +71,23 @@ prefs->SetString(ntp_tiles::prefs::kPopularSitesOverrideURL, url_formatter::FixupURL(url, std::string()).spec()); + std::string directory; + args->GetString(1, &directory); + if (directory.empty()) + prefs->ClearPref(ntp_tiles::prefs::kPopularSitesOverrideDirectory); + else + prefs->SetString(ntp_tiles::prefs::kPopularSitesOverrideDirectory, + directory); + std::string country; - args->GetString(1, &country); + args->GetString(2, &country); if (country.empty()) prefs->ClearPref(ntp_tiles::prefs::kPopularSitesOverrideCountry); else prefs->SetString(ntp_tiles::prefs::kPopularSitesOverrideCountry, country); std::string version; - args->GetString(2, &version); + args->GetString(3, &version); if (version.empty()) prefs->ClearPref(ntp_tiles::prefs::kPopularSitesOverrideVersion); else @@ -109,13 +117,15 @@ PrefService* prefs = web_ui_->GetPrefs(); std::string url = prefs->GetString(ntp_tiles::prefs::kPopularSitesOverrideURL); + std::string directory = + prefs->GetString(ntp_tiles::prefs::kPopularSitesOverrideDirectory); std::string country = prefs->GetString(ntp_tiles::prefs::kPopularSitesOverrideCountry); std::string version = prefs->GetString(ntp_tiles::prefs::kPopularSitesOverrideVersion); web_ui_->CallJavascriptFunction( "chrome.popular_sites_internals.receiveOverrides", base::Value(url), - base::Value(country), base::Value(version)); + base::Value(directory), base::Value(country), base::Value(version)); } void PopularSitesInternalsMessageHandler::SendDownloadResult(bool success) {
diff --git a/components/ntp_tiles/webui/resources/ntp_tiles_internals.html b/components/ntp_tiles/webui/resources/ntp_tiles_internals.html index dfdfe36..ea70d72cc 100644 --- a/components/ntp_tiles/webui/resources/ntp_tiles_internals.html +++ b/components/ntp_tiles/webui/resources/ntp_tiles_internals.html
@@ -65,6 +65,10 @@ </tr> <tr jsdisplay="$this"> <td class="detail">Country</td> + <td class="value"><input id="override-directory" type="text" jsvalues="value:overrideDirectory;placeholder:directory"></td> + </tr> + <tr jsdisplay="$this"> + <td class="detail">Country</td> <td class="value"><input id="override-country" type="text" jsvalues="value:overrideCountry;placeholder:country"></td> </tr> <tr jsdisplay="$this"> @@ -125,4 +129,3 @@ </body> </html> -
diff --git a/components/ntp_tiles/webui/resources/ntp_tiles_internals.js b/components/ntp_tiles/webui/resources/ntp_tiles_internals.js index d0cbbdc..10b2bbb 100644 --- a/components/ntp_tiles/webui/resources/ntp_tiles_internals.js +++ b/components/ntp_tiles/webui/resources/ntp_tiles_internals.js
@@ -11,6 +11,7 @@ chrome.send('update', [{ "popular": { "overrideURL": $('override-url').value, + "overrideDirectory": $('override-directory').value, "overrideCountry": $('override-country').value, "overrideVersion": $('override-version').value, }, @@ -52,4 +53,3 @@ document.addEventListener('DOMContentLoaded', chrome.ntp_tiles_internals.initialize); -
diff --git a/components/ntp_tiles/webui/resources/popular_sites_internals.html b/components/ntp_tiles/webui/resources/popular_sites_internals.html index 81d8145..5ce97bcf 100644 --- a/components/ntp_tiles/webui/resources/popular_sites_internals.html +++ b/components/ntp_tiles/webui/resources/popular_sites_internals.html
@@ -31,10 +31,14 @@ <h2>Download</h2> <table class="section-details"> <tr> - <td class="detail">URL (takes precedence over Country and Version)</td> + <td class="detail">URL (takes precedence over Directory, Country and Version)</td> <td class="value"><input id="override-url" type="text"></td> </tr> <tr> + <td class="detail">Override Directory</td> + <td class="value"><input id="override-directory" type="text"></td> + </tr> + <tr> <td class="detail">Override Country</td> <td class="value"><input id="override-country" type="text"></td> </tr> @@ -80,4 +84,3 @@ </body> </html> -
diff --git a/components/ntp_tiles/webui/resources/popular_sites_internals.js b/components/ntp_tiles/webui/resources/popular_sites_internals.js index 10a40107..3bfcf8b 100644 --- a/components/ntp_tiles/webui/resources/popular_sites_internals.js +++ b/components/ntp_tiles/webui/resources/popular_sites_internals.js
@@ -9,6 +9,7 @@ function submitUpdate(event) { $('download-result').textContent = ''; chrome.send('update', [$('override-url').value, + $('override-directory').value, $('override-country').value, $('override-version').value]); event.preventDefault(); @@ -27,8 +28,9 @@ chrome.send('registerForEvents'); } - function receiveOverrides(url, country, version) { + function receiveOverrides(url, directory, country, version) { $('override-url').value = url; + $('override-directory').value = directory; $('override-country').value = country; $('override-version').value = version; } @@ -59,4 +61,3 @@ document.addEventListener('DOMContentLoaded', chrome.popular_sites_internals.initialize); -
diff --git a/components/payments/mojom/payment_app.mojom b/components/payments/mojom/payment_app.mojom index 5cc4e3b..ccda4c7 100644 --- a/components/payments/mojom/payment_app.mojom +++ b/components/payments/mojom/payment_app.mojom
@@ -48,9 +48,11 @@ => (PaymentAppManifestError error); GetManifest() => (PaymentAppManifest payment_app_manifest, PaymentAppManifestError error); - SetPaymentInstrument(string instrumentKey, PaymentInstrument instrument) + DeletePaymentInstrument(string instrument_key) => (PaymentHandlerStatus status); - GetPaymentInstrument(string instrumentKey) + SetPaymentInstrument(string instrument_key, PaymentInstrument instrument) + => (PaymentHandlerStatus status); + GetPaymentInstrument(string instrument_key) => (PaymentInstrument instrument, PaymentHandlerStatus status); };
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc index cdc1381a..4114d65 100644 --- a/content/browser/browser_plugin/browser_plugin_guest.cc +++ b/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -653,6 +653,9 @@ } void BrowserPluginGuest::RenderViewReady() { + if (GuestMode::IsCrossProcessFrameGuest(GetWebContents())) + return; + RenderViewHost* rvh = GetWebContents()->GetRenderViewHost(); // TODO(fsamuel): Investigate whether it's possible to update state earlier // here (see http://crbug.com/158151).
diff --git a/content/browser/payments/payment_app_database.cc b/content/browser/payments/payment_app_database.cc index 51a4dae..dc13182 100644 --- a/content/browser/payments/payment_app_database.cc +++ b/content/browser/payments/payment_app_database.cc
@@ -107,9 +107,23 @@ weak_ptr_factory_.GetWeakPtr(), callback)); } +void PaymentAppDatabase::DeletePaymentInstrument( + const GURL& scope, + const std::string& instrument_key, + DeletePaymentInstrumentCallback callback) { + DCHECK_CURRENTLY_ON(BrowserThread::IO); + + service_worker_context_->FindReadyRegistrationForPattern( + scope, + base::Bind( + &PaymentAppDatabase::DidFindRegistrationToDeletePaymentInstrument, + weak_ptr_factory_.GetWeakPtr(), instrument_key, + base::Passed(std::move(callback)))); +} + void PaymentAppDatabase::ReadPaymentInstrument( const GURL& scope, - const std::string& instrumentKey, + const std::string& instrument_key, ReadPaymentInstrumentCallback callback) { DCHECK_CURRENTLY_ON(BrowserThread::IO); @@ -117,13 +131,13 @@ scope, base::Bind( &PaymentAppDatabase::DidFindRegistrationToReadPaymentInstrument, - weak_ptr_factory_.GetWeakPtr(), instrumentKey, + weak_ptr_factory_.GetWeakPtr(), instrument_key, base::Passed(std::move(callback)))); } void PaymentAppDatabase::WritePaymentInstrument( const GURL& scope, - const std::string& instrumentKey, + const std::string& instrument_key, PaymentInstrumentPtr instrument, WritePaymentInstrumentCallback callback) { DCHECK_CURRENTLY_ON(BrowserThread::IO); @@ -132,7 +146,7 @@ scope, base::Bind( &PaymentAppDatabase::DidFindRegistrationToWritePaymentInstrument, - weak_ptr_factory_.GetWeakPtr(), instrumentKey, + weak_ptr_factory_.GetWeakPtr(), instrument_key, base::Passed(std::move(instrument)), base::Passed(std::move(callback)))); } @@ -249,8 +263,54 @@ callback.Run(std::move(manifests)); } +void PaymentAppDatabase::DidFindRegistrationToDeletePaymentInstrument( + const std::string& instrument_key, + DeletePaymentInstrumentCallback callback, + ServiceWorkerStatusCode status, + scoped_refptr<ServiceWorkerRegistration> registration) { + DCHECK_CURRENTLY_ON(BrowserThread::IO); + if (status != SERVICE_WORKER_OK) { + std::move(callback).Run(PaymentHandlerStatus::NO_ACTIVE_WORKER); + return; + } + + service_worker_context_->GetRegistrationUserData( + registration->id(), {instrument_key}, + base::Bind(&PaymentAppDatabase::DidFindPaymentInstrument, + weak_ptr_factory_.GetWeakPtr(), registration->id(), + instrument_key, base::Passed(std::move(callback)))); +} + +void PaymentAppDatabase::DidFindPaymentInstrument( + int64_t registration_id, + const std::string& instrument_key, + DeletePaymentInstrumentCallback callback, + const std::vector<std::string>& data, + ServiceWorkerStatusCode status) { + DCHECK_CURRENTLY_ON(BrowserThread::IO); + if (status != SERVICE_WORKER_OK || data.size() != 1) { + std::move(callback).Run(PaymentHandlerStatus::NOT_FOUND); + return; + } + + service_worker_context_->ClearRegistrationUserData( + registration_id, {instrument_key}, + base::Bind(&PaymentAppDatabase::DidDeletePaymentInstrument, + weak_ptr_factory_.GetWeakPtr(), + base::Passed(std::move(callback)))); +} + +void PaymentAppDatabase::DidDeletePaymentInstrument( + DeletePaymentInstrumentCallback callback, + ServiceWorkerStatusCode status) { + DCHECK_CURRENTLY_ON(BrowserThread::IO); + return std::move(callback).Run(status == SERVICE_WORKER_OK + ? PaymentHandlerStatus::SUCCESS + : PaymentHandlerStatus::NOT_FOUND); +} + void PaymentAppDatabase::DidFindRegistrationToReadPaymentInstrument( - const std::string& instrumentKey, + const std::string& instrument_key, ReadPaymentInstrumentCallback callback, ServiceWorkerStatusCode status, scoped_refptr<ServiceWorkerRegistration> registration) { @@ -262,7 +322,7 @@ } service_worker_context_->GetRegistrationUserData( - registration->id(), {instrumentKey}, + registration->id(), {instrument_key}, base::Bind(&PaymentAppDatabase::DidReadPaymentInstrument, weak_ptr_factory_.GetWeakPtr(), base::Passed(std::move(callback)))); @@ -290,7 +350,7 @@ } void PaymentAppDatabase::DidFindRegistrationToWritePaymentInstrument( - const std::string& instrumentKey, + const std::string& instrument_key, PaymentInstrumentPtr instrument, WritePaymentInstrumentCallback callback, ServiceWorkerStatusCode status, @@ -315,7 +375,7 @@ service_worker_context_->StoreRegistrationUserData( registration->id(), registration->pattern().GetOrigin(), - {{instrumentKey, serialized}}, + {{instrument_key, serialized}}, base::Bind(&PaymentAppDatabase::DidWritePaymentInstrument, weak_ptr_factory_.GetWeakPtr(), base::Passed(std::move(callback))));
diff --git a/content/browser/payments/payment_app_database.h b/content/browser/payments/payment_app_database.h index bac4c9c..7c81052 100644 --- a/content/browser/payments/payment_app_database.h +++ b/content/browser/payments/payment_app_database.h
@@ -32,6 +32,8 @@ std::pair<int64_t, payments::mojom::PaymentAppManifestPtr>; using Manifests = std::vector<ManifestWithID>; using ReadAllManifestsCallback = base::Callback<void(Manifests)>; + using DeletePaymentInstrumentCallback = + base::OnceCallback<void(payments::mojom::PaymentHandlerStatus)>; using ReadPaymentInstrumentCallback = base::OnceCallback<void(payments::mojom::PaymentInstrumentPtr, payments::mojom::PaymentHandlerStatus)>; @@ -47,11 +49,14 @@ const WriteManifestCallback& callback); void ReadManifest(const GURL& scope, const ReadManifestCallback& callback); void ReadAllManifests(const ReadAllManifestsCallback& callback); + void DeletePaymentInstrument(const GURL& scope, + const std::string& instrument_key, + DeletePaymentInstrumentCallback callback); void ReadPaymentInstrument(const GURL& scope, - const std::string& instrumentKey, + const std::string& instrument_key, ReadPaymentInstrumentCallback callback); void WritePaymentInstrument(const GURL& scope, - const std::string& instrumentKey, + const std::string& instrument_key, payments::mojom::PaymentInstrumentPtr instrument, WritePaymentInstrumentCallback callback); @@ -80,9 +85,23 @@ const std::vector<std::pair<int64_t, std::string>>& raw_data, ServiceWorkerStatusCode status); + // DeletePaymentInstrument callbacks + void DidFindRegistrationToDeletePaymentInstrument( + const std::string& instrument_key, + DeletePaymentInstrumentCallback callback, + ServiceWorkerStatusCode status, + scoped_refptr<ServiceWorkerRegistration> registration); + void DidFindPaymentInstrument(int64_t registration_id, + const std::string& instrument_key, + DeletePaymentInstrumentCallback callback, + const std::vector<std::string>& data, + ServiceWorkerStatusCode status); + void DidDeletePaymentInstrument(DeletePaymentInstrumentCallback callback, + ServiceWorkerStatusCode status); + // ReadPaymentInstrument callbacks void DidFindRegistrationToReadPaymentInstrument( - const std::string& instrumentKey, + const std::string& instrument_key, ReadPaymentInstrumentCallback callback, ServiceWorkerStatusCode status, scoped_refptr<ServiceWorkerRegistration> registration); @@ -92,7 +111,7 @@ // WritePaymentInstrument callbacks void DidFindRegistrationToWritePaymentInstrument( - const std::string& instrumentKey, + const std::string& instrument_key, payments::mojom::PaymentInstrumentPtr instrument, WritePaymentInstrumentCallback callback, ServiceWorkerStatusCode status,
diff --git a/content/browser/payments/payment_manager.cc b/content/browser/payments/payment_manager.cc index 62aca5c..d8447f7 100644 --- a/content/browser/payments/payment_manager.cc +++ b/content/browser/payments/payment_manager.cc
@@ -57,23 +57,32 @@ payment_app_context_->payment_app_database()->ReadManifest(scope_, callback); } +void PaymentManager::DeletePaymentInstrument( + const std::string& instrument_key, + const PaymentManager::DeletePaymentInstrumentCallback& callback) { + DCHECK_CURRENTLY_ON(BrowserThread::IO); + + payment_app_context_->payment_app_database()->DeletePaymentInstrument( + scope_, instrument_key, callback); +} + void PaymentManager::SetPaymentInstrument( - const std::string& instrumentKey, + const std::string& instrument_key, payments::mojom::PaymentInstrumentPtr details, const PaymentManager::SetPaymentInstrumentCallback& callback) { DCHECK_CURRENTLY_ON(BrowserThread::IO); payment_app_context_->payment_app_database()->WritePaymentInstrument( - scope_, instrumentKey, std::move(details), callback); + scope_, instrument_key, std::move(details), callback); } void PaymentManager::GetPaymentInstrument( - const std::string& instrumentKey, + const std::string& instrument_key, const PaymentManager::GetPaymentInstrumentCallback& callback) { DCHECK_CURRENTLY_ON(BrowserThread::IO); payment_app_context_->payment_app_database()->ReadPaymentInstrument( - scope_, instrumentKey, callback); + scope_, instrument_key, callback); } void PaymentManager::OnConnectionError() {
diff --git a/content/browser/payments/payment_manager.h b/content/browser/payments/payment_manager.h index 772b25d7..4a115e2 100644 --- a/content/browser/payments/payment_manager.h +++ b/content/browser/payments/payment_manager.h
@@ -36,12 +36,15 @@ void SetManifest(payments::mojom::PaymentAppManifestPtr manifest, const SetManifestCallback& callback) override; void GetManifest(const GetManifestCallback& callback) override; + void DeletePaymentInstrument( + const std::string& instrument_key, + const DeletePaymentInstrumentCallback& callback) override; void SetPaymentInstrument( - const std::string& instrumentKey, + const std::string& instrument_key, payments::mojom::PaymentInstrumentPtr details, const SetPaymentInstrumentCallback& callback) override; void GetPaymentInstrument( - const std::string& instrumentKey, + const std::string& instrument_key, const GetPaymentInstrumentCallback& callback) override; // Called when an error is detected on binding_.
diff --git a/content/browser/payments/payment_manager_unittest.cc b/content/browser/payments/payment_manager_unittest.cc index 1806b5d..0180d82 100644 --- a/content/browser/payments/payment_manager_unittest.cc +++ b/content/browser/payments/payment_manager_unittest.cc
@@ -40,6 +40,11 @@ *out_error = error; } +void DeletePaymentInstrumentCallback(PaymentHandlerStatus* out_status, + PaymentHandlerStatus status) { + *out_status = status; +} + void SetPaymentInstrumentCallback(PaymentHandlerStatus* out_status, PaymentHandlerStatus status) { *out_status = status; @@ -65,20 +70,28 @@ PaymentManager* payment_manager() const { return manager_; } - void SetPaymentInstrument(const std::string& instrumentKey, + void DeletePaymentInstrument(const std::string& instrument_key, + PaymentHandlerStatus* out_status) { + manager_->DeletePaymentInstrument( + instrument_key, + base::Bind(&DeletePaymentInstrumentCallback, out_status)); + base::RunLoop().RunUntilIdle(); + } + + void SetPaymentInstrument(const std::string& instrument_key, PaymentInstrumentPtr instrument, PaymentHandlerStatus* out_status) { manager_->SetPaymentInstrument( - instrumentKey, std::move(instrument), + instrument_key, std::move(instrument), base::Bind(&SetPaymentInstrumentCallback, out_status)); base::RunLoop().RunUntilIdle(); } - void GetPaymentInstrument(const std::string& instrumentKey, + void GetPaymentInstrument(const std::string& instrument_key, PaymentInstrumentPtr* out_instrument, PaymentHandlerStatus* out_status) { manager_->GetPaymentInstrument( - instrumentKey, + instrument_key, base::Bind(&GetPaymentInstrumentCallback, out_instrument, out_status)); base::RunLoop().RunUntilIdle(); } @@ -185,4 +198,29 @@ ASSERT_EQ(PaymentHandlerStatus::NOT_FOUND, read_status); } +TEST_F(PaymentManagerTest, DeletePaymentInstrument) { + PaymentHandlerStatus write_status = PaymentHandlerStatus::NOT_FOUND; + PaymentInstrumentPtr write_details = PaymentInstrument::New(); + write_details->name = "Visa ending ****4756", + write_details->enabled_methods.push_back("visa"); + write_details->stringified_capabilities = "{}"; + ASSERT_EQ(PaymentHandlerStatus::NOT_FOUND, write_status); + SetPaymentInstrument("test_key", std::move(write_details), &write_status); + ASSERT_EQ(PaymentHandlerStatus::SUCCESS, write_status); + + PaymentHandlerStatus read_status = PaymentHandlerStatus::NOT_FOUND; + PaymentInstrumentPtr read_details; + ASSERT_EQ(PaymentHandlerStatus::NOT_FOUND, read_status); + GetPaymentInstrument("test_key", &read_details, &read_status); + ASSERT_EQ(PaymentHandlerStatus::SUCCESS, read_status); + + PaymentHandlerStatus delete_status = PaymentHandlerStatus::NOT_FOUND; + DeletePaymentInstrument("test_key", &delete_status); + ASSERT_EQ(PaymentHandlerStatus::SUCCESS, delete_status); + + read_status = PaymentHandlerStatus::NOT_FOUND; + GetPaymentInstrument("test_key", &read_details, &read_status); + ASSERT_EQ(PaymentHandlerStatus::NOT_FOUND, read_status); +} + } // namespace content
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index 2509f35..919d333fd 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1521,10 +1521,13 @@ if (!render_manager->GetRenderWidgetHostView()) CreateRenderWidgetHostViewForRenderManager(GetRenderViewHost()); + auto* outer_web_contents_impl = + static_cast<WebContentsImpl*>(outer_web_contents); + auto* outer_contents_frame_impl = + static_cast<RenderFrameHostImpl*>(outer_contents_frame); // Create a link to our outer WebContents. - node_.ConnectToOuterWebContents( - static_cast<WebContentsImpl*>(outer_web_contents), - static_cast<RenderFrameHostImpl*>(outer_contents_frame)); + node_.ConnectToOuterWebContents(outer_web_contents_impl, + outer_contents_frame_impl); DCHECK(outer_contents_frame); @@ -1532,8 +1535,7 @@ // SiteInstance of the outer WebContents. The proxy will be used to send // postMessage to the inner WebContents. render_manager->CreateOuterDelegateProxy( - outer_contents_frame->GetSiteInstance(), - static_cast<RenderFrameHostImpl*>(outer_contents_frame)); + outer_contents_frame->GetSiteInstance(), outer_contents_frame_impl); render_manager->SetRWHViewForInnerContents( render_manager->GetRenderWidgetHostView()); @@ -1542,6 +1544,11 @@ render_manager->GetRenderWidgetHostView()) ->RegisterFrameSinkId(); + if (outer_web_contents_impl->frame_tree_.GetFocusedFrame() == + outer_contents_frame_impl->frame_tree_node()) { + SetFocusedFrame(frame_tree_.root(), nullptr); + } + // At this point, we should destroy the TextInputManager which will notify all // the RWHV in this WebContents. The RWHV in this WebContents should use the // TextInputManager owned by the outer WebContents.
diff --git a/content/test/gpu/generate_buildbot_json.py b/content/test/gpu/generate_buildbot_json.py index 57fde94..1e0e91e 100755 --- a/content/test/gpu/generate_buildbot_json.py +++ b/content/test/gpu/generate_buildbot_json.py
@@ -64,11 +64,19 @@ 'type': Types.GPU, 'builders': { - 'GPU Win Builder' : {}, + 'GPU Win Builder' : { + # TODO(machenbach): Remove additional browser_tests here and on several + # release bots below when http://crbug.com/714976 is resolved. + 'additional_compile_targets' : [ "browser_tests" ], + }, 'GPU Win Builder (dbg)' : {}, - 'GPU Mac Builder' : {}, + 'GPU Mac Builder' : { + 'additional_compile_targets' : [ "browser_tests" ], + }, 'GPU Mac Builder (dbg)' : {}, - 'GPU Linux Builder' : {}, + 'GPU Linux Builder' : { + 'additional_compile_targets' : [ "browser_tests" ], + }, 'GPU Linux Builder (dbg)' : {}, }, @@ -171,13 +179,23 @@ 'type': Types.GPU_FYI, 'builders': { - 'GPU Win Builder' : {}, + 'GPU Win Builder' : { + # TODO(machenbach): Remove additional browser_tests here and on several + # release bots below when http://crbug.com/714976 is resolved. + 'additional_compile_targets' : [ "browser_tests" ], + }, 'GPU Win Builder (dbg)' : {}, - 'GPU Win x64 Builder' : {}, + 'GPU Win x64 Builder' : { + 'additional_compile_targets' : [ "browser_tests" ], + }, 'GPU Win x64 Builder (dbg)' : {}, - 'GPU Mac Builder' : {}, + 'GPU Mac Builder' : { + 'additional_compile_targets' : [ "browser_tests" ], + }, 'GPU Mac Builder (dbg)' : {}, - 'GPU Linux Builder' : {}, + 'GPU Linux Builder' : { + 'additional_compile_targets' : [ "browser_tests" ], + }, 'GPU Linux Builder (dbg)' : {}, 'Linux ChromiumOS Builder' : { 'additional_compile_targets' : [ "All" ]
diff --git a/testing/buildbot/chromium.gpu.fyi.json b/testing/buildbot/chromium.gpu.fyi.json index a1e9803..868e7c2 100644 --- a/testing/buildbot/chromium.gpu.fyi.json +++ b/testing/buildbot/chromium.gpu.fyi.json
@@ -2722,13 +2722,29 @@ } ] }, - "GPU Linux Builder": {}, + "GPU Linux Builder": { + "additional_compile_targets": [ + "browser_tests" + ] + }, "GPU Linux Builder (dbg)": {}, - "GPU Mac Builder": {}, + "GPU Mac Builder": { + "additional_compile_targets": [ + "browser_tests" + ] + }, "GPU Mac Builder (dbg)": {}, - "GPU Win Builder": {}, + "GPU Win Builder": { + "additional_compile_targets": [ + "browser_tests" + ] + }, "GPU Win Builder (dbg)": {}, - "GPU Win x64 Builder": {}, + "GPU Win x64 Builder": { + "additional_compile_targets": [ + "browser_tests" + ] + }, "GPU Win x64 Builder (dbg)": {}, "Linux ChromiumOS Builder": { "additional_compile_targets": [
diff --git a/testing/buildbot/chromium.gpu.json b/testing/buildbot/chromium.gpu.json index 1d7cd34..43b6080 100644 --- a/testing/buildbot/chromium.gpu.json +++ b/testing/buildbot/chromium.gpu.json
@@ -1,11 +1,23 @@ { "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {}, "AAAAA2 See generate_buildbot_json.py to make changes": {}, - "GPU Linux Builder": {}, + "GPU Linux Builder": { + "additional_compile_targets": [ + "browser_tests" + ] + }, "GPU Linux Builder (dbg)": {}, - "GPU Mac Builder": {}, + "GPU Mac Builder": { + "additional_compile_targets": [ + "browser_tests" + ] + }, "GPU Mac Builder (dbg)": {}, - "GPU Win Builder": {}, + "GPU Win Builder": { + "additional_compile_targets": [ + "browser_tests" + ] + }, "GPU Win Builder (dbg)": {}, "Linux Debug (NVIDIA)": { "gtest_tests": [
diff --git a/third_party/WebKit/LayoutTests/W3CImportExpectations b/third_party/WebKit/LayoutTests/W3CImportExpectations index e1e3c1a7..635a4e88 100644 --- a/third_party/WebKit/LayoutTests/W3CImportExpectations +++ b/third_party/WebKit/LayoutTests/W3CImportExpectations
@@ -50,6 +50,8 @@ # external/wpt/content-security-policy [ Pass ] external/wpt/cookies [ Skip ] external/wpt/cors [ Skip ] +## Owners: kojii@chromium.org,ksakamoto@chromium.org +# external/wpt/css-font-loading [ Pass ] external/wpt/css/CSS1 [ Skip ] ## Owners: kojii@chromium.org # external/wpt/css/CSS2 [ Pass ]
diff --git a/third_party/WebKit/LayoutTests/http/tests/credentialmanager/idl-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/credential-management/idl.https-expected.txt similarity index 90% rename from third_party/WebKit/LayoutTests/http/tests/credentialmanager/idl-expected.txt rename to third_party/WebKit/LayoutTests/external/wpt/credential-management/idl.https-expected.txt index 3f2f8d5..13d5bd2 100644 --- a/third_party/WebKit/LayoutTests/http/tests/credentialmanager/idl-expected.txt +++ b/third_party/WebKit/LayoutTests/external/wpt/credential-management/idl.https-expected.txt
@@ -27,8 +27,8 @@ PASS PasswordCredential interface: new PasswordCredential({ id: "id", password: "pencil", iconURL: "https://example.com/", name: "name" }) must inherit property "idName" with the proper type (0) PASS PasswordCredential interface: new PasswordCredential({ id: "id", password: "pencil", iconURL: "https://example.com/", name: "name" }) must inherit property "passwordName" with the proper type (1) FAIL PasswordCredential interface: new PasswordCredential({ id: "id", password: "pencil", iconURL: "https://example.com/", name: "name" }) must inherit property "additionalData" with the proper type (2) Unrecognized type FormData -PASS SiteBoundCredential interface: new PasswordCredential({ id: "id", password: "pencil", iconURL: "https://example.com/", name: "name" }) must inherit property "name" with the proper type (0) -PASS SiteBoundCredential interface: new PasswordCredential({ id: "id", password: "pencil", iconURL: "https://example.com/", name: "name" }) must inherit property "iconURL" with the proper type (1) +PASS PasswordCredential interface: new PasswordCredential({ id: "id", password: "pencil", iconURL: "https://example.com/", name: "name" }) must inherit property "name" with the proper type (3) +PASS PasswordCredential interface: new PasswordCredential({ id: "id", password: "pencil", iconURL: "https://example.com/", name: "name" }) must inherit property "iconURL" with the proper type (4) PASS Credential interface: new PasswordCredential({ id: "id", password: "pencil", iconURL: "https://example.com/", name: "name" }) must inherit property "id" with the proper type (0) PASS Credential interface: new PasswordCredential({ id: "id", password: "pencil", iconURL: "https://example.com/", name: "name" }) must inherit property "type" with the proper type (1) PASS FederatedCredential interface: existence and properties of interface object @@ -42,8 +42,8 @@ PASS Stringification of new FederatedCredential({ id: "id", provider: "https://example.com", iconURL: "https://example.com/", name: "name" }) PASS FederatedCredential interface: new FederatedCredential({ id: "id", provider: "https://example.com", iconURL: "https://example.com/", name: "name" }) must inherit property "provider" with the proper type (0) PASS FederatedCredential interface: new FederatedCredential({ id: "id", provider: "https://example.com", iconURL: "https://example.com/", name: "name" }) must inherit property "protocol" with the proper type (1) -PASS SiteBoundCredential interface: new FederatedCredential({ id: "id", provider: "https://example.com", iconURL: "https://example.com/", name: "name" }) must inherit property "name" with the proper type (0) -PASS SiteBoundCredential interface: new FederatedCredential({ id: "id", provider: "https://example.com", iconURL: "https://example.com/", name: "name" }) must inherit property "iconURL" with the proper type (1) +PASS FederatedCredential interface: new FederatedCredential({ id: "id", provider: "https://example.com", iconURL: "https://example.com/", name: "name" }) must inherit property "name" with the proper type (2) +PASS FederatedCredential interface: new FederatedCredential({ id: "id", provider: "https://example.com", iconURL: "https://example.com/", name: "name" }) must inherit property "iconURL" with the proper type (3) PASS Credential interface: new FederatedCredential({ id: "id", provider: "https://example.com", iconURL: "https://example.com/", name: "name" }) must inherit property "id" with the proper type (0) PASS Credential interface: new FederatedCredential({ id: "id", provider: "https://example.com", iconURL: "https://example.com/", name: "name" }) must inherit property "type" with the proper type (1) Harness: the test ran to completion.
diff --git a/third_party/WebKit/LayoutTests/http/tests/credentialmanager/idl.html b/third_party/WebKit/LayoutTests/external/wpt/credential-management/idl.https.html similarity index 85% rename from third_party/WebKit/LayoutTests/http/tests/credentialmanager/idl.html rename to third_party/WebKit/LayoutTests/external/wpt/credential-management/idl.https.html index 8d110b2..fa544258 100644 --- a/third_party/WebKit/LayoutTests/http/tests/credentialmanager/idl.html +++ b/third_party/WebKit/LayoutTests/external/wpt/credential-management/idl.https.html
@@ -1,8 +1,8 @@ <!DOCTYPE html> <script src=/resources/testharness.js></script> <script src=/resources/testharnessreport.js></script> -<script src=/w3c/resources/WebIDLParser.js></script> -<script src=/w3c/resources/idlharness.js></script> +<script src=/resources/WebIDLParser.js></script> +<script src=/resources/idlharness.js></script> <script type="text/plain" id="untested"> dictionary CredentialData { USVString id; @@ -18,7 +18,10 @@ USVString iconURL; }; - interface SiteBoundCredential : Credential { + [ + NoInterfaceObject, + SecureContext + ] interface CredentialUserData { readonly attribute USVString name; readonly attribute USVString iconURL; }; @@ -58,18 +61,20 @@ [Constructor(PasswordCredentialData data), Constructor(HTMLFormElement form), Exposed=Window] - interface PasswordCredential : SiteBoundCredential { + interface PasswordCredential : Credential { attribute USVString idName; attribute USVString passwordName; attribute CredentialBodyType? additionalData; }; + PasswordCredential implements CredentialUserData; [Constructor(FederatedCredentialData data), Exposed=Window] - interface FederatedCredential : SiteBoundCredential { + interface FederatedCredential : Credential { readonly attribute USVString provider; readonly attribute DOMString? protocol; }; + FederatedCredential implements CredentialUserData; </script> <script> "use strict";
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-font-loading/fontfacesetloadevent-constructor.html b/third_party/WebKit/LayoutTests/external/wpt/css-font-loading/fontfacesetloadevent-constructor.html new file mode 100644 index 0000000..d5038ce --- /dev/null +++ b/third_party/WebKit/LayoutTests/external/wpt/css-font-loading/fontfacesetloadevent-constructor.html
@@ -0,0 +1,20 @@ +<!DOCTYPE html> +<title>FontFaceSetLoadEvent constructor</title> +<link rel="help" href="https://drafts.csswg.org/css-font-loading/#fontfacesetloadevent"> +<script src="/resources/testharness.js"></script> +<script src="/resources/testharnessreport.js"></script> +<script> + test(function() { + var ff = []; + var e = new FontFaceSetLoadEvent('type'); + assert_array_equals(e.fontfaces, ff); + assert_not_equals(e.fontfaces, ff); + }, 'FontFaceSetLoadEvent constructor without FontFaceSetLoadEventInit dictionary'); + + test(function() { + var ff = [ new FontFace('family', 'src') ]; + var e = new FontFaceSetLoadEvent('type', { fontfaces: ff }); + assert_array_equals(e.fontfaces, ff); + assert_not_equals(e.fontfaces, ff); + }, 'FontFaceSetLoadEvent constructor with FontFaceSetLoadEventInit dictionary'); +</script>
diff --git a/third_party/WebKit/LayoutTests/fast/css/fontfacesetloadevent-constructor.html b/third_party/WebKit/LayoutTests/fast/css/fontfacesetloadevent-constructor.html deleted file mode 100644 index 940d601..0000000 --- a/third_party/WebKit/LayoutTests/fast/css/fontfacesetloadevent-constructor.html +++ /dev/null
@@ -1,19 +0,0 @@ -<!DOCTYPE html> -<title>FontFaceSetLoadEvent Constructor</title> -<script src="../../resources/testharness.js"></script> -<script src="../../resources/testharnessreport.js"></script> -<script> - test(function() { - var ff = []; - var e = new FontFaceSetLoadEvent('type'); - assert_array_equals(e.fontfaces, ff); - assert_not_equals(e.fontfaces, ff); - }, 'Test FontFaceSetLoadEvent constructor without FontFaceSetLoadEventInit dictionary'); - - test(function() { - var ff = [ new FontFace('family', 'src') ]; - var e = new FontFaceSetLoadEvent('type', { fontfaces: ff }); - assert_array_equals(e.fontfaces, ff); - assert_not_equals(e.fontfaces, ff); - }, 'Test FontFaceSetLoadEvent constructor with FontFaceSetLoadEventInit dictionary'); -</script>
diff --git a/third_party/WebKit/LayoutTests/http/tests/payments/payment-instruments.html b/third_party/WebKit/LayoutTests/http/tests/payments/payment-instruments.html index e52f67ec..7f6c7fbf 100644 --- a/third_party/WebKit/LayoutTests/http/tests/payments/payment-instruments.html +++ b/third_party/WebKit/LayoutTests/http/tests/payments/payment-instruments.html
@@ -45,4 +45,41 @@ .catch(unreached_rejection(test)); }, 'PaymentInstruments set/get methods test'); +promise_test(test => { + var registration; + var script_url = 'resources/empty-worker.js'; + var scope = 'resources/'; + + return service_worker_unregister_and_register(test, script_url, scope) + .then(r => { + registration = r; + return wait_for_state(test, registration.installing, 'activated'); + }) + .then(state => { + assert_equals(state, 'activated'); + return registration.paymentManager.instruments.set( + 'test_key', + { + name: 'Visa ending ****4756', + enabledMethods: ['basic-card'], + capabilities: { + supportedNetworks: ['visa'], + supportedTypes: ['credit'] + } + }); + }) + .then(result => { + assert_equals(result, undefined); + return registration.paymentManager.instruments.delete('test_key'); + }) + .then(result => { + assert_equals(result, true); + return registration.paymentManager.instruments.delete('test_key'); + }) + .then(result => { + assert_equals(result, false); + }) + .catch(unreached_rejection(test)); + }, 'PaymentInstruments delete method test'); + </script>
diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/stable/webexposed/global-interface-listing-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/stable/webexposed/global-interface-listing-expected.txt index 50db6da..705194ead 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/virtual/stable/webexposed/global-interface-listing-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/stable/webexposed/global-interface-listing-expected.txt
@@ -1314,8 +1314,10 @@ method constructor method dispatchEvent method removeEventListener -interface FederatedCredential : SiteBoundCredential +interface FederatedCredential : Credential attribute @@toStringTag + getter iconURL + getter name getter protocol getter provider method constructor @@ -3810,10 +3812,12 @@ setter panningModel setter refDistance setter rolloffFactor -interface PasswordCredential : SiteBoundCredential +interface PasswordCredential : Credential attribute @@toStringTag getter additionalData + getter iconURL getter idName + getter name getter passwordName method constructor setter additionalData @@ -5528,11 +5532,6 @@ getter workerStart method constructor setter onerror -interface SiteBoundCredential : Credential - attribute @@toStringTag - getter iconURL - getter name - method constructor interface SourceBuffer : EventTarget attribute @@toStringTag getter appendWindowEnd
diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/stable/webexposed/global-interface-listing-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/stable/webexposed/global-interface-listing-expected.txt index 3bcc2c9..900d0cd 100644 --- a/third_party/WebKit/LayoutTests/platform/win/virtual/stable/webexposed/global-interface-listing-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/win/virtual/stable/webexposed/global-interface-listing-expected.txt
@@ -1243,8 +1243,10 @@ method constructor method dispatchEvent method removeEventListener -interface FederatedCredential : SiteBoundCredential +interface FederatedCredential : Credential attribute @@toStringTag + getter iconURL + getter name getter protocol getter provider method constructor @@ -3739,10 +3741,12 @@ setter panningModel setter refDistance setter rolloffFactor -interface PasswordCredential : SiteBoundCredential +interface PasswordCredential : Credential attribute @@toStringTag getter additionalData + getter iconURL getter idName + getter name getter passwordName method constructor setter additionalData @@ -5457,11 +5461,6 @@ getter workerStart method constructor setter onerror -interface SiteBoundCredential : Credential - attribute @@toStringTag - getter iconURL - getter name - method constructor interface SourceBuffer : EventTarget attribute @@toStringTag getter appendWindowEnd
diff --git a/third_party/WebKit/LayoutTests/virtual/service-worker-navigation-preload-disabled/webexposed/global-interface-listing-expected.txt b/third_party/WebKit/LayoutTests/virtual/service-worker-navigation-preload-disabled/webexposed/global-interface-listing-expected.txt index ec4ed2fa..653b94c 100644 --- a/third_party/WebKit/LayoutTests/virtual/service-worker-navigation-preload-disabled/webexposed/global-interface-listing-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/service-worker-navigation-preload-disabled/webexposed/global-interface-listing-expected.txt
@@ -1884,8 +1884,10 @@ attribute @@toStringTag method constructor method detect -interface FederatedCredential : SiteBoundCredential +interface FederatedCredential : Credential attribute @@toStringTag + getter iconURL + getter name getter protocol getter provider method constructor @@ -4668,10 +4670,12 @@ setter panningModel setter refDistance setter rolloffFactor -interface PasswordCredential : SiteBoundCredential +interface PasswordCredential : Credential attribute @@toStringTag getter additionalData + getter iconURL getter idName + getter name getter passwordName method constructor setter additionalData @@ -6496,11 +6500,6 @@ getter workerStart method constructor setter onerror -interface SiteBoundCredential : Credential - attribute @@toStringTag - getter iconURL - getter name - method constructor interface SourceBuffer : EventTarget attribute @@toStringTag getter appendWindowEnd
diff --git a/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt b/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt index c9e7b53..a0a196f 100644 --- a/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt +++ b/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt
@@ -1884,8 +1884,10 @@ attribute @@toStringTag method constructor method detect -interface FederatedCredential : SiteBoundCredential +interface FederatedCredential : Credential attribute @@toStringTag + getter iconURL + getter name getter protocol getter provider method constructor @@ -4675,10 +4677,12 @@ setter panningModel setter refDistance setter rolloffFactor -interface PasswordCredential : SiteBoundCredential +interface PasswordCredential : Credential attribute @@toStringTag getter additionalData + getter iconURL getter idName + getter name getter passwordName method constructor setter additionalData @@ -6504,11 +6508,6 @@ getter workerStart method constructor setter onerror -interface SiteBoundCredential : Credential - attribute @@toStringTag - getter iconURL - getter name - method constructor interface SourceBuffer : EventTarget attribute @@toStringTag getter appendWindowEnd
diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptWrappableVisitor.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptWrappableVisitor.cpp index eac79f1..4c6c71f00 100644 --- a/third_party/WebKit/Source/bindings/core/v8/ScriptWrappableVisitor.cpp +++ b/third_party/WebKit/Source/bindings/core/v8/ScriptWrappableVisitor.cpp
@@ -91,8 +91,8 @@ } headers_to_unmark_.clear(); - marking_deque_.Clear(); - verifier_deque_.Clear(); + marking_deque_.clear(); + verifier_deque_.clear(); should_cleanup_ = false; } @@ -146,8 +146,8 @@ // Unmarked all headers. CHECK(headers_to_unmark_.IsEmpty()); - marking_deque_.Clear(); - verifier_deque_.Clear(); + marking_deque_.clear(); + verifier_deque_.clear(); should_cleanup_ = false; }
diff --git a/third_party/WebKit/Source/bindings/core/v8/V8PerIsolateData.cpp b/third_party/WebKit/Source/bindings/core/v8/V8PerIsolateData.cpp index 92a5396b..170881c6 100644 --- a/third_party/WebKit/Source/bindings/core/v8/V8PerIsolateData.cpp +++ b/third_party/WebKit/Source/bindings/core/v8/V8PerIsolateData.cpp
@@ -276,7 +276,7 @@ void V8PerIsolateData::RunEndOfScopeTasks() { Vector<std::unique_ptr<EndOfScopeTask>> tasks; - tasks.Swap(end_of_scope_tasks_); + tasks.swap(end_of_scope_tasks_); for (const auto& task : tasks) task->Run(); DCHECK(end_of_scope_tasks_.IsEmpty());
diff --git a/third_party/WebKit/Source/bindings/core/v8/V8PrivateProperty.h b/third_party/WebKit/Source/bindings/core/v8/V8PrivateProperty.h index 178901c..4119841 100644 --- a/third_party/WebKit/Source/bindings/core/v8/V8PrivateProperty.h +++ b/third_party/WebKit/Source/bindings/core/v8/V8PrivateProperty.h
@@ -136,7 +136,7 @@ // The following classes are exceptionally allowed to call to // getFromMainWorld. friend class V8CustomEvent; - friend class V8ServiceWorkerMessageEventInternal; + friend class V8ExtendableMessageEvent; Symbol(v8::Isolate* isolate, v8::Local<v8::Private> private_symbol) : private_symbol_(private_symbol), isolate_(isolate) {}
diff --git a/third_party/WebKit/Source/bindings/core/v8/custom/V8WindowCustom.cpp b/third_party/WebKit/Source/bindings/core/v8/custom/V8WindowCustom.cpp index 2f4c84c..9564753 100644 --- a/third_party/WebKit/Source/bindings/core/v8/custom/V8WindowCustom.cpp +++ b/third_party/WebKit/Source/bindings/core/v8/custom/V8WindowCustom.cpp
@@ -378,7 +378,7 @@ if (!has_named_item && has_id_item && !doc->ContainsMultipleElementsWithId(name)) { UseCounter::Count(doc, UseCounter::kDOMClobberedVariableAccessed); - V8SetReturnValueFast(info, doc->GetElementById(name), window); + V8SetReturnValueFast(info, doc->getElementById(name), window); return; }
diff --git a/third_party/WebKit/Source/bindings/modules/v8/V8ServiceWorkerMessageEventInternal.h b/third_party/WebKit/Source/bindings/modules/v8/V8ServiceWorkerMessageEventInternal.h deleted file mode 100644 index 64caee6..0000000 --- a/third_party/WebKit/Source/bindings/modules/v8/V8ServiceWorkerMessageEventInternal.h +++ /dev/null
@@ -1,112 +0,0 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef V8ServiceWorkerMessageEventInternal_h -#define V8ServiceWorkerMessageEventInternal_h - -#include "bindings/core/v8/SerializedScriptValue.h" -#include "bindings/core/v8/SerializedScriptValueFactory.h" -#include "bindings/core/v8/V8PrivateProperty.h" - -namespace blink { - -class V8ServiceWorkerMessageEventInternal { - public: - template <typename EventType, typename DictType> - static void ConstructorCustom(const v8::FunctionCallbackInfo<v8::Value>&); - - template <typename EventType> - static void DataAttributeGetterCustom( - const v8::FunctionCallbackInfo<v8::Value>&); -}; - -template <typename EventType, typename DictType> -void V8ServiceWorkerMessageEventInternal::ConstructorCustom( - const v8::FunctionCallbackInfo<v8::Value>& info) { - v8::Isolate* isolate = info.GetIsolate(); - ExceptionState exception_state( - isolate, ExceptionState::kConstructionContext, - V8TypeOf<EventType>::Type::wrapperTypeInfo.interface_name); - if (UNLIKELY(info.Length() < 1)) { - exception_state.ThrowTypeError( - ExceptionMessages::NotEnoughArguments(1, info.Length())); - return; - } - - V8StringResource<> type = info[0]; - if (!type.Prepare()) - return; - - DictType event_init_dict; - if (!IsUndefinedOrNull(info[1])) { - if (!info[1]->IsObject()) { - exception_state.ThrowTypeError( - "parameter 2 ('eventInitDict') is not an object."); - return; - } - V8TypeOf<DictType>::Type::toImpl(isolate, info[1], event_init_dict, - exception_state); - if (exception_state.HadException()) - return; - } - - EventType* impl = EventType::Create(type, event_init_dict); - v8::Local<v8::Object> wrapper = info.Holder(); - wrapper = impl->AssociateWithWrapper( - isolate, &V8TypeOf<EventType>::Type::wrapperTypeInfo, wrapper); - - // TODO(bashi): Workaround for http://crbug.com/529941. We need to store - // |data| as a private value to avoid cyclic references. - if (event_init_dict.hasData()) { - v8::Local<v8::Value> v8_data = event_init_dict.data().V8Value(); - V8PrivateProperty::GetMessageEventCachedData(isolate).Set(wrapper, v8_data); - if (DOMWrapperWorld::Current(isolate).IsIsolatedWorld()) { - impl->SetSerializedData( - SerializedScriptValue::SerializeAndSwallowExceptions(isolate, - v8_data)); - } - } - V8SetReturnValue(info, wrapper); -} - -template <typename EventType> -void V8ServiceWorkerMessageEventInternal::DataAttributeGetterCustom( - const v8::FunctionCallbackInfo<v8::Value>& info) { - EventType* event = V8TypeOf<EventType>::Type::toImpl(info.Holder()); - v8::Isolate* isolate = info.GetIsolate(); - auto private_cached_data = - V8PrivateProperty::GetMessageEventCachedData(isolate); - v8::Local<v8::Value> result = private_cached_data.GetOrEmpty(info.Holder()); - if (!result.IsEmpty()) { - V8SetReturnValue(info, result); - return; - } - - v8::Local<v8::Value> data; - if (SerializedScriptValue* serialized_value = event->SerializedData()) { - MessagePortArray ports = event->ports(); - SerializedScriptValue::DeserializeOptions options; - options.message_ports = &ports; - data = serialized_value->Deserialize(isolate, options); - } else if (DOMWrapperWorld::Current(isolate).IsIsolatedWorld()) { - v8::Local<v8::Value> main_world_data = - private_cached_data.GetFromMainWorld(event); - if (!main_world_data.IsEmpty()) { - // TODO(bashi): Enter the main world's ScriptState::Scope while - // serializing the main world's value. - event->SetSerializedData( - SerializedScriptValue::SerializeAndSwallowExceptions( - info.GetIsolate(), main_world_data)); - data = event->SerializedData()->Deserialize(isolate); - } - } - if (data.IsEmpty()) - data = v8::Null(isolate); - private_cached_data.Set(info.Holder(), data); - V8SetReturnValue(info, data); -} - -} // namespace blink - -#endif // V8ServiceWorkerMessageEventInternal_h
diff --git a/third_party/WebKit/Source/bindings/modules/v8/custom/V8ExtendableMessageEventCustom.cpp b/third_party/WebKit/Source/bindings/modules/v8/custom/V8ExtendableMessageEventCustom.cpp index 0db1d181..baa6cc1 100644 --- a/third_party/WebKit/Source/bindings/modules/v8/custom/V8ExtendableMessageEventCustom.cpp +++ b/third_party/WebKit/Source/bindings/modules/v8/custom/V8ExtendableMessageEventCustom.cpp
@@ -4,21 +4,94 @@ #include "bindings/modules/v8/V8ExtendableMessageEvent.h" +#include "bindings/core/v8/V8PrivateProperty.h" #include "bindings/modules/v8/V8ExtendableMessageEventInit.h" -#include "bindings/modules/v8/V8ServiceWorkerMessageEventInternal.h" namespace blink { void V8ExtendableMessageEvent::constructorCustom( const v8::FunctionCallbackInfo<v8::Value>& info) { - V8ServiceWorkerMessageEventInternal::ConstructorCustom< - ExtendableMessageEvent, ExtendableMessageEventInit>(info); + v8::Isolate* isolate = info.GetIsolate(); + ExceptionState exception_state(isolate, ExceptionState::kConstructionContext, + "ExtendableMessageEvent"); + if (UNLIKELY(info.Length() < 1)) { + exception_state.ThrowTypeError( + ExceptionMessages::NotEnoughArguments(1, info.Length())); + return; + } + + V8StringResource<> type = info[0]; + if (!type.Prepare()) + return; + + ExtendableMessageEventInit event_init_dict; + if (!IsUndefinedOrNull(info[1])) { + if (!info[1]->IsObject()) { + exception_state.ThrowTypeError( + "parameter 2 ('eventInitDict') is not an object."); + return; + } + V8ExtendableMessageEventInit::toImpl(isolate, info[1], event_init_dict, + exception_state); + if (exception_state.HadException()) + return; + } + + ExtendableMessageEvent* impl = + ExtendableMessageEvent::Create(type, event_init_dict); + v8::Local<v8::Object> wrapper = info.Holder(); + wrapper = impl->AssociateWithWrapper( + isolate, &V8ExtendableMessageEvent::wrapperTypeInfo, wrapper); + + // TODO(bashi): Workaround for http://crbug.com/529941. We need to store + // |data| as a private value to avoid cyclic references. + if (event_init_dict.hasData()) { + v8::Local<v8::Value> v8_data = event_init_dict.data().V8Value(); + V8PrivateProperty::GetMessageEventCachedData(isolate).Set(wrapper, v8_data); + if (DOMWrapperWorld::Current(isolate).IsIsolatedWorld()) { + impl->SetSerializedData( + SerializedScriptValue::SerializeAndSwallowExceptions(isolate, + v8_data)); + } + } + V8SetReturnValue(info, wrapper); } void V8ExtendableMessageEvent::dataAttributeGetterCustom( const v8::FunctionCallbackInfo<v8::Value>& info) { - V8ServiceWorkerMessageEventInternal::DataAttributeGetterCustom< - ExtendableMessageEvent>(info); + ExtendableMessageEvent* event = + V8ExtendableMessageEvent::toImpl(info.Holder()); + v8::Isolate* isolate = info.GetIsolate(); + auto private_cached_data = + V8PrivateProperty::GetMessageEventCachedData(isolate); + v8::Local<v8::Value> result = private_cached_data.GetOrEmpty(info.Holder()); + if (!result.IsEmpty()) { + V8SetReturnValue(info, result); + return; + } + + v8::Local<v8::Value> data; + if (SerializedScriptValue* serialized_value = event->SerializedData()) { + MessagePortArray ports = event->ports(); + SerializedScriptValue::DeserializeOptions options; + options.message_ports = &ports; + data = serialized_value->Deserialize(isolate, options); + } else if (DOMWrapperWorld::Current(isolate).IsIsolatedWorld()) { + v8::Local<v8::Value> main_world_data = + private_cached_data.GetFromMainWorld(event); + if (!main_world_data.IsEmpty()) { + // TODO(bashi): Enter the main world's ScriptState::Scope while + // serializing the main world's value. + event->SetSerializedData( + SerializedScriptValue::SerializeAndSwallowExceptions( + info.GetIsolate(), main_world_data)); + data = event->SerializedData()->Deserialize(isolate); + } + } + if (data.IsEmpty()) + data = v8::Null(isolate); + private_cached_data.Set(info.Holder(), data); + V8SetReturnValue(info, data); } } // namespace blink
diff --git a/third_party/WebKit/Source/bindings/modules/v8/v8.gni b/third_party/WebKit/Source/bindings/modules/v8/v8.gni index 5b082cf..2dce5ebb 100644 --- a/third_party/WebKit/Source/bindings/modules/v8/v8.gni +++ b/third_party/WebKit/Source/bindings/modules/v8/v8.gni
@@ -21,7 +21,6 @@ "ToV8ForModules.h", "V8BindingForModules.cpp", "V8BindingForModules.h", - "V8ServiceWorkerMessageEventInternal.h", "wasm/WasmResponseExtensions.cpp", "wasm/WasmResponseExtensions.h", "WebGLAny.cpp",
diff --git a/third_party/WebKit/Source/core/animation/CompositorPendingAnimations.cpp b/third_party/WebKit/Source/core/animation/CompositorPendingAnimations.cpp index 94c230f..800cca2 100644 --- a/third_party/WebKit/Source/core/animation/CompositorPendingAnimations.cpp +++ b/third_party/WebKit/Source/core/animation/CompositorPendingAnimations.cpp
@@ -62,7 +62,7 @@ HeapVector<Member<Animation>> animations; HeapVector<Member<Animation>> deferred; - animations.Swap(pending_); + animations.swap(pending_); int compositor_group = ++compositor_group_; while (compositor_group == 0 || compositor_group == 1) { // Wrap around, skipping 0, 1. @@ -145,7 +145,7 @@ TRACE_EVENT0("blink", "CompositorPendingAnimations::notifyCompositorAnimationStarted"); HeapVector<Member<Animation>> animations; - animations.Swap(waiting_for_compositor_animation_start_); + animations.swap(waiting_for_compositor_animation_start_); for (auto animation : animations) { if (animation->HasStartTime() ||
diff --git a/third_party/WebKit/Source/core/animation/KeyframeEffectReadOnly.cpp b/third_party/WebKit/Source/core/animation/KeyframeEffectReadOnly.cpp index b1e8454..e084904c 100644 --- a/third_party/WebKit/Source/core/animation/KeyframeEffectReadOnly.cpp +++ b/third_party/WebKit/Source/core/animation/KeyframeEffectReadOnly.cpp
@@ -176,7 +176,7 @@ interpolations); if (!interpolations.IsEmpty()) { SampledEffect* sampled_effect = SampledEffect::Create(this); - sampled_effect->MutableInterpolations().Swap(interpolations); + sampled_effect->MutableInterpolations().swap(interpolations); sampled_effect_ = sampled_effect; EnsureEffectStack(target_).Add(sampled_effect); changed = true;
diff --git a/third_party/WebKit/Source/core/animation/PathInterpolationFunctions.cpp b/third_party/WebKit/Source/core/animation/PathInterpolationFunctions.cpp index 9e9399d6..a74e636 100644 --- a/third_party/WebKit/Source/core/animation/PathInterpolationFunctions.cpp +++ b/third_party/WebKit/Source/core/animation/PathInterpolationFunctions.cpp
@@ -32,7 +32,7 @@ private: SVGPathNonInterpolableValue(Vector<SVGPathSegType>& path_seg_types) { - path_seg_types_.Swap(path_seg_types); + path_seg_types_.swap(path_seg_types); } Vector<SVGPathSegType> path_seg_types_;
diff --git a/third_party/WebKit/Source/core/animation/SVGTransformListInterpolationType.cpp b/third_party/WebKit/Source/core/animation/SVGTransformListInterpolationType.cpp index b35cd9bb9..086ba10 100644 --- a/third_party/WebKit/Source/core/animation/SVGTransformListInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/SVGTransformListInterpolationType.cpp
@@ -32,7 +32,7 @@ private: SVGTransformNonInterpolableValue(Vector<SVGTransformType>& transform_types) { - transform_types_.Swap(transform_types); + transform_types_.swap(transform_types); } Vector<SVGTransformType> transform_types_;
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableRepeatable.h b/third_party/WebKit/Source/core/animation/animatable/AnimatableRepeatable.h index 3e9e037c..53b6ebd 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableRepeatable.h +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableRepeatable.h
@@ -54,7 +54,7 @@ AnimatableRepeatable() {} AnimatableRepeatable(Vector<RefPtr<AnimatableValue>>& values) { DCHECK(!values.IsEmpty()); - values_.Swap(values); + values_.swap(values); } Vector<RefPtr<AnimatableValue>> values_;
diff --git a/third_party/WebKit/Source/core/css/ActiveStyleSheetsTest.cpp b/third_party/WebKit/Source/core/css/ActiveStyleSheetsTest.cpp index d689eaf..e4da7d3 100644 --- a/third_party/WebKit/Source/core/css/ActiveStyleSheetsTest.cpp +++ b/third_party/WebKit/Source/core/css/ActiveStyleSheetsTest.cpp
@@ -456,7 +456,7 @@ TEST_F(ApplyRulesetsTest, AddUniversalRuleToShadowTree) { GetDocument().body()->setInnerHTML("<div id=host></div>"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); ASSERT_TRUE(host); ShadowRoot& shadow_root = AttachShadow(*host); @@ -493,7 +493,7 @@ TEST_F(ApplyRulesetsTest, AddFontFaceRuleToShadowTree) { GetDocument().body()->setInnerHTML("<div id=host></div>"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); ASSERT_TRUE(host); ShadowRoot& shadow_root = AttachShadow(*host); @@ -517,7 +517,7 @@ TEST_F(ApplyRulesetsTest, RemoveSheetFromShadowTree) { GetDocument().body()->setInnerHTML("<div id=host></div>"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); ASSERT_TRUE(host); ShadowRoot& shadow_root = AttachShadow(*host);
diff --git a/third_party/WebKit/Source/core/css/AffectedByFocusTest.cpp b/third_party/WebKit/Source/core/css/AffectedByFocusTest.cpp index 40ef36d..7e3d6bb6 100644 --- a/third_party/WebKit/Source/core/css/AffectedByFocusTest.cpp +++ b/third_party/WebKit/Source/core/css/AffectedByFocusTest.cpp
@@ -205,7 +205,7 @@ unsigned start_count = GetDocument().GetStyleEngine().StyleForElementCount(); - GetDocument().GetElementById("d")->focus(); + GetDocument().getElementById("d")->focus(); GetDocument().View()->UpdateAllLifecyclePhases(); unsigned element_count = @@ -237,7 +237,7 @@ unsigned start_count = GetDocument().GetStyleEngine().StyleForElementCount(); - GetDocument().GetElementById("d")->focus(); + GetDocument().getElementById("d")->focus(); GetDocument().View()->UpdateAllLifecyclePhases(); unsigned element_count = @@ -269,7 +269,7 @@ unsigned start_count = GetDocument().GetStyleEngine().StyleForElementCount(); - GetDocument().GetElementById("d")->focus(); + GetDocument().getElementById("d")->focus(); GetDocument().View()->UpdateAllLifecyclePhases(); unsigned element_count = @@ -303,7 +303,7 @@ unsigned start_count = GetDocument().GetStyleEngine().StyleForElementCount(); - GetDocument().GetElementById("d")->focus(); + GetDocument().getElementById("d")->focus(); GetDocument().View()->UpdateAllLifecyclePhases(); unsigned element_count = @@ -329,7 +329,7 @@ unsigned start_count = GetDocument().GetStyleEngine().StyleForElementCount(); - GetDocument().GetElementById("focusme1")->focus(); + GetDocument().getElementById("focusme1")->focus(); GetDocument().View()->UpdateAllLifecyclePhases(); unsigned element_count = @@ -339,7 +339,7 @@ start_count += element_count; - GetDocument().GetElementById("focusme2")->focus(); + GetDocument().getElementById("focusme2")->focus(); GetDocument().View()->UpdateAllLifecyclePhases(); element_count =
diff --git a/third_party/WebKit/Source/core/css/CSSFontFace.cpp b/third_party/WebKit/Source/core/css/CSSFontFace.cpp index 7774913..2144bbc 100644 --- a/third_party/WebKit/Source/core/css/CSSFontFace.cpp +++ b/third_party/WebKit/Source/core/css/CSSFontFace.cpp
@@ -62,7 +62,7 @@ SetLoadStatus(FontFace::kLoaded); } else if (source->GetDisplayPeriod() == RemoteFontFaceSource::kFailurePeriod) { - sources_.Clear(); + sources_.clear(); SetLoadStatus(FontFace::kError); } else { sources_.pop_front();
diff --git a/third_party/WebKit/Source/core/css/CSSPaintValue.cpp b/third_party/WebKit/Source/core/css/CSSPaintValue.cpp index dd34aac9c..3c75256 100644 --- a/third_party/WebKit/Source/core/css/CSSPaintValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSPaintValue.cpp
@@ -21,7 +21,7 @@ CSSPaintValue::CSSPaintValue(CSSCustomIdentValue* name, Vector<RefPtr<CSSVariableData>>& variable_data) : CSSPaintValue(name) { - argument_variable_data_.Swap(variable_data); + argument_variable_data_.swap(variable_data); } CSSPaintValue::~CSSPaintValue() {}
diff --git a/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.cpp b/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.cpp index f15693b..e73b0ee 100644 --- a/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.cpp +++ b/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.cpp
@@ -81,7 +81,7 @@ } void CSSSegmentedFontFace::RemoveFontFace(FontFace* font_face) { - FontFaceList::iterator it = font_faces_.Find(font_face); + FontFaceList::iterator it = font_faces_.find(font_face); if (it == font_faces_.end()) return;
diff --git a/third_party/WebKit/Source/core/css/DragUpdateTest.cpp b/third_party/WebKit/Source/core/css/DragUpdateTest.cpp index 5ebdb56..e8e7790 100644 --- a/third_party/WebKit/Source/core/css/DragUpdateTest.cpp +++ b/third_party/WebKit/Source/core/css/DragUpdateTest.cpp
@@ -32,7 +32,7 @@ document.View()->UpdateAllLifecyclePhases(); unsigned start_count = document.GetStyleEngine().StyleForElementCount(); - document.GetElementById("div")->SetDragged(true); + document.getElementById("div")->SetDragged(true); document.View()->UpdateAllLifecyclePhases(); unsigned element_count = @@ -61,7 +61,7 @@ document.UpdateStyleAndLayout(); unsigned start_count = document.GetStyleEngine().StyleForElementCount(); - document.GetElementById("div")->SetDragged(true); + document.getElementById("div")->SetDragged(true); document.UpdateStyleAndLayout(); unsigned element_count = @@ -91,7 +91,7 @@ document.UpdateStyleAndLayout(); unsigned start_count = document.GetStyleEngine().StyleForElementCount(); - document.GetElementById("div")->SetDragged(true); + document.getElementById("div")->SetDragged(true); document.UpdateStyleAndLayout(); unsigned element_count =
diff --git a/third_party/WebKit/Source/core/css/FontFace.cpp b/third_party/WebKit/Source/core/css/FontFace.cpp index 9b9d25e..c9b2c63 100644 --- a/third_party/WebKit/Source/core/css/FontFace.cpp +++ b/third_party/WebKit/Source/core/css/FontFace.cpp
@@ -401,7 +401,7 @@ void FontFace::RunCallbacks() { HeapVector<Member<LoadFontCallback>> callbacks; - callbacks_.Swap(callbacks); + callbacks_.swap(callbacks); for (size_t i = 0; i < callbacks.size(); ++i) { if (status_ == kLoaded) callbacks[i]->NotifyLoaded(this);
diff --git a/third_party/WebKit/Source/core/css/FontFaceSet.cpp b/third_party/WebKit/Source/core/css/FontFaceSet.cpp index be76c77..b3e9871e 100644 --- a/third_party/WebKit/Source/core/css/FontFaceSet.cpp +++ b/third_party/WebKit/Source/core/css/FontFaceSet.cpp
@@ -71,7 +71,7 @@ : num_loading_(faces.size()), error_occured_(false), resolver_(ScriptPromiseResolver::Create(script_state)) { - font_faces_.Swap(faces); + font_faces_.swap(faces); } HeapVector<Member<FontFace>> font_faces_; @@ -298,7 +298,7 @@ if (!InActiveDocumentContext()) return false; HeapListHashSet<Member<FontFace>>::iterator it = - non_css_connected_faces_.Find(font_face); + non_css_connected_faces_.find(font_face); if (it != non_css_connected_faces_.end()) { non_css_connected_faces_.erase(it); CSSFontSelector* font_selector =
diff --git a/third_party/WebKit/Source/core/css/MediaList.cpp b/third_party/WebKit/Source/core/css/MediaList.cpp index ee1d146..f6edcc5 100644 --- a/third_party/WebKit/Source/core/css/MediaList.cpp +++ b/third_party/WebKit/Source/core/css/MediaList.cpp
@@ -71,7 +71,7 @@ for (const auto& query : result->queries_) { CHECK(query); } - queries_.Swap(result->queries_); + queries_.swap(result->queries_); return true; }
diff --git a/third_party/WebKit/Source/core/css/StyleRule.cpp b/third_party/WebKit/Source/core/css/StyleRule.cpp index bcc1c054..9756aec 100644 --- a/third_party/WebKit/Source/core/css/StyleRule.cpp +++ b/third_party/WebKit/Source/core/css/StyleRule.cpp
@@ -316,7 +316,7 @@ StyleRuleGroup::StyleRuleGroup(RuleType type, HeapVector<Member<StyleRuleBase>>& adopt_rule) : StyleRuleBase(type) { - child_rules_.Swap(adopt_rule); + child_rules_.swap(adopt_rule); } StyleRuleGroup::StyleRuleGroup(const StyleRuleGroup& group_rule)
diff --git a/third_party/WebKit/Source/core/css/StyleSheetList.cpp b/third_party/WebKit/Source/core/css/StyleSheetList.cpp index bfd164a..f6234b5c 100644 --- a/third_party/WebKit/Source/core/css/StyleSheetList.cpp +++ b/third_party/WebKit/Source/core/css/StyleSheetList.cpp
@@ -56,7 +56,7 @@ // and doesn't look for name attribute. But unicity of stylesheet ids is good // practice anyway ;) // FIXME: We should figure out if we should change this or fix the spec. - Element* element = tree_scope_->GetElementById(name); + Element* element = tree_scope_->getElementById(name); return isHTMLStyleElement(element) ? toHTMLStyleElement(element) : nullptr; }
diff --git a/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolverTest.cpp b/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolverTest.cpp index 26806d60..239b3bc45 100644 --- a/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolverTest.cpp +++ b/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolverTest.cpp
@@ -56,8 +56,8 @@ TEST_F(ScopedStyleResolverTest, HasSameStylesNonEmpty) { GetDocument().body()->setInnerHTML( "<div id=host1></div><div id=host2></div>"); - Element* host1 = GetDocument().GetElementById("host1"); - Element* host2 = GetDocument().GetElementById("host2"); + Element* host1 = GetDocument().getElementById("host1"); + Element* host2 = GetDocument().getElementById("host2"); ASSERT_TRUE(host1); ASSERT_TRUE(host2); ShadowRoot& root1 = AttachShadow(*host1); @@ -72,8 +72,8 @@ TEST_F(ScopedStyleResolverTest, HasSameStylesDifferentSheetCount) { GetDocument().body()->setInnerHTML( "<div id=host1></div><div id=host2></div>"); - Element* host1 = GetDocument().GetElementById("host1"); - Element* host2 = GetDocument().GetElementById("host2"); + Element* host1 = GetDocument().getElementById("host1"); + Element* host2 = GetDocument().getElementById("host2"); ASSERT_TRUE(host1); ASSERT_TRUE(host2); ShadowRoot& root1 = AttachShadow(*host1); @@ -89,8 +89,8 @@ TEST_F(ScopedStyleResolverTest, HasSameStylesCacheMiss) { GetDocument().body()->setInnerHTML( "<div id=host1></div><div id=host2></div>"); - Element* host1 = GetDocument().GetElementById("host1"); - Element* host2 = GetDocument().GetElementById("host2"); + Element* host1 = GetDocument().getElementById("host1"); + Element* host2 = GetDocument().getElementById("host2"); ASSERT_TRUE(host1); ASSERT_TRUE(host2); ShadowRoot& root1 = AttachShadow(*host1);
diff --git a/third_party/WebKit/Source/core/css/resolver/SharedStyleFinderTest.cpp b/third_party/WebKit/Source/core/css/resolver/SharedStyleFinderTest.cpp index 4d0521c..0da6ad0 100644 --- a/third_party/WebKit/Source/core/css/resolver/SharedStyleFinderTest.cpp +++ b/third_party/WebKit/Source/core/css/resolver/SharedStyleFinderTest.cpp
@@ -106,8 +106,8 @@ AddSelector("[attr]:hover"); FinishAddingSelectors(); - Element* a = GetDocument().GetElementById("a"); - Element* b = GetDocument().GetElementById("b"); + Element* a = GetDocument().getElementById("a"); + Element* b = GetDocument().getElementById("b"); ASSERT_TRUE(a); ASSERT_TRUE(b); @@ -125,8 +125,8 @@ AddSelector("[attr]:not(:hover)"); FinishAddingSelectors(); - Element* a = GetDocument().GetElementById("a"); - Element* b = GetDocument().GetElementById("b"); + Element* a = GetDocument().getElementById("a"); + Element* b = GetDocument().getElementById("b"); ASSERT_TRUE(a); ASSERT_TRUE(b); @@ -144,8 +144,8 @@ AddSelector("[attr]:focus"); FinishAddingSelectors(); - Element* a = GetDocument().GetElementById("a"); - Element* b = GetDocument().GetElementById("b"); + Element* a = GetDocument().getElementById("a"); + Element* b = GetDocument().getElementById("b"); ASSERT_TRUE(a); ASSERT_TRUE(b); @@ -163,8 +163,8 @@ AddSelector("[attr]:focus-within"); FinishAddingSelectors(); - Element* a = GetDocument().GetElementById("a"); - Element* b = GetDocument().GetElementById("b"); + Element* a = GetDocument().getElementById("a"); + Element* b = GetDocument().getElementById("b"); ASSERT_TRUE(a); ASSERT_TRUE(b); @@ -182,8 +182,8 @@ AddSelector("[attr]:active"); FinishAddingSelectors(); - Element* a = GetDocument().GetElementById("a"); - Element* b = GetDocument().GetElementById("b"); + Element* a = GetDocument().getElementById("a"); + Element* b = GetDocument().getElementById("b"); ASSERT_TRUE(a); ASSERT_TRUE(b); @@ -201,8 +201,8 @@ AddSelector("[attr]:-webkit-drag"); FinishAddingSelectors(); - Element* a = GetDocument().GetElementById("a"); - Element* b = GetDocument().GetElementById("b"); + Element* a = GetDocument().getElementById("a"); + Element* b = GetDocument().getElementById("b"); ASSERT_TRUE(a); ASSERT_TRUE(b); @@ -216,7 +216,7 @@ TEST_F(SharedStyleFinderTest, SlottedPseudoWithAttribute) { SetBodyContent("<div id=host><div id=a></div><div id=b attr></div></div>"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); ShadowRoot& root = AttachShadow(*host); root.setInnerHTML("<slot></slot>"); GetDocument().UpdateDistribution(); @@ -224,8 +224,8 @@ AddSelector("::slotted([attr])"); FinishAddingSelectors(); - Element* a = GetDocument().GetElementById("a"); - Element* b = GetDocument().GetElementById("b"); + Element* a = GetDocument().getElementById("a"); + Element* b = GetDocument().getElementById("b"); EXPECT_TRUE(a->AssignedSlot()); EXPECT_TRUE(b->AssignedSlot()); @@ -236,7 +236,7 @@ TEST_F(SharedStyleFinderTest, HostWithAttribute) { SetBodyContent("<div id=host attr></div>"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); ShadowRoot& root = AttachShadow(*host); root.setInnerHTML("<slot></slot>"); GetDocument().UpdateDistribution(); @@ -249,7 +249,7 @@ TEST_F(SharedStyleFinderTest, HostAncestorWithAttribute) { SetBodyContent("<div id=host attr></div>"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); ShadowRoot& root = AttachShadow(*host); root.setInnerHTML("<div id=inner></div>"); Element* inner = root.getElementById("inner"); @@ -263,7 +263,7 @@ TEST_F(SharedStyleFinderTest, HostContextAncestorWithAttribute) { SetBodyContent("<div id=host attr></div>"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); ShadowRoot& root = AttachShadow(*host); root.setInnerHTML("<div id=inner></div>"); Element* inner = root.getElementById("inner"); @@ -277,7 +277,7 @@ TEST_F(SharedStyleFinderTest, HostParentWithAttribute) { SetBodyContent("<div id=host attr></div>"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); ShadowRoot& root = AttachShadow(*host); root.setInnerHTML("<div id=inner></div>"); Element* inner = root.getElementById("inner"); @@ -291,7 +291,7 @@ TEST_F(SharedStyleFinderTest, HostContextParentWithAttribute) { SetBodyContent("<div id=host attr></div>"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); ShadowRoot& root = AttachShadow(*host); root.setInnerHTML("<div id=inner></div>"); Element* inner = root.getElementById("inner"); @@ -305,7 +305,7 @@ TEST_F(SharedStyleFinderTest, AncestorWithAttributeInParentScope) { SetBodyContent("<div id=host attr></div>"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); ShadowRoot& root = AttachShadow(*host); root.setInnerHTML("<div id=inner></div>"); Element* inner = root.getElementById("inner");
diff --git a/third_party/WebKit/Source/core/dom/CSSSelectorWatchTest.cpp b/third_party/WebKit/Source/core/dom/CSSSelectorWatchTest.cpp index 3eecb31..e867ae5a 100644 --- a/third_party/WebKit/Source/core/dom/CSSSelectorWatchTest.cpp +++ b/third_party/WebKit/Source/core/dom/CSSSelectorWatchTest.cpp
@@ -66,9 +66,9 @@ GetDocument().View()->UpdateAllLifecyclePhases(); - Element* x = GetDocument().GetElementById("x"); - Element* y = GetDocument().GetElementById("y"); - Element* z = GetDocument().GetElementById("z"); + Element* x = GetDocument().getElementById("x"); + Element* y = GetDocument().getElementById("y"); + Element* z = GetDocument().getElementById("z"); ASSERT_TRUE(x); ASSERT_TRUE(y); ASSERT_TRUE(z);
diff --git a/third_party/WebKit/Source/core/dom/ClassicPendingScript.cpp b/third_party/WebKit/Source/core/dom/ClassicPendingScript.cpp index e1c747e4..4ab6c71f 100644 --- a/third_party/WebKit/Source/core/dom/ClassicPendingScript.cpp +++ b/third_party/WebKit/Source/core/dom/ClassicPendingScript.cpp
@@ -47,8 +47,11 @@ CHECK(!streamer_ || streamer_->GetResource() == GetResource()); } -NOINLINE void ClassicPendingScript::Dispose() { - PendingScript::Dispose(); +void ClassicPendingScript::Prefinalize() { + // TODO(hiroshige): Consider moving this to ScriptStreamer's prefinalizer. + // https://crbug.com/715309 + if (streamer_) + streamer_->Cancel(); prefinalizer_called_ = true; }
diff --git a/third_party/WebKit/Source/core/dom/ClassicPendingScript.h b/third_party/WebKit/Source/core/dom/ClassicPendingScript.h index 0405f5b9..aa78d171 100644 --- a/third_party/WebKit/Source/core/dom/ClassicPendingScript.h +++ b/third_party/WebKit/Source/core/dom/ClassicPendingScript.h
@@ -27,11 +27,7 @@ public ResourceOwner<ScriptResource>, public MemoryCoordinatorClient { USING_GARBAGE_COLLECTED_MIXIN(ClassicPendingScript); - - // In order to call Dispose() before ResourceOwner's prefinalizer, we - // also register ClassicPendingScript::Dispose() as the prefinalizer of - // ClassicPendingScript here. https://crbug.com/711703 - USING_PRE_FINALIZER(ClassicPendingScript, Dispose); + USING_PRE_FINALIZER(ClassicPendingScript, Prefinalize); public: // For script from an external file. @@ -61,11 +57,7 @@ void RemoveFromMemoryCache() override; void DisposeInternal() override; - // Just used as the prefinalizer, does the same as PendingScript::Dispose(). - // We define Dispose() with NOINLINE in ClassicPendingScript just to make - // the prefinalizers of PendingScript and ClassicPendingScript have - // different addresses to avoid assertion failures on Windows test bots. - void Dispose(); + void Prefinalize(); private: ClassicPendingScript(ScriptElementBase*,
diff --git a/third_party/WebKit/Source/core/dom/ContainerNode.cpp b/third_party/WebKit/Source/core/dom/ContainerNode.cpp index af3ea78..a28c419 100644 --- a/third_party/WebKit/Source/core/dom/ContainerNode.cpp +++ b/third_party/WebKit/Source/core/dom/ContainerNode.cpp
@@ -1488,7 +1488,7 @@ if (IsInTreeScope()) { // Fast path if we are in a tree scope: call getElementById() on tree scope // and check if the matching element is in our subtree. - Element* element = ContainingTreeScope().GetElementById(id); + Element* element = ContainingTreeScope().getElementById(id); if (!element) return nullptr; if (element->IsDescendantOf(this))
diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/Source/core/dom/Document.h index b5cdaf5..29c9d99 100644 --- a/third_party/WebKit/Source/core/dom/Document.h +++ b/third_party/WebKit/Source/core/dom/Document.h
@@ -269,7 +269,7 @@ using SecurityContext::GetSecurityOrigin; using SecurityContext::GetContentSecurityPolicy; - using TreeScope::GetElementById; + using TreeScope::getElementById; bool CanContainRangeEndPoint() const override { return true; }
diff --git a/third_party/WebKit/Source/core/dom/DocumentTest.cpp b/third_party/WebKit/Source/core/dom/DocumentTest.cpp index dff68f7..773f9b3 100644 --- a/third_party/WebKit/Source/core/dom/DocumentTest.cpp +++ b/third_party/WebKit/Source/core/dom/DocumentTest.cpp
@@ -479,7 +479,7 @@ "</style>" "<div id='x'><span class='c'></span></div>"); - Element* element = GetDocument().GetElementById("x"); + Element* element = GetDocument().getElementById("x"); EXPECT_TRUE(element); uint64_t previous_style_version = GetDocument().StyleVersion();
diff --git a/third_party/WebKit/Source/core/dom/FrameRequestCallbackCollection.cpp b/third_party/WebKit/Source/core/dom/FrameRequestCallbackCollection.cpp index 9c8c1d88..5e4a074b 100644 --- a/third_party/WebKit/Source/core/dom/FrameRequestCallbackCollection.cpp +++ b/third_party/WebKit/Source/core/dom/FrameRequestCallbackCollection.cpp
@@ -62,7 +62,7 @@ // First, generate a list of callbacks to consider. Callbacks registered from // this point on are considered only for the "next" frame, not this one. DCHECK(callbacks_to_invoke_.IsEmpty()); - callbacks_to_invoke_.Swap(callbacks_); + callbacks_to_invoke_.swap(callbacks_); for (const auto& callback : callbacks_to_invoke_) { if (!callback->cancelled_) {
diff --git a/third_party/WebKit/Source/core/dom/Fullscreen.cpp b/third_party/WebKit/Source/core/dom/Fullscreen.cpp index 7df6c27..37380e0 100644 --- a/third_party/WebKit/Source/core/dom/Fullscreen.cpp +++ b/third_party/WebKit/Source/core/dom/Fullscreen.cpp
@@ -352,7 +352,7 @@ } void Fullscreen::ContextDestroyed(ExecutionContext*) { - event_queue_.Clear(); + event_queue_.clear(); if (full_screen_layout_object_) full_screen_layout_object_->Destroy();
diff --git a/third_party/WebKit/Source/core/dom/IntersectionObserver.cpp b/third_party/WebKit/Source/core/dom/IntersectionObserver.cpp index aa1cc50..36e9ef7 100644 --- a/third_party/WebKit/Source/core/dom/IntersectionObserver.cpp +++ b/third_party/WebKit/Source/core/dom/IntersectionObserver.cpp
@@ -287,7 +287,7 @@ HeapVector<Member<IntersectionObserverEntry>> IntersectionObserver::takeRecords( ExceptionState& exception_state) { HeapVector<Member<IntersectionObserverEntry>> entries; - entries.Swap(entries_); + entries.swap(entries_); return entries; } @@ -331,7 +331,7 @@ return; HeapVector<Member<IntersectionObserverEntry>> entries; - entries.Swap(entries_); + entries.swap(entries_); callback_->HandleEvent(entries, *this); }
diff --git a/third_party/WebKit/Source/core/dom/MutationObserver.cpp b/third_party/WebKit/Source/core/dom/MutationObserver.cpp index 29ea1844..88da4b0 100644 --- a/third_party/WebKit/Source/core/dom/MutationObserver.cpp +++ b/third_party/WebKit/Source/core/dom/MutationObserver.cpp
@@ -206,7 +206,7 @@ if (slot->GetDocument() != document) kept.push_back(slot); } - ActiveSlotChangeList().Swap(kept); + ActiveSlotChangeList().swap(kept); } static void ActivateObserver(MutationObserver* observer) { @@ -295,7 +295,7 @@ ActiveMutationObservers().clear(); SlotChangeList slots; - slots.Swap(ActiveSlotChangeList()); + slots.swap(ActiveSlotChangeList()); for (const auto& slot : slots) slot->ClearSlotChangeEventEnqueued();
diff --git a/third_party/WebKit/Source/core/dom/NodeTest.cpp b/third_party/WebKit/Source/core/dom/NodeTest.cpp index 1039cd2..749e49c 100644 --- a/third_party/WebKit/Source/core/dom/NodeTest.cpp +++ b/third_party/WebKit/Source/core/dom/NodeTest.cpp
@@ -14,8 +14,8 @@ const char* body_content = "<a id=one href='http://www.msn.com'>one</a><b id=two>two</b>"; SetBodyContent(body_content); - Node* one = GetDocument().GetElementById("one"); - Node* two = GetDocument().GetElementById("two"); + Node* one = GetDocument().getElementById("one"); + Node* two = GetDocument().getElementById("two"); EXPECT_FALSE(one->CanStartSelection()); EXPECT_FALSE(one->firstChild()->CanStartSelection()); @@ -29,7 +29,7 @@ "<a href='http://www.msn.com'><content></content></a>"; SetBodyContent(body_content); SetShadowContent(shadow_content, "host"); - Node* one = GetDocument().GetElementById("one"); + Node* one = GetDocument().getElementById("one"); EXPECT_FALSE(one->CanStartSelection()); EXPECT_FALSE(one->firstChild()->CanStartSelection()); @@ -38,7 +38,7 @@ TEST_F(NodeTest, customElementState) { const char* body_content = "<div id=div></div>"; SetBodyContent(body_content); - Element* div = GetDocument().GetElementById("div"); + Element* div = GetDocument().getElementById("div"); EXPECT_EQ(CustomElementState::kUncustomized, div->GetCustomElementState()); EXPECT_TRUE(div->IsDefined()); EXPECT_EQ(Node::kV0NotCustomElement, div->GetV0CustomElementState());
diff --git a/third_party/WebKit/Source/core/dom/NonElementParentNode.h b/third_party/WebKit/Source/core/dom/NonElementParentNode.h index 8162111..5b347db 100644 --- a/third_party/WebKit/Source/core/dom/NonElementParentNode.h +++ b/third_party/WebKit/Source/core/dom/NonElementParentNode.h
@@ -13,7 +13,7 @@ class NonElementParentNode { public: static Element* getElementById(Document& document, const AtomicString& id) { - return document.GetElementById(id); + return document.getElementById(id); } static Element* getElementById(DocumentFragment& fragment,
diff --git a/third_party/WebKit/Source/core/dom/NthIndexCacheTest.cpp b/third_party/WebKit/Source/core/dom/NthIndexCacheTest.cpp index c564d051b..1416cb8 100644 --- a/third_party/WebKit/Source/core/dom/NthIndexCacheTest.cpp +++ b/third_party/WebKit/Source/core/dom/NthIndexCacheTest.cpp
@@ -44,10 +44,10 @@ NthIndexCache nth_index_cache(GetDocument()); EXPECT_EQ( - nth_index_cache.NthChildIndex(*GetDocument().GetElementById("nth-child")), + nth_index_cache.NthChildIndex(*GetDocument().getElementById("nth-child")), 12U); EXPECT_EQ(nth_index_cache.NthLastChildIndex( - *GetDocument().GetElementById("nth-last-child")), + *GetDocument().getElementById("nth-last-child")), 12U); }
diff --git a/third_party/WebKit/Source/core/dom/RangeTest.cpp b/third_party/WebKit/Source/core/dom/RangeTest.cpp index d509587..bec0984 100644 --- a/third_party/WebKit/Source/core/dom/RangeTest.cpp +++ b/third_party/WebKit/Source/core/dom/RangeTest.cpp
@@ -115,11 +115,11 @@ "id=\"inner-right\">2</span>3</span>"); Element* outer = - GetDocument().GetElementById(AtomicString::FromUTF8("outer")); + GetDocument().getElementById(AtomicString::FromUTF8("outer")); Element* inner_left = - GetDocument().GetElementById(AtomicString::FromUTF8("inner-left")); + GetDocument().getElementById(AtomicString::FromUTF8("inner-left")); Element* inner_right = - GetDocument().GetElementById(AtomicString::FromUTF8("inner-right")); + GetDocument().getElementById(AtomicString::FromUTF8("inner-right")); Text* old_text = ToText(outer->childNodes()->item(2)); Range* range_outer_outside = Range::Create(GetDocument(), outer, 0, outer, 5); @@ -198,8 +198,8 @@ "<div><span id=span1>foo</span>bar<span id=span2>baz</span></div>"); Element* div = GetDocument().QuerySelector("div"); - Element* span1 = GetDocument().GetElementById("span1"); - Element* span2 = GetDocument().GetElementById("span2"); + Element* span1 = GetDocument().getElementById("span1"); + Element* span2 = GetDocument().getElementById("span2"); Text* text = ToText(div->childNodes()->item(1)); Range* range = Range::Create(GetDocument(), span2, 0, div, 3); @@ -220,8 +220,8 @@ "<div><span id=span1>foofoo</span>bar<span id=span2>baz</span></div>"); Element* div = GetDocument().QuerySelector("div"); - Element* span1 = GetDocument().GetElementById("span1"); - Element* span2 = GetDocument().GetElementById("span2"); + Element* span1 = GetDocument().getElementById("span1"); + Element* span2 = GetDocument().getElementById("span2"); Text* text = ToText(div->childNodes()->item(1)); Range* range = Range::Create(GetDocument(), span2, 0, div, 3); @@ -246,8 +246,8 @@ TEST_F(RangeTest, MultipleTextQuads) { SetBodyContent("<div><p id='one'>one</p><p id='two'>two</p></div>"); - Position start(GetDocument().GetElementById("one")->firstChild(), 0); - Position end(GetDocument().GetElementById("two")->firstChild(), 3); + Position start(GetDocument().getElementById("one")->firstChild(), 0); + Position end(GetDocument().getElementById("two")->firstChild(), 3); Range* range = Range::Create(GetDocument(), start, end); Vector<FloatQuad> quads; range->TextQuads(quads);
diff --git a/third_party/WebKit/Source/core/dom/ScriptedAnimationController.cpp b/third_party/WebKit/Source/core/dom/ScriptedAnimationController.cpp index 3d1a4e00..bb5c9e0 100644 --- a/third_party/WebKit/Source/core/dom/ScriptedAnimationController.cpp +++ b/third_party/WebKit/Source/core/dom/ScriptedAnimationController.cpp
@@ -83,7 +83,7 @@ void ScriptedAnimationController::RunTasks() { Vector<std::unique_ptr<WTF::Closure>> tasks; - tasks.Swap(task_queue_); + tasks.swap(task_queue_); for (auto& task : tasks) (*task)(); } @@ -92,7 +92,7 @@ const AtomicString& event_interface_filter) { HeapVector<Member<Event>> events; if (event_interface_filter.IsEmpty()) { - events.Swap(event_queue_); + events.swap(event_queue_); per_frame_events_.clear(); } else { HeapVector<Member<Event>> remaining; @@ -104,7 +104,7 @@ remaining.push_back(event.Release()); } } - remaining.Swap(event_queue_); + remaining.swap(event_queue_); } for (const auto& event : events) {
diff --git a/third_party/WebKit/Source/core/dom/ScriptedIdleTaskController.cpp b/third_party/WebKit/Source/core/dom/ScriptedIdleTaskController.cpp index b7fb3d2..4bf5773 100644 --- a/third_party/WebKit/Source/core/dom/ScriptedIdleTaskController.cpp +++ b/third_party/WebKit/Source/core/dom/ScriptedIdleTaskController.cpp
@@ -207,7 +207,7 @@ // Run any pending timeouts. Vector<CallbackId> pending_timeouts; - pending_timeouts_.Swap(pending_timeouts); + pending_timeouts_.swap(pending_timeouts); for (auto& id : pending_timeouts) RunCallback(id, MonotonicallyIncreasingTime(), IdleDeadline::CallbackType::kCalledByTimeout);
diff --git a/third_party/WebKit/Source/core/dom/SecurityContext.h b/third_party/WebKit/Source/core/dom/SecurityContext.h index 30d9446..00c5513a 100644 --- a/third_party/WebKit/Source/core/dom/SecurityContext.h +++ b/third_party/WebKit/Source/core/dom/SecurityContext.h
@@ -98,14 +98,14 @@ const WebFeaturePolicy* parent_feature_policy); void UpdateFeaturePolicyOrigin(); + void ApplySandboxFlags(SandboxFlags mask); + protected: SecurityContext(); virtual ~SecurityContext(); void SetContentSecurityPolicy(ContentSecurityPolicy*); - void ApplySandboxFlags(SandboxFlags mask); - private: RefPtr<SecurityOrigin> security_origin_; Member<ContentSecurityPolicy> content_security_policy_;
diff --git a/third_party/WebKit/Source/core/dom/SelectorQuery.cpp b/third_party/WebKit/Source/core/dom/SelectorQuery.cpp index bab98d5..7189c5e 100644 --- a/third_party/WebKit/Source/core/dom/SelectorQuery.cpp +++ b/third_party/WebKit/Source/core/dom/SelectorQuery.cpp
@@ -411,7 +411,7 @@ return; } - Element* element = scope.GetElementById(selector_id_); + Element* element = scope.getElementById(selector_id_); if (!element) return; if (selector_id_is_rightmost_) {
diff --git a/third_party/WebKit/Source/core/dom/StaticRangeTest.cpp b/third_party/WebKit/Source/core/dom/StaticRangeTest.cpp index cda9b64..293834b 100644 --- a/third_party/WebKit/Source/core/dom/StaticRangeTest.cpp +++ b/third_party/WebKit/Source/core/dom/StaticRangeTest.cpp
@@ -121,11 +121,11 @@ "id=\"inner-right\">2</span>3</span>"); Element* outer = - GetDocument().GetElementById(AtomicString::FromUTF8("outer")); + GetDocument().getElementById(AtomicString::FromUTF8("outer")); Element* inner_left = - GetDocument().GetElementById(AtomicString::FromUTF8("inner-left")); + GetDocument().getElementById(AtomicString::FromUTF8("inner-left")); Element* inner_right = - GetDocument().GetElementById(AtomicString::FromUTF8("inner-right")); + GetDocument().getElementById(AtomicString::FromUTF8("inner-right")); Text* old_text = ToText(outer->childNodes()->item(2)); StaticRange* static_range_outer_outside =
diff --git a/third_party/WebKit/Source/core/dom/StyleElementTest.cpp b/third_party/WebKit/Source/core/dom/StyleElementTest.cpp index b37647e..210d96c5 100644 --- a/third_party/WebKit/Source/core/dom/StyleElementTest.cpp +++ b/third_party/WebKit/Source/core/dom/StyleElementTest.cpp
@@ -22,7 +22,7 @@ "<style id=style>a { top: 0; }</style>"); HTMLStyleElement& style_element = - toHTMLStyleElement(*document.GetElementById("style")); + toHTMLStyleElement(*document.getElementById("style")); StyleSheetContents* sheet = style_element.sheet()->Contents(); Comment* comment = document.createComment("hello!");
diff --git a/third_party/WebKit/Source/core/dom/StyleEngineTest.cpp b/third_party/WebKit/Source/core/dom/StyleEngineTest.cpp index 6f34e34..da6ca9d 100644 --- a/third_party/WebKit/Source/core/dom/StyleEngineTest.cpp +++ b/third_party/WebKit/Source/core/dom/StyleEngineTest.cpp
@@ -81,7 +81,7 @@ "<style>div { color: red }</style><div id='t1'>Green</div><div></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* t1 = GetDocument().GetElementById("t1"); + Element* t1 = GetDocument().getElementById("t1"); ASSERT_TRUE(t1); ASSERT_TRUE(t1->GetComputedStyle()); EXPECT_EQ(MakeRGB(255, 0, 0), @@ -205,7 +205,7 @@ TEST_F(StyleEngineTest, RuleSetInvalidationHost) { GetDocument().body()->setInnerHTML( "<div id=nohost></div><div id=host></div>"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); ASSERT_TRUE(host); ShadowRootInit init; @@ -251,7 +251,7 @@ " <span></span>" "</div>"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); ASSERT_TRUE(host); ShadowRootInit init; @@ -283,7 +283,7 @@ TEST_F(StyleEngineTest, RuleSetInvalidationHostContext) { GetDocument().body()->setInnerHTML("<div id=host></div>"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); ASSERT_TRUE(host); ShadowRootInit init; @@ -315,7 +315,7 @@ TEST_F(StyleEngineTest, RuleSetInvalidationV0BoundaryCrossing) { GetDocument().body()->setInnerHTML("<div id=host></div>"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); ASSERT_TRUE(host); ShadowRootInit init; @@ -346,7 +346,7 @@ " div {}" "</style>"); - Element* style_element = GetDocument().GetElementById("sheet"); + Element* style_element = GetDocument().getElementById("sheet"); for (unsigned i = 0; i < 10; i++) { GetDocument().body()->RemoveChild(style_element); @@ -371,7 +371,7 @@ "<div id='t1'>Green</div><div></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* t1 = GetDocument().GetElementById("t1"); + Element* t1 = GetDocument().getElementById("t1"); ASSERT_TRUE(t1); ASSERT_TRUE(t1->GetComputedStyle()); EXPECT_EQ(MakeRGB(0, 0, 0), @@ -379,7 +379,7 @@ unsigned before_count = GetStyleEngine().StyleForElementCount(); - Element* s1 = GetDocument().GetElementById("s1"); + Element* s1 = GetDocument().getElementById("s1"); s1->setAttribute(blink::HTMLNames::mediaAttr, "(max-width: 2000px)"); GetDocument().View()->UpdateAllLifecyclePhases(); @@ -397,7 +397,7 @@ "<div id='t1'>Green</div><div></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* t1 = GetDocument().GetElementById("t1"); + Element* t1 = GetDocument().getElementById("t1"); ASSERT_TRUE(t1); ASSERT_TRUE(t1->GetComputedStyle()); EXPECT_EQ(MakeRGB(0, 128, 0), @@ -405,7 +405,7 @@ unsigned before_count = GetStyleEngine().StyleForElementCount(); - Element* s1 = GetDocument().GetElementById("s1"); + Element* s1 = GetDocument().getElementById("s1"); s1->setAttribute(blink::HTMLNames::mediaAttr, "(max-width: 2000px)"); GetDocument().View()->UpdateAllLifecyclePhases(); @@ -428,7 +428,7 @@ "<div id='t1'>Green</div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* t1 = GetDocument().GetElementById("t1"); + Element* t1 = GetDocument().getElementById("t1"); ASSERT_TRUE(t1); ASSERT_TRUE(t1->GetComputedStyle()); EXPECT_EQ(MakeRGB(0, 0, 255), @@ -470,8 +470,8 @@ "<div id='t2'></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* t1 = GetDocument().GetElementById("t1"); - Element* t2 = GetDocument().GetElementById("t2"); + Element* t1 = GetDocument().getElementById("t1"); + Element* t2 = GetDocument().getElementById("t2"); ASSERT_TRUE(t1); ASSERT_TRUE(t2); @@ -497,7 +497,7 @@ EXPECT_FALSE(GetDocument().ChildNeedsStyleInvalidation()); GetDocument().View()->UpdateAllLifecyclePhases(); - HTMLStyleElement* s2 = toHTMLStyleElement(GetDocument().GetElementById("s2")); + HTMLStyleElement* s2 = toHTMLStyleElement(GetDocument().getElementById("s2")); ASSERT_TRUE(s2); s2->setDisabled(true); GetStyleEngine().UpdateActiveStyle(); @@ -512,7 +512,7 @@ EXPECT_FALSE(GetDocument().NeedsStyleInvalidation()); GetDocument().View()->UpdateAllLifecyclePhases(); - HTMLStyleElement* s1 = toHTMLStyleElement(GetDocument().GetElementById("s1")); + HTMLStyleElement* s1 = toHTMLStyleElement(GetDocument().getElementById("s1")); ASSERT_TRUE(s1); s1->setDisabled(true); GetStyleEngine().UpdateActiveStyle(); @@ -533,7 +533,7 @@ TEST_F(StyleEngineTest, NoScheduledRuleSetInvalidationsOnNewShadow) { GetDocument().body()->setInnerHTML("<div id='host'></div>"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); ASSERT_TRUE(host); GetDocument().View()->UpdateAllLifecyclePhases();
diff --git a/third_party/WebKit/Source/core/dom/StyleSheetCollection.cpp b/third_party/WebKit/Source/core/dom/StyleSheetCollection.cpp index c1f5deb..bd7a515a 100644 --- a/third_party/WebKit/Source/core/dom/StyleSheetCollection.cpp +++ b/third_party/WebKit/Source/core/dom/StyleSheetCollection.cpp
@@ -43,7 +43,7 @@ void StyleSheetCollection::Swap(StyleSheetCollection& other) { ::blink::swap(style_sheets_for_style_sheet_list_, other.style_sheets_for_style_sheet_list_, this, &other); - active_author_style_sheets_.Swap(other.active_author_style_sheets_); + active_author_style_sheets_.swap(other.active_author_style_sheets_); } void StyleSheetCollection::SwapSheetsForSheetList(
diff --git a/third_party/WebKit/Source/core/dom/TextTest.cpp b/third_party/WebKit/Source/core/dom/TextTest.cpp index c25b5f6..b9bbedc9 100644 --- a/third_party/WebKit/Source/core/dom/TextTest.cpp +++ b/third_party/WebKit/Source/core/dom/TextTest.cpp
@@ -19,7 +19,7 @@ "<style>pre::first-letter {color:red;}</style><pre " "id=sample>a<span>b</span></pre>"); - Node* sample = GetDocument().GetElementById("sample"); + Node* sample = GetDocument().getElementById("sample"); Text* text = ToText(sample->firstChild()); text->setData(" "); UpdateAllLifecyclePhases();
diff --git a/third_party/WebKit/Source/core/dom/TouchList.h b/third_party/WebKit/Source/core/dom/TouchList.h index 9a41237..1a30ab00 100644 --- a/third_party/WebKit/Source/core/dom/TouchList.h +++ b/third_party/WebKit/Source/core/dom/TouchList.h
@@ -63,7 +63,7 @@ private: TouchList() {} - TouchList(HeapVector<Member<Touch>>& touches) { values_.Swap(touches); } + TouchList(HeapVector<Member<Touch>>& touches) { values_.swap(touches); } HeapVector<Member<Touch>> values_; };
diff --git a/third_party/WebKit/Source/core/dom/TreeScope.cpp b/third_party/WebKit/Source/core/dom/TreeScope.cpp index 1ff275e..c7e43a4 100644 --- a/third_party/WebKit/Source/core/dom/TreeScope.cpp +++ b/third_party/WebKit/Source/core/dom/TreeScope.cpp
@@ -118,7 +118,7 @@ scoped_style_resolver_.Clear(); } -Element* TreeScope::GetElementById(const AtomicString& element_id) const { +Element* TreeScope::getElementById(const AtomicString& element_id) const { if (element_id.IsEmpty()) return nullptr; if (!elements_by_id_) @@ -327,7 +327,7 @@ Element* TreeScope::FindAnchor(const String& name) { if (name.IsEmpty()) return nullptr; - if (Element* element = GetElementById(AtomicString(name))) + if (Element* element = getElementById(AtomicString(name))) return element; for (HTMLAnchorElement& anchor : Traversal<HTMLAnchorElement>::StartsAfter(RootNode())) {
diff --git a/third_party/WebKit/Source/core/dom/TreeScope.h b/third_party/WebKit/Source/core/dom/TreeScope.h index 293430c7..85afcab5 100644 --- a/third_party/WebKit/Source/core/dom/TreeScope.h +++ b/third_party/WebKit/Source/core/dom/TreeScope.h
@@ -64,7 +64,7 @@ // TODO(kochi): once this algorithm is named in the spec, rename the method // name. Element* AdjustedElement(const Element&) const; - Element* GetElementById(const AtomicString&) const; + Element* getElementById(const AtomicString&) const; const HeapVector<Member<Element>>& GetAllElementsById( const AtomicString&) const; bool HasElementWithId(const AtomicString& id) const;
diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementTest.cpp b/third_party/WebKit/Source/core/dom/custom/CustomElementTest.cpp index dc7f3e3..192b94e 100644 --- a/third_party/WebKit/Source/core/dom/custom/CustomElementTest.cpp +++ b/third_party/WebKit/Source/core/dom/custom/CustomElementTest.cpp
@@ -161,7 +161,7 @@ {"v0", CustomElementState::kUncustomized, Element::kV0WaitingForUpgrade}, }; for (const auto& data : parser_data) { - Element* element = document.GetElementById(data.id); + Element* element = document.getElementById(data.id); EXPECT_EQ(data.state, element->GetCustomElementState()) << data.id; EXPECT_EQ(data.v0state, element->GetV0CustomElementState()) << data.id; }
diff --git a/third_party/WebKit/Source/core/dom/custom/V0CustomElementAsyncImportMicrotaskQueue.cpp b/third_party/WebKit/Source/core/dom/custom/V0CustomElementAsyncImportMicrotaskQueue.cpp index e768556..c98ab5b 100644 --- a/third_party/WebKit/Source/core/dom/custom/V0CustomElementAsyncImportMicrotaskQueue.cpp +++ b/third_party/WebKit/Source/core/dom/custom/V0CustomElementAsyncImportMicrotaskQueue.cpp
@@ -47,7 +47,7 @@ remaining.push_back(step.Release()); } - queue_.Swap(remaining); + queue_.swap(remaining); } } // namespace blink
diff --git a/third_party/WebKit/Source/core/dom/shadow/DistributedNodes.cpp b/third_party/WebKit/Source/core/dom/shadow/DistributedNodes.cpp index 415b5e0..bb8d7d1 100644 --- a/third_party/WebKit/Source/core/dom/shadow/DistributedNodes.cpp +++ b/third_party/WebKit/Source/core/dom/shadow/DistributedNodes.cpp
@@ -31,7 +31,7 @@ namespace blink { void DistributedNodes::Swap(DistributedNodes& other) { - nodes_.Swap(other.nodes_); + nodes_.swap(other.nodes_); indices_.swap(other.indices_); }
diff --git a/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.h b/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.h index f8b123e..a86e1ad 100644 --- a/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.h +++ b/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.h
@@ -64,7 +64,7 @@ // Disambiguate between Node and TreeScope hierarchies; TreeScope's // implementation is simpler. using TreeScope::GetDocument; - using TreeScope::GetElementById; + using TreeScope::getElementById; // Make protected methods from base class public here. using TreeScope::SetDocument;
diff --git a/third_party/WebKit/Source/core/dom/shadow/ShadowRootRareDataV0.h b/third_party/WebKit/Source/core/dom/shadow/ShadowRootRareDataV0.h index 0f5a415..927f315 100644 --- a/third_party/WebKit/Source/core/dom/shadow/ShadowRootRareDataV0.h +++ b/third_party/WebKit/Source/core/dom/shadow/ShadowRootRareDataV0.h
@@ -68,7 +68,7 @@ return descendant_insertion_points_; } void SetDescendantInsertionPoints(HeapVector<Member<InsertionPoint>>& list) { - descendant_insertion_points_.Swap(list); + descendant_insertion_points_.swap(list); } void ClearDescendantInsertionPoints() { descendant_insertion_points_.clear();
diff --git a/third_party/WebKit/Source/core/editing/CaretDisplayItemClientTest.cpp b/third_party/WebKit/Source/core/editing/CaretDisplayItemClientTest.cpp index a1fcb40..d2275e3 100644 --- a/third_party/WebKit/Source/core/editing/CaretDisplayItemClientTest.cpp +++ b/third_party/WebKit/Source/core/editing/CaretDisplayItemClientTest.cpp
@@ -363,8 +363,8 @@ GetDocument().GetPage()->GetFocusController().SetActive(true); GetDocument().GetPage()->GetFocusController().SetFocused(true); - auto* container = GetDocument().GetElementById("container"); - auto* editor = GetDocument().GetElementById("editor"); + auto* container = GetDocument().getElementById("container"); + auto* editor = GetDocument().getElementById("editor"); auto* editor_block = ToLayoutBlock(editor->GetLayoutObject()); Selection().SetSelection( SelectionInDOMTree::Builder().Collapse(Position(editor, 0)).Build());
diff --git a/third_party/WebKit/Source/core/editing/EditingStrategyTest.cpp b/third_party/WebKit/Source/core/editing/EditingStrategyTest.cpp index 59510fcf..f58e3ab 100644 --- a/third_party/WebKit/Source/core/editing/EditingStrategyTest.cpp +++ b/third_party/WebKit/Source/core/editing/EditingStrategyTest.cpp
@@ -17,9 +17,9 @@ "<content select=#two></content><content select=#one></content>"; SetBodyContent(body_content); SetShadowContent(shadow_content, "host"); - Node* host = GetDocument().GetElementById("host"); - Node* one = GetDocument().GetElementById("one"); - Node* two = GetDocument().GetElementById("two"); + Node* host = GetDocument().getElementById("host"); + Node* one = GetDocument().getElementById("one"); + Node* two = GetDocument().getElementById("two"); EXPECT_EQ(4, EditingStrategy::CaretMaxOffset(*host)); EXPECT_EQ(1, EditingStrategy::CaretMaxOffset(*one));
diff --git a/third_party/WebKit/Source/core/editing/EditingStyleTest.cpp b/third_party/WebKit/Source/core/editing/EditingStyleTest.cpp index 1f09e89c..ae1e6f74 100644 --- a/third_party/WebKit/Source/core/editing/EditingStyleTest.cpp +++ b/third_party/WebKit/Source/core/editing/EditingStyleTest.cpp
@@ -23,9 +23,9 @@ UpdateAllLifecyclePhases(); EditingStyle* editing_style = - EditingStyle::Create(ToHTMLElement(GetDocument().GetElementById("s2"))); + EditingStyle::Create(ToHTMLElement(GetDocument().getElementById("s2"))); editing_style->MergeInlineStyleOfElement( - ToHTMLElement(GetDocument().GetElementById("s1")), + ToHTMLElement(GetDocument().getElementById("s1")), EditingStyle::kOverrideValues); EXPECT_FALSE(editing_style->Style()->HasProperty(CSSPropertyFloat))
diff --git a/third_party/WebKit/Source/core/editing/EditingTestBase.cpp b/third_party/WebKit/Source/core/editing/EditingTestBase.cpp index e47bc8e..d65459e 100644 --- a/third_party/WebKit/Source/core/editing/EditingTestBase.cpp +++ b/third_party/WebKit/Source/core/editing/EditingTestBase.cpp
@@ -43,7 +43,7 @@ const char* host_element_id, const char* shadow_root_content) { ShadowRoot* shadow_root = - scope.GetElementById(AtomicString::FromUTF8(host_element_id)) + scope.getElementById(AtomicString::FromUTF8(host_element_id)) ->CreateShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION); shadow_root->setInnerHTML(String::FromUTF8(shadow_root_content), ASSERT_NO_EXCEPTION);
diff --git a/third_party/WebKit/Source/core/editing/EditingUtilitiesTest.cpp b/third_party/WebKit/Source/core/editing/EditingUtilitiesTest.cpp index 79d4e48f..0d6df53 100644 --- a/third_party/WebKit/Source/core/editing/EditingUtilitiesTest.cpp +++ b/third_party/WebKit/Source/core/editing/EditingUtilitiesTest.cpp
@@ -19,7 +19,7 @@ "select=#one></content><p>"; SetBodyContent(body_content); SetShadowContent(shadow_content, "host"); - Node* one = GetDocument().GetElementById("one"); + Node* one = GetDocument().getElementById("one"); EXPECT_EQ(TextDirection::kLtr, DirectionOfEnclosingBlock(Position(one, 0))); EXPECT_EQ(TextDirection::kRtl, @@ -34,10 +34,10 @@ "id='three'>333</b>"; SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Element* host = GetDocument().GetElementById("host"); - Node* one = GetDocument().GetElementById("one"); - Node* two = GetDocument().GetElementById("two"); - Node* three = shadow_root->GetElementById("three"); + Element* host = GetDocument().getElementById("host"); + Node* one = GetDocument().getElementById("one"); + Node* two = GetDocument().getElementById("two"); + Node* three = shadow_root->getElementById("three"); EXPECT_EQ(Position(one, 0), FirstEditablePositionAfterPositionInRoot(Position(one, 0), *host)); @@ -77,9 +77,9 @@ "select=#one></content></div>"; SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Node* host = GetDocument().GetElementById("host"); - Node* one = GetDocument().GetElementById("one"); - Node* three = shadow_root->GetElementById("three"); + Node* host = GetDocument().getElementById("host"); + Node* one = GetDocument().getElementById("one"); + Node* three = shadow_root->getElementById("three"); EXPECT_EQ(host, EnclosingBlock(Position(one, 0), kCannotCrossEditingBoundary)); @@ -94,9 +94,9 @@ "select=#one></div></content>"; SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Node* host = GetDocument().GetElementById("host"); - Node* one = GetDocument().GetElementById("one"); - Node* three = shadow_root->GetElementById("three"); + Node* host = GetDocument().getElementById("host"); + Node* one = GetDocument().getElementById("one"); + Node* three = shadow_root->getElementById("three"); EXPECT_EQ(host, EnclosingNodeOfType(Position(one, 0), IsEnclosingBlock)); EXPECT_EQ(three, @@ -128,8 +128,8 @@ "<content select=#two></content><content select=#table></content>"; SetBodyContent(body_content); SetShadowContent(shadow_content, "host"); - Node* host = GetDocument().GetElementById("host"); - Node* table = GetDocument().GetElementById("table"); + Node* host = GetDocument().getElementById("host"); + Node* table = GetDocument().getElementById("table"); EXPECT_EQ(table, TableElementJustBefore(VisiblePosition::AfterNode(table))); EXPECT_EQ(table, TableElementJustBefore( @@ -163,10 +163,10 @@ "id='three'>333</b>"; SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Element* host = GetDocument().GetElementById("host"); - Node* one = GetDocument().GetElementById("one"); - Node* two = GetDocument().GetElementById("two"); - Node* three = shadow_root->GetElementById("three"); + Element* host = GetDocument().getElementById("host"); + Node* one = GetDocument().getElementById("one"); + Node* two = GetDocument().getElementById("two"); + Node* three = shadow_root->getElementById("three"); EXPECT_EQ(Position(one, 0), LastEditablePositionBeforePositionInRoot(Position(one, 0), *host)); @@ -206,8 +206,8 @@ "<content select=#two></content><content select=#one></content>"; SetBodyContent(body_content); SetShadowContent(shadow_content, "host"); - Node* host = GetDocument().GetElementById("host"); - Node* two = GetDocument().GetElementById("two"); + Node* host = GetDocument().getElementById("host"); + Node* two = GetDocument().getElementById("two"); EXPECT_EQ( Position(host, 3), @@ -226,9 +226,9 @@ "select=#three></content>"; SetBodyContent(body_content); SetShadowContent(shadow_content, "host"); - Node* one = GetDocument().GetElementById("one"); - Node* two = GetDocument().GetElementById("two"); - Node* three = GetDocument().GetElementById("three"); + Node* one = GetDocument().getElementById("one"); + Node* two = GetDocument().getElementById("two"); + Node* three = GetDocument().getElementById("three"); EXPECT_EQ(Position(two->firstChild(), 1), NextVisuallyDistinctCandidate(Position(one, 1))); @@ -269,7 +269,7 @@ TEST_F(EditingUtilitiesTest, uncheckedPreviousNextOffset_FirstLetter) { SetBodyContent( "<style>p::first-letter {color:red;}</style><p id='target'>abc</p>"); - Node* node = GetDocument().GetElementById("target")->firstChild(); + Node* node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(2, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 1)); @@ -290,7 +290,7 @@ TEST_F(EditingUtilitiesTest, uncheckedPreviousNextOffset_textTransform) { SetBodyContent( "<style>p {text-transform:uppercase}</style><p id='target'>abc</p>"); - Node* node = GetDocument().GetElementById("target")->firstChild(); + Node* node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(2, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 1)); @@ -314,17 +314,17 @@ TEST_F(EditingUtilitiesTest, uncheckedPreviousNextOffset) { // GB1: Break at the start of text. SetBodyContent("<p id='target'>a</p>"); - Node* node = GetDocument().GetElementById("target")->firstChild(); + Node* node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 1)); // GB2: Break at the end of text. SetBodyContent("<p id='target'>a</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(1, NextGraphemeBoundaryOf(node, 0)); // GB3: Do not break between CR and LF. SetBodyContent("<p id='target'>a
b</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(3, PreviousGraphemeBoundaryOf(node, 4)); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 1)); @@ -334,7 +334,7 @@ // GB4,GB5: Break before and after CR/LF/Control. SetBodyContent("<p id='target'>a
b</p>"); // CR - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(2, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 1)); @@ -342,7 +342,7 @@ EXPECT_EQ(2, NextGraphemeBoundaryOf(node, 1)); EXPECT_EQ(3, NextGraphemeBoundaryOf(node, 2)); SetBodyContent("<p id='target'>a
b</p>"); // LF - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(2, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 1)); @@ -351,7 +351,7 @@ EXPECT_EQ(3, NextGraphemeBoundaryOf(node, 2)); // U+00AD(SOFT HYPHEN) has Control property. SetBodyContent("<p id='target'>a­b</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(2, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 1)); @@ -371,7 +371,7 @@ const std::string t = "ᆨ"; // U+11A8 (HANGUL JONGSEONG KIYEOK) has T property. SetBodyContent("<p id='target'>a" + l + l + "b</p>"); // L x L - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(3, PreviousGraphemeBoundaryOf(node, 4)); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 1)); @@ -379,7 +379,7 @@ EXPECT_EQ(3, NextGraphemeBoundaryOf(node, 1)); EXPECT_EQ(4, NextGraphemeBoundaryOf(node, 3)); SetBodyContent("<p id='target'>a" + l + v + "b</p>"); // L x V - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(3, PreviousGraphemeBoundaryOf(node, 4)); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 1)); @@ -387,7 +387,7 @@ EXPECT_EQ(3, NextGraphemeBoundaryOf(node, 1)); EXPECT_EQ(4, NextGraphemeBoundaryOf(node, 3)); SetBodyContent("<p id='target'>a" + l + lv + "b</p>"); // L x LV - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(3, PreviousGraphemeBoundaryOf(node, 4)); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 1)); @@ -395,7 +395,7 @@ EXPECT_EQ(3, NextGraphemeBoundaryOf(node, 1)); EXPECT_EQ(4, NextGraphemeBoundaryOf(node, 3)); SetBodyContent("<p id='target'>a" + l + lvt + "b</p>"); // L x LVT - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(3, PreviousGraphemeBoundaryOf(node, 4)); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 1)); @@ -405,7 +405,7 @@ // GB7: Don't break Hangul sequence. SetBodyContent("<p id='target'>a" + lv + v + "b</p>"); // LV x V - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(3, PreviousGraphemeBoundaryOf(node, 4)); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 1)); @@ -413,7 +413,7 @@ EXPECT_EQ(3, NextGraphemeBoundaryOf(node, 1)); EXPECT_EQ(4, NextGraphemeBoundaryOf(node, 3)); SetBodyContent("<p id='target'>a" + lv + t + "b</p>"); // LV x T - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(3, PreviousGraphemeBoundaryOf(node, 4)); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 1)); @@ -421,7 +421,7 @@ EXPECT_EQ(3, NextGraphemeBoundaryOf(node, 1)); EXPECT_EQ(4, NextGraphemeBoundaryOf(node, 3)); SetBodyContent("<p id='target'>a" + v + v + "b</p>"); // V x V - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(3, PreviousGraphemeBoundaryOf(node, 4)); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 1)); @@ -429,7 +429,7 @@ EXPECT_EQ(3, NextGraphemeBoundaryOf(node, 1)); EXPECT_EQ(4, NextGraphemeBoundaryOf(node, 3)); SetBodyContent("<p id='target'>a" + v + t + "b</p>"); // V x T - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(3, PreviousGraphemeBoundaryOf(node, 4)); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 1)); @@ -439,7 +439,7 @@ // GB8: Don't break Hangul sequence. SetBodyContent("<p id='target'>a" + lvt + t + "b</p>"); // LVT x T - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(3, PreviousGraphemeBoundaryOf(node, 4)); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 1)); @@ -447,7 +447,7 @@ EXPECT_EQ(3, NextGraphemeBoundaryOf(node, 1)); EXPECT_EQ(4, NextGraphemeBoundaryOf(node, 3)); SetBodyContent("<p id='target'>a" + t + t + "b</p>"); // T x T - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(3, PreviousGraphemeBoundaryOf(node, 4)); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 1)); @@ -464,7 +464,7 @@ const std::string flag = "🇺🇸"; // US flag. // ^(RI RI)* RI x RI SetBodyContent("<p id='target'>" + flag + flag + flag + flag + "a</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(16, PreviousGraphemeBoundaryOf(node, 17)); EXPECT_EQ(12, PreviousGraphemeBoundaryOf(node, 16)); EXPECT_EQ(8, PreviousGraphemeBoundaryOf(node, 12)); @@ -480,7 +480,7 @@ // regional indicator symbols before. // [^RI] (RI RI)* RI x RI SetBodyContent("<p id='target'>a" + flag + flag + flag + flag + "b</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(17, PreviousGraphemeBoundaryOf(node, 18)); EXPECT_EQ(13, PreviousGraphemeBoundaryOf(node, 17)); EXPECT_EQ(9, PreviousGraphemeBoundaryOf(node, 13)); @@ -497,7 +497,7 @@ // GB8c: Break if there is an odd number of regional indicator symbols before. SetBodyContent("<p id='target'>a" + flag + flag + flag + flag + "🇸b</p>"); // RI ÷ RI - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(19, PreviousGraphemeBoundaryOf(node, 20)); EXPECT_EQ(17, PreviousGraphemeBoundaryOf(node, 19)); EXPECT_EQ(13, PreviousGraphemeBoundaryOf(node, 17)); @@ -516,14 +516,14 @@ // GB9: Do not break before extending characters or ZWJ. // U+0300(COMBINING GRAVE ACCENT) has Extend property. SetBodyContent("<p id='target'>àb</p>"); // x Extend - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(2, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(2, NextGraphemeBoundaryOf(node, 0)); EXPECT_EQ(3, NextGraphemeBoundaryOf(node, 2)); // U+200D is ZERO WIDTH JOINER. SetBodyContent("<p id='target'>a‍b</p>"); // x ZWJ - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(2, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(2, NextGraphemeBoundaryOf(node, 0)); @@ -532,7 +532,7 @@ // GB9a: Do not break before SpacingMarks. // U+0903(DEVANAGARI SIGN VISARGA) has SpacingMark property. SetBodyContent("<p id='target'>aःb</p>"); // x SpacingMark - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(2, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(2, NextGraphemeBoundaryOf(node, 0)); @@ -544,7 +544,7 @@ // For https://bugs.webkit.org/show_bug.cgi?id=24342 // The break should happens after Thai character. SetBodyContent("<p id='target'>aเb</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(2, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 1)); @@ -555,7 +555,7 @@ // Blink customization: Don't break before Japanese half-width katakana voiced // marks. SetBodyContent("<p id='target'>aｶﾞb</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(3, PreviousGraphemeBoundaryOf(node, 4)); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 1)); @@ -570,7 +570,7 @@ // U+094D is DEVANAGARI SIGN VIRAMA. This has Virama property. // U+0915 is DEVANAGARI LETTER KA. SetBodyContent("<p id='target'>aअ्कb</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(4, PreviousGraphemeBoundaryOf(node, 5)); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 4)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 1)); @@ -582,7 +582,7 @@ // Should break after U+0E3A since U+0E3A has Virama property but not listed // in IndicSyllabicCategory=Virama. SetBodyContent("<p id='target'>aกฺกb</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(4, PreviousGraphemeBoundaryOf(node, 5)); EXPECT_EQ(3, PreviousGraphemeBoundaryOf(node, 4)); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 3)); @@ -597,7 +597,7 @@ // U+1F3FB(EMOJI MODIFIER FITZPATRICK TYPE-1-2) has E_Modifier property. SetBodyContent( "<p id='target'>a🎅🏻b</p>"); // E_Base x E_Modifier - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(5, PreviousGraphemeBoundaryOf(node, 6)); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 5)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 1)); @@ -607,7 +607,7 @@ // U+1F466(BOY) has EBG property. SetBodyContent( "<p id='target'>a👦🏻b</p>"); // EBG x E_Modifier - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(5, PreviousGraphemeBoundaryOf(node, 6)); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 5)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 1)); @@ -619,13 +619,13 @@ // U+2764(HEAVY BLACK HEART) has Glue_After_Zwj property. SetBodyContent( "<p id='target'>a‍❤b</p>"); // ZWJ x Glue_After_Zwj - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(3, PreviousGraphemeBoundaryOf(node, 4)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(3, NextGraphemeBoundaryOf(node, 0)); EXPECT_EQ(4, NextGraphemeBoundaryOf(node, 3)); SetBodyContent("<p id='target'>a‍👦b</p>"); // ZWJ x EBG - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(4, PreviousGraphemeBoundaryOf(node, 5)); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 4)); EXPECT_EQ(4, NextGraphemeBoundaryOf(node, 0)); @@ -636,82 +636,82 @@ // U+1F5FA(WORLD MAP) doesn't have either Glue_After_Zwj or EBG but has // Emoji property. SetBodyContent("<p id='target'>‍🗺</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(0, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(3, NextGraphemeBoundaryOf(node, 0)); // GB999: Otherwise break everywhere. // Breaks between Hangul syllable except for GB6, GB7, GB8. SetBodyContent("<p id='target'>" + l + t + "</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(1, NextGraphemeBoundaryOf(node, 0)); SetBodyContent("<p id='target'>" + v + l + "</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(1, NextGraphemeBoundaryOf(node, 0)); SetBodyContent("<p id='target'>" + v + lv + "</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(1, NextGraphemeBoundaryOf(node, 0)); SetBodyContent("<p id='target'>" + v + lvt + "</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(1, NextGraphemeBoundaryOf(node, 0)); SetBodyContent("<p id='target'>" + lv + l + "</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(1, NextGraphemeBoundaryOf(node, 0)); SetBodyContent("<p id='target'>" + lv + lv + "</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(1, NextGraphemeBoundaryOf(node, 0)); SetBodyContent("<p id='target'>" + lv + lvt + "</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(1, NextGraphemeBoundaryOf(node, 0)); SetBodyContent("<p id='target'>" + lvt + l + "</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(1, NextGraphemeBoundaryOf(node, 0)); SetBodyContent("<p id='target'>" + lvt + v + "</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(1, NextGraphemeBoundaryOf(node, 0)); SetBodyContent("<p id='target'>" + lvt + lv + "</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(1, NextGraphemeBoundaryOf(node, 0)); SetBodyContent("<p id='target'>" + lvt + lvt + "</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(1, NextGraphemeBoundaryOf(node, 0)); SetBodyContent("<p id='target'>" + t + l + "</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(1, NextGraphemeBoundaryOf(node, 0)); SetBodyContent("<p id='target'>" + t + v + "</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(1, NextGraphemeBoundaryOf(node, 0)); SetBodyContent("<p id='target'>" + t + lv + "</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(1, NextGraphemeBoundaryOf(node, 0)); SetBodyContent("<p id='target'>" + t + lvt + "</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(1, NextGraphemeBoundaryOf(node, 0)); // For GB10, if base emoji character is not E_Base or EBG, break happens // before E_Modifier. SetBodyContent("<p id='target'>a🏻</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 3)); EXPECT_EQ(1, NextGraphemeBoundaryOf(node, 0)); // U+1F5FA(WORLD MAP) doesn't have either E_Base or EBG property. SetBodyContent("<p id='target'>🗺🏻</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(2, PreviousGraphemeBoundaryOf(node, 4)); EXPECT_EQ(2, NextGraphemeBoundaryOf(node, 0)); @@ -719,7 +719,7 @@ // after ZWJ. // U+1F5FA(WORLD MAP) doesn't have either Glue_After_Zwj or EBG. SetBodyContent("<p id='target'>‍a</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(1, PreviousGraphemeBoundaryOf(node, 2)); EXPECT_EQ(1, NextGraphemeBoundaryOf(node, 0)); } @@ -727,7 +727,7 @@ TEST_F(EditingUtilitiesTest, previousPositionOf_Backspace) { // BMP characters. Only one code point should be deleted. SetBodyContent("<p id='target'>abc</p>"); - Node* node = GetDocument().GetElementById("target")->firstChild(); + Node* node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(Position(node, 2), PreviousPositionOf(Position(node, 3), PositionMoveType::kBackwardDeletion)); @@ -742,7 +742,7 @@ TEST_F(EditingUtilitiesTest, previousPositionOf_Backspace_FirstLetter) { SetBodyContent( "<style>p::first-letter {color:red;}</style><p id='target'>abc</p>"); - Node* node = GetDocument().GetElementById("target")->firstChild(); + Node* node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(Position(node, 2), PreviousPositionOf(Position(node, 3), PositionMoveType::kBackwardDeletion)); @@ -755,7 +755,7 @@ SetBodyContent( "<style>p::first-letter {color:red;}</style><p id='target'>(a)bc</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(Position(node, 4), PreviousPositionOf(Position(node, 5), PositionMoveType::kBackwardDeletion)); @@ -778,7 +778,7 @@ SetBodyContent( "<style>p {text-transform:uppercase}</style><p " "id='target'>ßabc</p>"); - Node* node = GetDocument().GetElementById("target")->firstChild(); + Node* node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(Position(node, 3), PreviousPositionOf(Position(node, 4), PositionMoveType::kBackwardDeletion)); @@ -797,7 +797,7 @@ // Supplementary plane characters. Only one code point should be deleted. // 👁 is EYE. SetBodyContent("<p id='target'>👁👁👁</p>"); - Node* node = GetDocument().GetElementById("target")->firstChild(); + Node* node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(Position(node, 4), PreviousPositionOf(Position(node, 6), PositionMoveType::kBackwardDeletion)); @@ -810,7 +810,7 @@ // BMP and Supplementary plane case. SetBodyContent("<p id='target'>👁a👁a</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(Position(node, 5), PreviousPositionOf(Position(node, 6), PositionMoveType::kBackwardDeletion)); @@ -827,14 +827,14 @@ // Edge case: broken surrogate pairs. SetBodyContent( "<p id='target'>�</p>"); // � is unpaired lead surrogate. - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(Position(node, 0), PreviousPositionOf(Position(node, 1), PositionMoveType::kBackwardDeletion)); // � is unpaired lead surrogate. SetBodyContent("<p id='target'>👁�👁</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(Position(node, 3), PreviousPositionOf(Position(node, 5), PositionMoveType::kBackwardDeletion)); @@ -847,7 +847,7 @@ SetBodyContent( "<p id='target'>a�a</p>"); // � is unpaired lead surrogate. - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(Position(node, 2), PreviousPositionOf(Position(node, 3), PositionMoveType::kBackwardDeletion)); @@ -860,14 +860,14 @@ SetBodyContent( "<p id='target'>�</p>"); // � is unpaired trail surrogate. - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(Position(node, 0), PreviousPositionOf(Position(node, 1), PositionMoveType::kBackwardDeletion)); // � is unpaired trail surrogate. SetBodyContent("<p id='target'>👁�👁</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(Position(node, 3), PreviousPositionOf(Position(node, 5), PositionMoveType::kBackwardDeletion)); @@ -880,7 +880,7 @@ // � is unpaired trail surrogate. SetBodyContent("<p id='target'>a�a</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(Position(node, 2), PreviousPositionOf(Position(node, 3), PositionMoveType::kBackwardDeletion)); @@ -893,7 +893,7 @@ // Edge case: specify middle of surrogate pairs. SetBodyContent("<p id='target'>👁👁👁</p>"); - node = GetDocument().GetElementById("target")->firstChild(); + node = GetDocument().getElementById("target")->firstChild(); EXPECT_EQ(Position(node, 4), PreviousPositionOf(Position(node, 5), PositionMoveType::kBackwardDeletion));
diff --git a/third_party/WebKit/Source/core/editing/EditorTest.cpp b/third_party/WebKit/Source/core/editing/EditorTest.cpp index d7f0cf05..70c49ae 100644 --- a/third_party/WebKit/Source/core/editing/EditorTest.cpp +++ b/third_party/WebKit/Source/core/editing/EditorTest.cpp
@@ -68,7 +68,7 @@ SetBodyContent(body_content); HTMLInputElement& element = - toHTMLInputElement(*GetDocument().GetElementById("password")); + toHTMLInputElement(*GetDocument().getElementById("password")); const String kPasswordValue = "secret"; element.focus();
diff --git a/third_party/WebKit/Source/core/editing/EphemeralRangeTest.cpp b/third_party/WebKit/Source/core/editing/EphemeralRangeTest.cpp index 08ce68d..f43d565 100644 --- a/third_party/WebKit/Source/core/editing/EphemeralRangeTest.cpp +++ b/third_party/WebKit/Source/core/editing/EphemeralRangeTest.cpp
@@ -119,16 +119,16 @@ SetBodyContent(body_content); Range* until_b = GetBodyRange(); - until_b->setEnd(GetDocument().GetElementById("one"), 0, + until_b->setEnd(GetDocument().getElementById("one"), 0, IGNORE_EXCEPTION_FOR_TESTING); EXPECT_EQ("[BODY][P id=\"host\"][B id=\"zero\"][#text \"0\"][B id=\"one\"]", TraverseRange<>(until_b)); EXPECT_EQ(TraverseRange<>(until_b), TraverseRange(EphemeralRange(until_b))); Range* from_b_to_span = GetBodyRange(); - from_b_to_span->setStart(GetDocument().GetElementById("one"), 0, + from_b_to_span->setStart(GetDocument().getElementById("one"), 0, IGNORE_EXCEPTION_FOR_TESTING); - from_b_to_span->setEnd(GetDocument().GetElementById("three"), 0, + from_b_to_span->setEnd(GetDocument().getElementById("three"), 0, IGNORE_EXCEPTION_FOR_TESTING); EXPECT_EQ("[#text \"1\"][B id=\"two\"][#text \"22\"][SPAN id=\"three\"]", TraverseRange<>(from_b_to_span)); @@ -153,11 +153,11 @@ SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - const PositionInFlatTree start_position(GetDocument().GetElementById("one"), + const PositionInFlatTree start_position(GetDocument().getElementById("one"), 0); - const PositionInFlatTree limit_position(shadow_root->GetElementById("five"), + const PositionInFlatTree limit_position(shadow_root->getElementById("five"), 0); - const PositionInFlatTree end_position(shadow_root->GetElementById("six"), 0); + const PositionInFlatTree end_position(shadow_root->getElementById("six"), 0); const EphemeralRangeInFlatTree from_b_to_span(start_position, limit_position); EXPECT_EQ("[#text \"1\"][SPAN id=\"five\"]", TraverseRange(from_b_to_span)); @@ -195,10 +195,10 @@ "</p>"; SetBodyContent(body_content); - const Position start_position(GetDocument().GetElementById("one"), 0); - const Position end_position(GetDocument().GetElementById("two"), 0); + const Position start_position(GetDocument().getElementById("one"), 0); + const Position end_position(GetDocument().getElementById("two"), 0); const EphemeralRange range(start_position, end_position); - EXPECT_EQ(GetDocument().GetElementById("host"), + EXPECT_EQ(GetDocument().getElementById("host"), range.CommonAncestorContainer()); } @@ -218,11 +218,11 @@ SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - const PositionInFlatTree start_position(GetDocument().GetElementById("one"), + const PositionInFlatTree start_position(GetDocument().getElementById("one"), 0); - const PositionInFlatTree end_position(shadow_root->GetElementById("five"), 0); + const PositionInFlatTree end_position(shadow_root->getElementById("five"), 0); const EphemeralRangeInFlatTree range(start_position, end_position); - EXPECT_EQ(GetDocument().GetElementById("host"), + EXPECT_EQ(GetDocument().getElementById("host"), range.CommonAncestorContainer()); }
diff --git a/third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp b/third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp index ac920de..b5a282e 100644 --- a/third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp +++ b/third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp
@@ -58,7 +58,7 @@ TEST_F(FrameSelectionTest, FirstEphemeralRangeOf) { SetBodyContent("<div id=sample>0123456789</div>abc"); - Element* const sample = GetDocument().GetElementById("sample"); + Element* const sample = GetDocument().getElementById("sample"); Node* const text = sample->firstChild(); Selection().SetSelectedRange( EphemeralRange(Position(text, 3), Position(text, 6)), VP_DEFAULT_AFFINITY, @@ -159,7 +159,7 @@ TEST_F(FrameSelectionTest, ModifyExtendWithFlatTree) { SetBodyContent("<span id=host></span>one"); SetShadowContent("two<content></content>", "host"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); Node* const two = FlatTreeTraversal::FirstChild(*host); // Select "two" for selection in DOM tree // Select "twoone" for selection in Flat tree @@ -179,7 +179,7 @@ TEST_F(FrameSelectionTest, ModifyWithUserTriggered) { SetBodyContent("<div id=sample>abc</div>"); - Element* sample = GetDocument().GetElementById("sample"); + Element* sample = GetDocument().getElementById("sample"); const Position end_of_text(sample->firstChild(), 3); Selection().SetSelection( SelectionInDOMTree::Builder().Collapse(end_of_text).Build()); @@ -270,7 +270,7 @@ TEST_F(FrameSelectionTest, SelectAllPreservesHandle) { SetBodyContent("<div id=sample>abc</div>"); - Element* sample = GetDocument().GetElementById("sample"); + Element* sample = GetDocument().getElementById("sample"); const Position end_of_text(sample->firstChild(), 3); Selection().SetSelection(SelectionInDOMTree::Builder() .Collapse(end_of_text)
diff --git a/third_party/WebKit/Source/core/editing/GranularityStrategyTest.cpp b/third_party/WebKit/Source/core/editing/GranularityStrategyTest.cpp index 6a369ead..6d26c7c 100644 --- a/third_party/WebKit/Source/core/editing/GranularityStrategyTest.cpp +++ b/third_party/WebKit/Source/core/editing/GranularityStrategyTest.cpp
@@ -178,7 +178,7 @@ "</html>"); Text* text = GetDocument().createTextNode(str); - Element* div = GetDocument().GetElementById("mytext"); + Element* div = GetDocument().getElementById("mytext"); div->AppendChild(text); GetDocument().View()->UpdateAllLifecyclePhases(); @@ -203,7 +203,7 @@ "</html>"); Text* text = GetDocument().createTextNode(str); - Element* div = GetDocument().GetElementById("mytext"); + Element* div = GetDocument().getElementById("mytext"); div->AppendChild(text); GetDocument().View()->UpdateAllLifecyclePhases(); @@ -228,7 +228,7 @@ "</html>"); Text* text = GetDocument().createTextNode(str); - Element* div = GetDocument().GetElementById("mytext"); + Element* div = GetDocument().getElementById("mytext"); div->AppendChild(text); GetDocument().View()->UpdateAllLifecyclePhases(); @@ -246,7 +246,7 @@ Text* text2 = GetDocument().createTextNode(str2); Text* text3 = GetDocument().createTextNode(str3); Element* span = HTMLSpanElement::Create(GetDocument()); - Element* div = GetDocument().GetElementById("mytext"); + Element* div = GetDocument().getElementById("mytext"); div->AppendChild(text1); div->AppendChild(span); span->AppendChild(text2); @@ -716,11 +716,11 @@ GetDocument().body()->setInnerHTML( "<div id=host></div><div id=sample>ab</div>"); // Simulate VIDEO element which has a RANGE as slider of video time. - Element* const host = GetDocument().GetElementById("host"); + Element* const host = GetDocument().getElementById("host"); ShadowRoot* const shadow_root = host->CreateShadowRootInternal( ShadowRootType::kOpen, ASSERT_NO_EXCEPTION); shadow_root->setInnerHTML("<input type=range>"); - Element* const sample = GetDocument().GetElementById("sample"); + Element* const sample = GetDocument().getElementById("sample"); GetDocument().UpdateStyleAndLayout(); const SelectionInDOMTree& selection_in_dom_tree = SelectionInDOMTree::Builder() @@ -748,11 +748,11 @@ GetDocument().body()->setInnerHTML( "<div id=host></div><div id=sample>ab</div>"); // Simulate VIDEO element which has a RANGE as slider of video time. - Element* const host = GetDocument().GetElementById("host"); + Element* const host = GetDocument().getElementById("host"); ShadowRoot* const shadow_root = host->CreateShadowRootInternal( ShadowRootType::kOpen, ASSERT_NO_EXCEPTION); shadow_root->setInnerHTML("<input type=range>"); - Element* const sample = GetDocument().GetElementById("sample"); + Element* const sample = GetDocument().getElementById("sample"); GetDocument().UpdateStyleAndLayout(); const SelectionInDOMTree& selection_in_dom_tree = SelectionInDOMTree::Builder()
diff --git a/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp b/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp index 7aa2891..385730803 100644 --- a/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp +++ b/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp
@@ -50,7 +50,7 @@ const char* element_id) { GetDocument().write(element_code); GetDocument().UpdateStyleAndLayout(); - Element* element = GetDocument().GetElementById(element_id); + Element* element = GetDocument().getElementById(element_id); element->focus(); return element; } @@ -1320,7 +1320,7 @@ input_a->setOuterHTML("", ASSERT_NO_EXCEPTION); EXPECT_EQ(kWebTextInputTypeNone, Controller().TextInputType()); - GetDocument().GetElementById("b")->focus(); + GetDocument().getElementById("b")->focus(); EXPECT_EQ(kWebTextInputTypeTelephone, Controller().TextInputType()); Controller().FinishComposingText(InputMethodController::kKeepSelection);
diff --git a/third_party/WebKit/Source/core/editing/PositionTest.cpp b/third_party/WebKit/Source/core/editing/PositionTest.cpp index 395b1be7..2d94723 100644 --- a/third_party/WebKit/Source/core/editing/PositionTest.cpp +++ b/third_party/WebKit/Source/core/editing/PositionTest.cpp
@@ -19,7 +19,7 @@ const char* body_content = "<textarea id=textarea></textarea><a id=child1>1</a><b id=child2>2</b>"; SetBodyContent(body_content); - Node* textarea = GetDocument().GetElementById("textarea"); + Node* textarea = GetDocument().getElementById("textarea"); EXPECT_EQ(Position::BeforeNode(textarea), Position::EditingPositionOf(textarea, 0)); @@ -30,8 +30,8 @@ // Change DOM tree to // <textarea id=textarea><a id=child1>1</a><b id=child2>2</b></textarea> - Node* child1 = GetDocument().GetElementById("child1"); - Node* child2 = GetDocument().GetElementById("child2"); + Node* child1 = GetDocument().getElementById("child1"); + Node* child2 = GetDocument().getElementById("child2"); textarea->appendChild(child1); textarea->appendChild(child2); @@ -49,9 +49,9 @@ const char* body_content = "<p id='p1'>11</p><p id='p2'></p><p id='p3'>33</p>"; SetBodyContent(body_content); - Node* p1 = GetDocument().GetElementById("p1"); - Node* p2 = GetDocument().GetElementById("p2"); - Node* p3 = GetDocument().GetElementById("p3"); + Node* p1 = GetDocument().getElementById("p1"); + Node* p2 = GetDocument().getElementById("p2"); + Node* p3 = GetDocument().getElementById("p3"); Node* body = EditingStrategy::Parent(*p1); Node* t1 = EditingStrategy::FirstChild(*p1); Node* t3 = EditingStrategy::FirstChild(*p3); @@ -88,14 +88,14 @@ SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Node* host = GetDocument().GetElementById("host"); - Node* n1 = GetDocument().GetElementById("one"); - Node* n2 = GetDocument().GetElementById("two"); + Node* host = GetDocument().getElementById("host"); + Node* n1 = GetDocument().getElementById("one"); + Node* n2 = GetDocument().getElementById("two"); Node* t0 = EditingStrategy::FirstChild(*host); Node* t1 = EditingStrategy::FirstChild(*n1); Node* t2 = EditingStrategy::FirstChild(*n2); Node* t3 = EditingStrategy::LastChild(*host); - Node* a = shadow_root->GetElementById("a"); + Node* a = shadow_root->getElementById("a"); EXPECT_EQ(t0, Position::InParentBeforeNode(*n1).NodeAsRangeLastNode()); EXPECT_EQ(t1, Position::InParentBeforeNode(*n2).NodeAsRangeLastNode()); @@ -121,7 +121,7 @@ "id='content'></content><content></content></a>"; SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Element* anchor = shadow_root->GetElementById("a"); + Element* anchor = shadow_root->getElementById("a"); EXPECT_EQ(PositionInFlatTree(anchor, 0), ToPositionInFlatTree(Position(anchor, 0))); @@ -134,7 +134,7 @@ TEST_F(PositionTest, ToPositionInFlatTreeWithInactiveInsertionPoint) { const char* body_content = "<p id='p'><content></content></p>"; SetBodyContent(body_content); - Element* anchor = GetDocument().GetElementById("p"); + Element* anchor = GetDocument().getElementById("p"); EXPECT_EQ(PositionInFlatTree(anchor, 0), ToPositionInFlatTree(Position(anchor, 0))); @@ -145,7 +145,7 @@ // This test comes from "editing/style/block-style-progress-crash.html". TEST_F(PositionTest, ToPositionInFlatTreeWithNotDistributed) { SetBodyContent("<progress id=sample>foo</progress>"); - Element* sample = GetDocument().GetElementById("sample"); + Element* sample = GetDocument().getElementById("sample"); EXPECT_EQ(PositionInFlatTree(sample, PositionAnchorType::kAfterChildren), ToPositionInFlatTree(Position(sample, 0))); @@ -156,7 +156,7 @@ const char* shadow_content = "<a><content select=#one></content></a>"; SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); EXPECT_EQ(PositionInFlatTree(host, 0), ToPositionInFlatTree(Position(shadow_root, 0))); @@ -182,7 +182,7 @@ const char* shadow_content = "<content select=#one></content>"; SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); EXPECT_EQ(PositionInFlatTree(host, 0), ToPositionInFlatTree(Position(shadow_root, 0))); @@ -195,7 +195,7 @@ const char* shadow_content = ""; SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); EXPECT_EQ(PositionInFlatTree(host, PositionAnchorType::kAfterChildren), ToPositionInFlatTree(Position(shadow_root, 0)));
diff --git a/third_party/WebKit/Source/core/editing/SelectionControllerTest.cpp b/third_party/WebKit/Source/core/editing/SelectionControllerTest.cpp index 188f0383..0434f33a 100644 --- a/third_party/WebKit/Source/core/editing/SelectionControllerTest.cpp +++ b/third_party/WebKit/Source/core/editing/SelectionControllerTest.cpp
@@ -56,9 +56,9 @@ SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Node* top = GetDocument().GetElementById("top")->firstChild(); - Node* bottom = shadow_root->GetElementById("bottom")->firstChild(); - Node* host = GetDocument().GetElementById("host"); + Node* top = GetDocument().getElementById("top")->firstChild(); + Node* bottom = shadow_root->getElementById("bottom")->firstChild(); + Node* host = GetDocument().getElementById("host"); // top to bottom SetNonDirectionalSelectionIfNeeded(SelectionInFlatTree::Builder()
diff --git a/third_party/WebKit/Source/core/editing/SelectionTemplateTest.cpp b/third_party/WebKit/Source/core/editing/SelectionTemplateTest.cpp index 2370766..a399cc2 100644 --- a/third_party/WebKit/Source/core/editing/SelectionTemplateTest.cpp +++ b/third_party/WebKit/Source/core/editing/SelectionTemplateTest.cpp
@@ -27,7 +27,7 @@ TEST_F(SelectionTest, caret) { SetBodyContent("<div id='sample'>abcdef</div>"); - Element* sample = GetDocument().GetElementById("sample"); + Element* sample = GetDocument().getElementById("sample"); Position position(Position(sample->firstChild(), 2)); SelectionInDOMTree::Builder builder; builder.Collapse(position); @@ -46,7 +46,7 @@ TEST_F(SelectionTest, range) { SetBodyContent("<div id='sample'>abcdef</div>"); - Element* sample = GetDocument().GetElementById("sample"); + Element* sample = GetDocument().getElementById("sample"); Position base(Position(sample->firstChild(), 2)); Position extent(Position(sample->firstChild(), 4)); SelectionInDOMTree::Builder builder;
diff --git a/third_party/WebKit/Source/core/editing/SurroundingTextTest.cpp b/third_party/WebKit/Source/core/editing/SurroundingTextTest.cpp index 93956b5..acb6dfc 100644 --- a/third_party/WebKit/Source/core/editing/SurroundingTextTest.cpp +++ b/third_party/WebKit/Source/core/editing/SurroundingTextTest.cpp
@@ -39,7 +39,7 @@ } VisibleSelection SurroundingTextTest::Select(int start, int end) { - Element* element = GetDocument().GetElementById("selection"); + Element* element = GetDocument().getElementById("selection"); return CreateVisibleSelection( SelectionInDOMTree::Builder() .Collapse(Position(ToText(element->firstChild()), start))
diff --git a/third_party/WebKit/Source/core/editing/VisibleSelectionTest.cpp b/third_party/WebKit/Source/core/editing/VisibleSelectionTest.cpp index 59470a1e..4b46eb5 100644 --- a/third_party/WebKit/Source/core/editing/VisibleSelectionTest.cpp +++ b/third_party/WebKit/Source/core/editing/VisibleSelectionTest.cpp
@@ -104,11 +104,11 @@ SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Node* one = GetDocument().GetElementById("one")->firstChild(); - Node* two = GetDocument().GetElementById("two")->firstChild(); - Node* three = shadow_root->GetElementById("three")->firstChild(); - Node* four = shadow_root->GetElementById("four")->firstChild(); - Node* five = shadow_root->GetElementById("five")->firstChild(); + Node* one = GetDocument().getElementById("one")->firstChild(); + Node* two = GetDocument().getElementById("two")->firstChild(); + Node* three = shadow_root->getElementById("three")->firstChild(); + Node* four = shadow_root->getElementById("four")->firstChild(); + Node* five = shadow_root->getElementById("five")->firstChild(); VisibleSelection selection; VisibleSelectionInFlatTree selection_in_flat_tree; @@ -519,7 +519,7 @@ TEST_F(VisibleSelectionTest, updateIfNeededWithShadowHost) { SetBodyContent("<div id=host></div><div id=sample>foo</div>"); SetShadowContent("<content>", "host"); - Element* sample = GetDocument().GetElementById("sample"); + Element* sample = GetDocument().getElementById("sample"); // Simulates saving selection in undo stack. VisibleSelection selection = @@ -529,7 +529,7 @@ EXPECT_EQ(Position(sample->firstChild(), 0), selection.Start()); // Simulates modifying DOM tree to invalidate distribution. - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); host->AppendChild(sample); GetDocument().UpdateStyleAndLayout();
diff --git a/third_party/WebKit/Source/core/editing/VisibleUnitsTest.cpp b/third_party/WebKit/Source/core/editing/VisibleUnitsTest.cpp index 52c212e..127fdc98 100644 --- a/third_party/WebKit/Source/core/editing/VisibleUnitsTest.cpp +++ b/third_party/WebKit/Source/core/editing/VisibleUnitsTest.cpp
@@ -86,7 +86,7 @@ "<style>p:first-letter {color:red;}</style><p id=sample>(a)bc</p>"; SetBodyContent(body_content); - Node* sample = GetDocument().GetElementById("sample"); + Node* sample = GetDocument().getElementById("sample"); Node* text = sample->firstChild(); LayoutTextFragment* layout_object0 = @@ -115,7 +115,7 @@ "<style>p:first-letter {color:red;}</style><p id=sample>abc</p>"; SetBodyContent(body_content); - Node* sample = GetDocument().GetElementById("sample"); + Node* sample = GetDocument().getElementById("sample"); Node* first_letter = sample->firstChild(); // Split "abc" into "a" "bc" ToText(first_letter)->splitText(1, ASSERT_NO_EXCEPTION); @@ -137,7 +137,7 @@ "<div></div></div>"; SetBodyContent(body_content); - Node* sample = GetDocument().GetElementById("sample"); + Node* sample = GetDocument().getElementById("sample"); Node* text = sample->firstChild(); LayoutTextFragment* layout_object0 = @@ -157,7 +157,7 @@ const char* body_content = "<p id=one>one</p>"; SetBodyContent(body_content); - Element* one = GetDocument().GetElementById("one"); + Element* one = GetDocument().getElementById("one"); EXPECT_EQ(0, CaretMinOffset(one->firstChild())); } @@ -167,7 +167,7 @@ "<style>#one:first-letter { font-size: 200%; }</style><p id=one>one</p>"; SetBodyContent(body_content); - Element* one = GetDocument().GetElementById("one"); + Element* one = GetDocument().getElementById("one"); EXPECT_EQ(0, CaretMinOffset(one->firstChild())); } @@ -182,8 +182,8 @@ SetBodyContent(body_content); SetShadowContent(shadow_content, "host"); - Element* one = GetDocument().GetElementById("one"); - Element* two = GetDocument().GetElementById("two"); + Element* one = GetDocument().getElementById("one"); + Element* two = GetDocument().getElementById("two"); EXPECT_EQ('2', CharacterAfter( CreateVisiblePositionInDOMTree(*one->firstChild(), 1))); @@ -262,9 +262,9 @@ SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Node* one = GetDocument().GetElementById("one")->firstChild(); - Node* two = GetDocument().GetElementById("two")->firstChild(); - Node* five = shadow_root->GetElementById("five")->firstChild(); + Node* one = GetDocument().getElementById("one")->firstChild(); + Node* two = GetDocument().getElementById("two")->firstChild(); + Node* five = shadow_root->getElementById("five")->firstChild(); EXPECT_EQ(0, CharacterBefore(CreateVisiblePositionInDOMTree(*one, 0))); EXPECT_EQ('2', CharacterBefore(CreateVisiblePositionInFlatTree(*one, 0))); @@ -284,7 +284,7 @@ SetBodyContent( "|<span id=sample style='unicode-bidi: isolate;'>foo<br>bar</span>|"); - Element* sample = GetDocument().GetElementById("sample"); + Element* sample = GetDocument().getElementById("sample"); Node* text = sample->firstChild(); const InlineBoxPosition& actual = @@ -301,8 +301,8 @@ SetBodyContent(body_content); SetShadowContent(shadow_content, "host"); - Element* one = GetDocument().GetElementById("one"); - Element* two = GetDocument().GetElementById("two"); + Element* one = GetDocument().getElementById("one"); + Element* two = GetDocument().getElementById("two"); EXPECT_EQ(Position(two->firstChild(), 2), EndOfDocument(CreateVisiblePositionInDOMTree(*one->firstChild(), 0)) @@ -332,13 +332,13 @@ SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Node* one = GetDocument().GetElementById("one")->firstChild(); - Node* two = GetDocument().GetElementById("two")->firstChild(); - Node* three = GetDocument().GetElementById("three")->firstChild(); - Node* four = GetDocument().GetElementById("four")->firstChild(); - Node* five = shadow_root->GetElementById("five")->firstChild(); - Node* six = shadow_root->GetElementById("six")->firstChild(); - Node* seven = shadow_root->GetElementById("seven")->firstChild(); + Node* one = GetDocument().getElementById("one")->firstChild(); + Node* two = GetDocument().getElementById("two")->firstChild(); + Node* three = GetDocument().getElementById("three")->firstChild(); + Node* four = GetDocument().getElementById("four")->firstChild(); + Node* five = shadow_root->getElementById("five")->firstChild(); + Node* six = shadow_root->getElementById("six")->firstChild(); + Node* seven = shadow_root->getElementById("seven")->firstChild(); EXPECT_EQ( Position(seven, 7), @@ -411,7 +411,7 @@ "<style>div::first-letter { color: red }</style><div " "id=sample>1ab\nde</div>"); - Node* sample = GetDocument().GetElementById("sample"); + Node* sample = GetDocument().getElementById("sample"); Node* text = sample->firstChild(); EXPECT_EQ(Position(text, 6), @@ -442,7 +442,7 @@ "<style>pre::first-letter { color: red }</style><pre " "id=sample>1ab\nde</pre>"); - Node* sample = GetDocument().GetElementById("sample"); + Node* sample = GetDocument().getElementById("sample"); Node* text = sample->firstChild(); EXPECT_EQ(Position(text, 3), @@ -477,9 +477,9 @@ SetBodyContent(body_content); SetShadowContent(shadow_content, "host"); - Element* one = GetDocument().GetElementById("one"); - Element* two = GetDocument().GetElementById("two"); - Element* three = GetDocument().GetElementById("three"); + Element* one = GetDocument().getElementById("one"); + Element* two = GetDocument().getElementById("two"); + Element* three = GetDocument().getElementById("three"); EXPECT_EQ( Position(three->firstChild(), 3), @@ -503,7 +503,7 @@ TEST_F(VisibleUnitsTest, endOfParagraphSimple) { SetBodyContent("<div id=sample>1ab\nde</div>"); - Node* sample = GetDocument().GetElementById("sample"); + Node* sample = GetDocument().getElementById("sample"); Node* text = sample->firstChild(); EXPECT_EQ(Position(text, 6), @@ -532,7 +532,7 @@ TEST_F(VisibleUnitsTest, endOfParagraphSimplePre) { SetBodyContent("<pre id=sample>1ab\nde</pre>"); - Node* sample = GetDocument().GetElementById("sample"); + Node* sample = GetDocument().getElementById("sample"); Node* text = sample->firstChild(); EXPECT_EQ(Position(text, 3), @@ -567,10 +567,10 @@ SetShadowContent(shadow_content, "host"); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Node* one = GetDocument().GetElementById("one")->firstChild(); - Node* two = GetDocument().GetElementById("two")->firstChild(); - Node* three = shadow_root->GetElementById("three")->firstChild(); - Node* four = shadow_root->GetElementById("four")->firstChild(); + Node* one = GetDocument().getElementById("one")->firstChild(); + Node* two = GetDocument().getElementById("two")->firstChild(); + Node* three = shadow_root->getElementById("three")->firstChild(); + Node* four = shadow_root->getElementById("four")->firstChild(); EXPECT_EQ( Position(two, 2), @@ -624,11 +624,11 @@ SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Node* one = GetDocument().GetElementById("one")->firstChild(); - Node* two = GetDocument().GetElementById("two")->firstChild(); - Node* three = GetDocument().GetElementById("three")->firstChild(); - Node* four = shadow_root->GetElementById("four")->firstChild(); - Node* five = shadow_root->GetElementById("five")->firstChild(); + Node* one = GetDocument().getElementById("one")->firstChild(); + Node* two = GetDocument().getElementById("two")->firstChild(); + Node* three = GetDocument().getElementById("three")->firstChild(); + Node* four = shadow_root->getElementById("four")->firstChild(); + Node* five = shadow_root->getElementById("five")->firstChild(); EXPECT_EQ( Position(three, 3), @@ -688,8 +688,8 @@ SetBodyContent(body_content); SetShadowContent(shadow_content, "host"); - Element* one = GetDocument().GetElementById("one"); - Element* two = GetDocument().GetElementById("two"); + Element* one = GetDocument().getElementById("one"); + Element* two = GetDocument().getElementById("two"); EXPECT_FALSE(IsEndOfEditableOrNonEditableContent( CreateVisiblePositionInDOMTree(*one->firstChild(), 1))); @@ -706,7 +706,7 @@ const char* body_content = "<input id=sample value=ab>cde"; SetBodyContent(body_content); - Node* text = ToTextControlElement(GetDocument().GetElementById("sample")) + Node* text = ToTextControlElement(GetDocument().getElementById("sample")) ->InnerEditorElement() ->firstChild(); @@ -737,13 +737,13 @@ SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Node* one = GetDocument().GetElementById("one")->firstChild(); - Node* two = GetDocument().GetElementById("two")->firstChild(); - Node* three = GetDocument().GetElementById("three")->firstChild(); - Node* four = GetDocument().GetElementById("four")->firstChild(); - Node* five = shadow_root->GetElementById("five")->firstChild(); - Node* six = shadow_root->GetElementById("six")->firstChild(); - Node* seven = shadow_root->GetElementById("seven")->firstChild(); + Node* one = GetDocument().getElementById("one")->firstChild(); + Node* two = GetDocument().getElementById("two")->firstChild(); + Node* three = GetDocument().getElementById("three")->firstChild(); + Node* four = GetDocument().getElementById("four")->firstChild(); + Node* five = shadow_root->getElementById("five")->firstChild(); + Node* six = shadow_root->getElementById("six")->firstChild(); + Node* seven = shadow_root->getElementById("seven")->firstChild(); EXPECT_FALSE(IsEndOfLine(CreateVisiblePositionInDOMTree(*one, 0))); EXPECT_FALSE(IsEndOfLine(CreateVisiblePositionInFlatTree(*one, 0))); @@ -781,13 +781,13 @@ SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Node* one = GetDocument().GetElementById("one")->firstChild(); - Node* two = GetDocument().GetElementById("two")->firstChild(); - Node* three = GetDocument().GetElementById("three")->firstChild(); - Node* four = GetDocument().GetElementById("four")->firstChild(); - Node* five = shadow_root->GetElementById("five")->firstChild(); - Node* six = shadow_root->GetElementById("six")->firstChild(); - Node* seven = shadow_root->GetElementById("seven")->firstChild(); + Node* one = GetDocument().getElementById("one")->firstChild(); + Node* two = GetDocument().getElementById("two")->firstChild(); + Node* three = GetDocument().getElementById("three")->firstChild(); + Node* four = GetDocument().getElementById("four")->firstChild(); + Node* five = shadow_root->getElementById("five")->firstChild(); + Node* six = shadow_root->getElementById("six")->firstChild(); + Node* seven = shadow_root->getElementById("seven")->firstChild(); EXPECT_FALSE(IsLogicalEndOfLine(CreateVisiblePositionInDOMTree(*one, 0))); EXPECT_FALSE(IsLogicalEndOfLine(CreateVisiblePositionInFlatTree(*one, 0))); @@ -887,9 +887,9 @@ SetBodyContent(body_content); SetShadowContent(shadow_content, "host"); - Node* one = GetDocument().GetElementById("one")->firstChild(); - Node* two = GetDocument().GetElementById("two")->firstChild(); - Node* three = GetDocument().GetElementById("three")->firstChild(); + Node* one = GetDocument().getElementById("one")->firstChild(); + Node* two = GetDocument().getElementById("two")->firstChild(); + Node* three = GetDocument().getElementById("three")->firstChild(); EXPECT_FALSE(IsEndOfParagraph(CreateVisiblePositionInDOMTree(*one, 0))); EXPECT_FALSE(IsEndOfParagraph(CreateVisiblePositionInFlatTree(*one, 0))); @@ -918,13 +918,13 @@ SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Node* one = GetDocument().GetElementById("one")->firstChild(); - Node* two = GetDocument().GetElementById("two")->firstChild(); - Node* three = GetDocument().GetElementById("three")->firstChild(); - Node* four = GetDocument().GetElementById("four")->firstChild(); - Node* five = shadow_root->GetElementById("five")->firstChild(); - Node* six = shadow_root->GetElementById("six")->firstChild(); - Node* seven = shadow_root->GetElementById("seven")->firstChild(); + Node* one = GetDocument().getElementById("one")->firstChild(); + Node* two = GetDocument().getElementById("two")->firstChild(); + Node* three = GetDocument().getElementById("three")->firstChild(); + Node* four = GetDocument().getElementById("four")->firstChild(); + Node* five = shadow_root->getElementById("five")->firstChild(); + Node* six = shadow_root->getElementById("six")->firstChild(); + Node* seven = shadow_root->getElementById("seven")->firstChild(); EXPECT_TRUE(IsStartOfLine(CreateVisiblePositionInDOMTree(*one, 0))); EXPECT_TRUE(IsStartOfLine(CreateVisiblePositionInFlatTree(*one, 0))); @@ -961,10 +961,10 @@ SetBodyContent(body_content); SetShadowContent(shadow_content, "host"); - Node* zero = GetDocument().GetElementById("zero")->firstChild(); - Node* one = GetDocument().GetElementById("one")->firstChild(); - Node* two = GetDocument().GetElementById("two")->firstChild(); - Node* three = GetDocument().GetElementById("three")->firstChild(); + Node* zero = GetDocument().getElementById("zero")->firstChild(); + Node* one = GetDocument().getElementById("one")->firstChild(); + Node* two = GetDocument().getElementById("two")->firstChild(); + Node* three = GetDocument().getElementById("three")->firstChild(); EXPECT_TRUE(IsStartOfParagraph(CreateVisiblePositionInDOMTree(*zero, 0))); EXPECT_TRUE(IsStartOfParagraph(CreateVisiblePositionInFlatTree(*zero, 0))); @@ -1035,11 +1035,11 @@ SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Element* one = GetDocument().GetElementById("one"); - Element* two = GetDocument().GetElementById("two"); - Element* three = GetDocument().GetElementById("three"); - Element* four = shadow_root->GetElementById("four"); - Element* five = shadow_root->GetElementById("five"); + Element* one = GetDocument().getElementById("one"); + Element* two = GetDocument().getElementById("two"); + Element* three = GetDocument().getElementById("three"); + Element* four = shadow_root->getElementById("four"); + Element* five = shadow_root->getElementById("five"); EXPECT_EQ( Position(two->firstChild(), 1), @@ -1071,7 +1071,7 @@ SetBodyContent(body_content); SetShadowContent(shadow_content, "host"); - Element* one = GetDocument().GetElementById("one"); + Element* one = GetDocument().getElementById("one"); LayoutObject* layout_object_from_dom_tree; LayoutRect layout_rect_from_dom_tree = LocalCaretRectOfPosition( @@ -1098,13 +1098,13 @@ SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Node* one = GetDocument().GetElementById("one")->firstChild(); - Node* two = GetDocument().GetElementById("two")->firstChild(); - Node* three = GetDocument().GetElementById("three")->firstChild(); - Node* four = GetDocument().GetElementById("four")->firstChild(); - Node* five = shadow_root->GetElementById("five")->firstChild(); - Node* six = shadow_root->GetElementById("six")->firstChild(); - Node* seven = shadow_root->GetElementById("seven")->firstChild(); + Node* one = GetDocument().getElementById("one")->firstChild(); + Node* two = GetDocument().getElementById("two")->firstChild(); + Node* three = GetDocument().getElementById("three")->firstChild(); + Node* four = GetDocument().getElementById("four")->firstChild(); + Node* five = shadow_root->getElementById("five")->firstChild(); + Node* six = shadow_root->getElementById("six")->firstChild(); + Node* seven = shadow_root->getElementById("seven")->firstChild(); EXPECT_EQ(Position(seven, 7), LogicalEndOfLine(CreateVisiblePositionInDOMTree(*one, 0)) @@ -1183,13 +1183,13 @@ SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Node* one = GetDocument().GetElementById("one")->firstChild(); - Node* two = GetDocument().GetElementById("two")->firstChild(); - Node* three = GetDocument().GetElementById("three")->firstChild(); - Node* four = GetDocument().GetElementById("four")->firstChild(); - Node* five = shadow_root->GetElementById("five")->firstChild(); - Node* six = shadow_root->GetElementById("six")->firstChild(); - Node* seven = shadow_root->GetElementById("seven")->firstChild(); + Node* one = GetDocument().getElementById("one")->firstChild(); + Node* two = GetDocument().getElementById("two")->firstChild(); + Node* three = GetDocument().getElementById("three")->firstChild(); + Node* four = GetDocument().getElementById("four")->firstChild(); + Node* five = shadow_root->getElementById("five")->firstChild(); + Node* six = shadow_root->getElementById("six")->firstChild(); + Node* seven = shadow_root->getElementById("seven")->firstChild(); EXPECT_EQ(Position(one, 0), LogicalStartOfLine(CreateVisiblePositionInDOMTree(*one, 0)) @@ -1265,7 +1265,7 @@ SetBodyContent(body_content); SetShadowContent(shadow_content, "host"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); EXPECT_EQ(Position::LastPositionInNode(host), MostForwardCaretPosition(Position::AfterNode(host))); @@ -1279,7 +1279,7 @@ "<style>p:first-letter {color:red;}</style><p id=sample> (2)45 </p>"; SetBodyContent(body_content); - Node* sample = GetDocument().GetElementById("sample")->firstChild(); + Node* sample = GetDocument().getElementById("sample")->firstChild(); EXPECT_EQ(Position(sample->parentNode(), 0), MostBackwardCaretPosition(Position(sample, 0))); @@ -1315,7 +1315,7 @@ "<style>p:first-letter {color:red;}</style><p id=sample>abc</p>"; SetBodyContent(body_content); - Node* sample = GetDocument().GetElementById("sample"); + Node* sample = GetDocument().getElementById("sample"); Node* first_letter = sample->firstChild(); // Split "abc" into "a" "bc" Text* remaining = ToText(first_letter)->splitText(1, ASSERT_NO_EXCEPTION); @@ -1345,9 +1345,9 @@ ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); UpdateAllLifecyclePhases(); - Element* host = GetDocument().GetElementById("host"); - Element* one = GetDocument().GetElementById("one"); - Element* three = shadow_root->GetElementById("three"); + Element* host = GetDocument().getElementById("host"); + Element* one = GetDocument().getElementById("one"); + Element* three = shadow_root->getElementById("three"); EXPECT_EQ(Position(one->firstChild(), 1), MostBackwardCaretPosition(Position::AfterNode(host))); @@ -1361,7 +1361,7 @@ "<style>p:first-letter {color:red;}</style><p id=sample> (2)45 </p>"; SetBodyContent(body_content); - Node* sample = GetDocument().GetElementById("sample")->firstChild(); + Node* sample = GetDocument().getElementById("sample")->firstChild(); EXPECT_EQ(Position(GetDocument().body(), 0), MostForwardCaretPosition( @@ -1392,12 +1392,12 @@ SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Element* zero = GetDocument().GetElementById("zero"); - Element* one = GetDocument().GetElementById("one"); - Element* two = GetDocument().GetElementById("two"); - Element* three = GetDocument().GetElementById("three"); - Element* four = shadow_root->GetElementById("four"); - Element* five = shadow_root->GetElementById("five"); + Element* zero = GetDocument().getElementById("zero"); + Element* one = GetDocument().getElementById("one"); + Element* two = GetDocument().getElementById("two"); + Element* three = GetDocument().getElementById("three"); + Element* four = shadow_root->getElementById("four"); + Element* five = shadow_root->getElementById("five"); EXPECT_EQ(Position(one->firstChild(), 0), NextPositionOf(CreateVisiblePosition(Position(zero, 1))) @@ -1438,12 +1438,12 @@ SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Node* zero = GetDocument().GetElementById("zero")->firstChild(); - Node* one = GetDocument().GetElementById("one")->firstChild(); - Node* two = GetDocument().GetElementById("two")->firstChild(); - Node* three = GetDocument().GetElementById("three")->firstChild(); - Node* four = shadow_root->GetElementById("four")->firstChild(); - Node* five = shadow_root->GetElementById("five")->firstChild(); + Node* zero = GetDocument().getElementById("zero")->firstChild(); + Node* one = GetDocument().getElementById("one")->firstChild(); + Node* two = GetDocument().getElementById("two")->firstChild(); + Node* three = GetDocument().getElementById("three")->firstChild(); + Node* four = shadow_root->getElementById("four")->firstChild(); + Node* five = shadow_root->getElementById("five")->firstChild(); EXPECT_EQ(Position(zero, 0), PreviousPositionOf(CreateVisiblePosition(Position(zero, 1))) @@ -1511,7 +1511,7 @@ "<div id=sample style='font-size: 500px'>A煊逸</div>"; SetBodyContent(body_content); - Node* sample = GetDocument().GetElementById("sample")->firstChild(); + Node* sample = GetDocument().getElementById("sample")->firstChild(); // In case of each line has one character, VisiblePosition are: // [C,Dn] [C,Up] [B, Dn] [B, Up] @@ -1534,7 +1534,7 @@ " " // This whitespace causes no previous position. "<div id='anchor'> bar</div>" "</span>"); - const Position position(GetDocument().GetElementById("anchor")->firstChild(), + const Position position(GetDocument().getElementById("anchor")->firstChild(), 1); EXPECT_EQ( Position(), @@ -1544,7 +1544,7 @@ TEST_F(VisibleUnitsTest, rendersInDifferentPositionAfterAnchor) { const char* body_content = "<p id='sample'>00</p>"; SetBodyContent(body_content); - Element* sample = GetDocument().GetElementById("sample"); + Element* sample = GetDocument().getElementById("sample"); EXPECT_FALSE(RendersInDifferentPosition(Position(), Position())); EXPECT_FALSE( @@ -1561,8 +1561,8 @@ "<p><span id=one>11</span><span id=two style='display:none'> " "</span></p>"; SetBodyContent(body_content); - Element* one = GetDocument().GetElementById("one"); - Element* two = GetDocument().GetElementById("two"); + Element* one = GetDocument().getElementById("one"); + Element* two = GetDocument().getElementById("two"); EXPECT_TRUE(RendersInDifferentPosition(Position::LastPositionInNode(one), Position(two, 0))) @@ -1574,8 +1574,8 @@ const char* body_content = "<p><span id=one>11</span><span id=two> </span></p>"; SetBodyContent(body_content); - Element* one = GetDocument().GetElementById("one"); - Element* two = GetDocument().GetElementById("two"); + Element* one = GetDocument().getElementById("one"); + Element* two = GetDocument().getElementById("two"); EXPECT_FALSE(RendersInDifferentPosition(Position::LastPositionInNode(one), Position(two, 0))); @@ -1589,8 +1589,8 @@ "<div contenteditable><span id='sample1'>1</span><span " "id='sample2'>22</span></div>"; SetBodyContent(body_content); - Element* sample1 = GetDocument().GetElementById("sample1"); - Element* sample2 = GetDocument().GetElementById("sample2"); + Element* sample1 = GetDocument().getElementById("sample1"); + Element* sample2 = GetDocument().getElementById("sample2"); EXPECT_FALSE( RendersInDifferentPosition(Position::AfterNode(sample1->firstChild()), @@ -1610,11 +1610,11 @@ SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Node* one = GetDocument().GetElementById("one")->firstChild(); - Node* two = GetDocument().GetElementById("two")->firstChild(); - Node* three = GetDocument().GetElementById("three")->firstChild(); - Node* four = shadow_root->GetElementById("four")->firstChild(); - Node* five = shadow_root->GetElementById("five")->firstChild(); + Node* one = GetDocument().getElementById("one")->firstChild(); + Node* two = GetDocument().getElementById("two")->firstChild(); + Node* three = GetDocument().getElementById("three")->firstChild(); + Node* four = shadow_root->getElementById("four")->firstChild(); + Node* five = shadow_root->getElementById("five")->firstChild(); EXPECT_EQ(Position(), RightPositionOf(CreateVisiblePosition(Position(one, 1))) .DeepEquivalent()); @@ -1652,8 +1652,8 @@ SetBodyContent(body_content); SetShadowContent(shadow_content, "host"); - Node* one = GetDocument().GetElementById("one")->firstChild(); - Node* two = GetDocument().GetElementById("two")->firstChild(); + Node* one = GetDocument().getElementById("one")->firstChild(); + Node* two = GetDocument().getElementById("two")->firstChild(); EXPECT_EQ(Position(one, 0), StartOfDocument(CreateVisiblePositionInDOMTree(*one, 0)) @@ -1681,13 +1681,13 @@ SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Node* one = GetDocument().GetElementById("one")->firstChild(); - Node* two = GetDocument().GetElementById("two")->firstChild(); - Node* three = GetDocument().GetElementById("three")->firstChild(); - Node* four = GetDocument().GetElementById("four")->firstChild(); - Node* five = shadow_root->GetElementById("five")->firstChild(); - Node* six = shadow_root->GetElementById("six")->firstChild(); - Node* seven = shadow_root->GetElementById("seven")->firstChild(); + Node* one = GetDocument().getElementById("one")->firstChild(); + Node* two = GetDocument().getElementById("two")->firstChild(); + Node* three = GetDocument().getElementById("three")->firstChild(); + Node* four = GetDocument().getElementById("four")->firstChild(); + Node* five = shadow_root->getElementById("five")->firstChild(); + Node* six = shadow_root->getElementById("six")->firstChild(); + Node* seven = shadow_root->getElementById("seven")->firstChild(); EXPECT_EQ( Position(one, 0), @@ -1765,10 +1765,10 @@ SetBodyContent(body_content); SetShadowContent(shadow_content, "host"); - Node* zero = GetDocument().GetElementById("zero")->firstChild(); - Node* one = GetDocument().GetElementById("one")->firstChild(); - Node* two = GetDocument().GetElementById("two")->firstChild(); - Node* three = GetDocument().GetElementById("three")->firstChild(); + Node* zero = GetDocument().getElementById("zero")->firstChild(); + Node* one = GetDocument().getElementById("one")->firstChild(); + Node* two = GetDocument().getElementById("two")->firstChild(); + Node* three = GetDocument().getElementById("three")->firstChild(); EXPECT_EQ(Position(zero, 0), StartOfParagraph(CreateVisiblePositionInDOMTree(*one, 1)) @@ -1822,10 +1822,10 @@ SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Node* one = GetDocument().GetElementById("one")->firstChild(); - Node* two = GetDocument().GetElementById("two")->firstChild(); - Node* three = shadow_root->GetElementById("three")->firstChild(); - Node* four = shadow_root->GetElementById("four")->firstChild(); + Node* one = GetDocument().getElementById("one")->firstChild(); + Node* two = GetDocument().getElementById("two")->firstChild(); + Node* three = shadow_root->getElementById("three")->firstChild(); + Node* four = shadow_root->getElementById("four")->firstChild(); EXPECT_EQ(Position(one, 0), StartOfSentence(CreateVisiblePositionInDOMTree(*one, 0)) @@ -1879,12 +1879,12 @@ SetBodyContent(body_content); ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host"); - Node* one = GetDocument().GetElementById("one")->firstChild(); - Node* two = GetDocument().GetElementById("two")->firstChild(); - Node* three = GetDocument().GetElementById("three")->firstChild(); - Node* four = shadow_root->GetElementById("four")->firstChild(); - Node* five = shadow_root->GetElementById("five")->firstChild(); - Node* space = shadow_root->GetElementById("space")->firstChild(); + Node* one = GetDocument().getElementById("one")->firstChild(); + Node* two = GetDocument().getElementById("two")->firstChild(); + Node* three = GetDocument().getElementById("three")->firstChild(); + Node* four = shadow_root->getElementById("four")->firstChild(); + Node* five = shadow_root->getElementById("five")->firstChild(); + Node* space = shadow_root->getElementById("space")->firstChild(); EXPECT_EQ( Position(one, 0),
diff --git a/third_party/WebKit/Source/core/editing/commands/ApplyBlockElementCommandTest.cpp b/third_party/WebKit/Source/core/editing/commands/ApplyBlockElementCommandTest.cpp index 16eecb4..188a6f1 100644 --- a/third_party/WebKit/Source/core/editing/commands/ApplyBlockElementCommandTest.cpp +++ b/third_party/WebKit/Source/core/editing/commands/ApplyBlockElementCommandTest.cpp
@@ -41,7 +41,7 @@ SelectionInDOMTree::Builder() .SetBaseAndExtent( Position(GetDocument().documentElement(), 1), - Position(GetDocument().GetElementById("va")->firstChild(), 2)) + Position(GetDocument().getElementById("va")->firstChild(), 2)) .Build()); FormatBlockCommand* command =
diff --git a/third_party/WebKit/Source/core/editing/commands/InsertIncrementalTextCommandTest.cpp b/third_party/WebKit/Source/core/editing/commands/InsertIncrementalTextCommandTest.cpp index a8fcd7f..3b659fbf 100644 --- a/third_party/WebKit/Source/core/editing/commands/InsertIncrementalTextCommandTest.cpp +++ b/third_party/WebKit/Source/core/editing/commands/InsertIncrementalTextCommandTest.cpp
@@ -14,7 +14,7 @@ // http://crbug.com/706166 TEST_F(InsertIncrementalTextCommandTest, SurrogatePairsReplace) { SetBodyContent("<div id=sample contenteditable><a>a</a>b😺</div>"); - Element* const sample = GetDocument().GetElementById("sample"); + Element* const sample = GetDocument().getElementById("sample"); const String new_text(Vector<UChar>{0xD83D, 0xDE38}); // U+1F638 Selection().SetSelection(SelectionInDOMTree::Builder() .Collapse(Position(sample->lastChild(), 1)) @@ -31,7 +31,7 @@ TEST_F(InsertIncrementalTextCommandTest, SurrogatePairsNoReplace) { SetBodyContent("<div id=sample contenteditable><a>a</a>b😺</div>"); - Element* const sample = GetDocument().GetElementById("sample"); + Element* const sample = GetDocument().getElementById("sample"); const String new_text(Vector<UChar>{0xD83D, 0xDE3A}); // U+1F63A Selection().SetSelection(SelectionInDOMTree::Builder() .Collapse(Position(sample->lastChild(), 1)) @@ -50,7 +50,7 @@ TEST_F(InsertIncrementalTextCommandTest, SurrogatePairsTwo) { SetBodyContent( "<div id=sample contenteditable><a>a</a>b😺😺</div>"); - Element* const sample = GetDocument().GetElementById("sample"); + Element* const sample = GetDocument().getElementById("sample"); const String new_text(Vector<UChar>{0xD83D, 0xDE38}); // U+1F638 Selection().SetSelection(SelectionInDOMTree::Builder() .Collapse(Position(sample->lastChild(), 1))
diff --git a/third_party/WebKit/Source/core/editing/commands/UndoStack.cpp b/third_party/WebKit/Source/core/editing/commands/UndoStack.cpp index e12ca287..8683a884 100644 --- a/third_party/WebKit/Source/core/editing/commands/UndoStack.cpp +++ b/third_party/WebKit/Source/core/editing/commands/UndoStack.cpp
@@ -50,7 +50,7 @@ if (undo_stack_.size() == kMaximumUndoStackDepth) undo_stack_.pop_front(); // drop oldest item off the far end if (!in_redo_) - redo_stack_.Clear(); + redo_stack_.clear(); undo_stack_.push_back(step); } @@ -90,8 +90,8 @@ } void UndoStack::Clear() { - undo_stack_.Clear(); - redo_stack_.Clear(); + undo_stack_.clear(); + redo_stack_.clear(); } DEFINE_TRACE(UndoStack) {
diff --git a/third_party/WebKit/Source/core/editing/iterators/CharacterIteratorTest.cpp b/third_party/WebKit/Source/core/editing/iterators/CharacterIteratorTest.cpp index 88fe1f2..d626e96 100644 --- a/third_party/WebKit/Source/core/editing/iterators/CharacterIteratorTest.cpp +++ b/third_party/WebKit/Source/core/editing/iterators/CharacterIteratorTest.cpp
@@ -43,7 +43,7 @@ SetBodyContent(body_content); GetDocument().View()->UpdateAllLifecyclePhases(); - Node* div_node = GetDocument().GetElementById("div"); + Node* div_node = GetDocument().getElementById("div"); Range* entire_range = Range::Create(GetDocument(), div_node, 0, div_node, 3); EphemeralRange result = @@ -59,7 +59,7 @@ SetBodyContent(body_content); GetDocument().View()->UpdateAllLifecyclePhases(); - Node* text_node = GetDocument().GetElementById("div")->lastChild(); + Node* text_node = GetDocument().getElementById("div")->lastChild(); Range* entire_range = Range::Create(GetDocument(), text_node, 1, text_node, 4); EXPECT_EQ(1u, entire_range->startOffset());
diff --git a/third_party/WebKit/Source/core/editing/iterators/SimplifiedBackwardsTextIteratorTest.cpp b/third_party/WebKit/Source/core/editing/iterators/SimplifiedBackwardsTextIteratorTest.cpp index 9edb8e2c..da50db90 100644 --- a/third_party/WebKit/Source/core/editing/iterators/SimplifiedBackwardsTextIteratorTest.cpp +++ b/third_party/WebKit/Source/core/editing/iterators/SimplifiedBackwardsTextIteratorTest.cpp
@@ -35,7 +35,7 @@ SetBodyContent(body_content); SetShadowContent(shadow_content, "host"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); // We should not apply DOM tree version to containing shadow tree in // general. To record current behavior, we have this test. even if it @@ -54,7 +54,7 @@ SetBodyContent(body_content); SetShadowContent(shadow_content, "host"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); EphemeralRangeTemplate<EditingStrategy> range1( EphemeralRangeTemplate<EditingStrategy>::RangeOfContents(*host)); @@ -111,7 +111,7 @@ SetBodyContent(body_content); SetShadowContent(shadow_content, "host"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); const char* message = "|backIter%d| should have emitted '%s' in reverse order.";
diff --git a/third_party/WebKit/Source/core/editing/iterators/TextIteratorTest.cpp b/third_party/WebKit/Source/core/editing/iterators/TextIteratorTest.cpp index 87f2a5b..8938d19 100644 --- a/third_party/WebKit/Source/core/editing/iterators/TextIteratorTest.cpp +++ b/third_party/WebKit/Source/core/editing/iterators/TextIteratorTest.cpp
@@ -326,7 +326,7 @@ SetBodyContent(body_content); ShadowRoot* shadow_root = CreateShadowRootForElementWithIDAndSetInnerHTML( GetDocument(), "host", shadow_content); - Node* outer_div = GetDocument().GetElementById("outer"); + Node* outer_div = GetDocument().getElementById("outer"); Node* span_in_shadow = shadow_root->firstChild(); Position start(span_in_shadow, PositionAnchorType::kBeforeChildren); Position end(outer_div, PositionAnchorType::kAfterChildren); @@ -351,7 +351,7 @@ SetBodyContent(body_content); ShadowRoot* shadow_root = CreateShadowRootForElementWithIDAndSetInnerHTML( GetDocument(), "host", shadow_content); - Node* outer_div = GetDocument().GetElementById("outer"); + Node* outer_div = GetDocument().getElementById("outer"); Node* span_in_shadow = shadow_root->firstChild(); Position start(outer_div, PositionAnchorType::kBeforeChildren); Position end(span_in_shadow, PositionAnchorType::kAfterChildren); @@ -452,7 +452,7 @@ SetBodyContent(body_content); GetDocument().View()->UpdateAllLifecyclePhases(); - Node* div_node = GetDocument().GetElementById("div"); + Node* div_node = GetDocument().getElementById("div"); Range* range = Range::Create(GetDocument(), div_node, 0, div_node, 3); EXPECT_EQ(3, TextIterator::RangeLength(range->StartPosition(), @@ -479,7 +479,7 @@ SetBodyContent(body_content); SetShadowContent(shadow_content, "host"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); const char* message = "|iter%d| should have emitted '%s'."; EphemeralRangeTemplate<EditingStrategy> range1( @@ -549,7 +549,7 @@ SetBodyContent(body_content); SetShadowContent(shadow_content, "host"); - Element* host = GetDocument().GetElementById("host"); + Element* host = GetDocument().getElementById("host"); EphemeralRangeTemplate<EditingStrategy> range1( EphemeralRangeTemplate<EditingStrategy>::RangeOfContents(*host)); @@ -640,8 +640,8 @@ SetShadowContent(shadow_content, "host"); ShadowRoot* shadow_root = - GetDocument().GetElementById("host")->openShadowRoot(); - Node* b_in_shadow_tree = shadow_root->GetElementById("end"); + GetDocument().getElementById("host")->openShadowRoot(); + Node* b_in_shadow_tree = shadow_root->getElementById("end"); Position start(&GetDocument(), 0); Position end(b_in_shadow_tree, 0); @@ -672,7 +672,7 @@ SetBodyContent( "<div style='width: 2em;'><b><i id='foo'>foo </i></b> bar</div>"); Element* div = GetDocument().QuerySelector("div"); - Position start(GetDocument().GetElementById("foo")->firstChild(), 0); + Position start(GetDocument().getElementById("foo")->firstChild(), 0); Position end(div->lastChild(), 4); EXPECT_EQ("foo bar", PlainText(EphemeralRange(start, end), EmitsImageAltTextBehavior()));
diff --git a/third_party/WebKit/Source/core/editing/serializers/StyledMarkupSerializerTest.cpp b/third_party/WebKit/Source/core/editing/serializers/StyledMarkupSerializerTest.cpp index 6873e5e..3531094 100644 --- a/third_party/WebKit/Source/core/editing/serializers/StyledMarkupSerializerTest.cpp +++ b/third_party/WebKit/Source/core/editing/serializers/StyledMarkupSerializerTest.cpp
@@ -223,7 +223,7 @@ "<p id='host' style='color: red'><span style='font-weight: bold;'><span " "id='one'>11</span></span></p>\n"; SetBodyContent(body_content); - Element* one = GetDocument().GetElementById("one"); + Element* one = GetDocument().getElementById("one"); Text* text = ToText(one->firstChild()); Position start_dom(text, 0); Position end_dom(text, 2); @@ -236,7 +236,7 @@ "<span style='font-weight: bold'><content select=#one></content></span>"; SetBodyContent(body_content); SetShadowContent(shadow_content, "host"); - one = GetDocument().GetElementById("one"); + one = GetDocument().getElementById("one"); text = ToText(one->firstChild()); PositionInFlatTree start_ict(text, 0); PositionInFlatTree end_ict(text, 2); @@ -251,8 +251,8 @@ "<p id='host1'>[<span id='one'>11</span>]</p><p id='host2'>[<span " "id='two'>22</span>]</p>"; SetBodyContent(body_content); - Element* one = GetDocument().GetElementById("one"); - Element* two = GetDocument().GetElementById("two"); + Element* one = GetDocument().getElementById("one"); + Element* two = GetDocument().getElementById("two"); Position start_dom(ToText(one->firstChild()), 0); Position end_dom(ToText(two->firstChild()), 2); const std::string& serialized_dom = SerializePart<EditingStrategy>( @@ -266,8 +266,8 @@ SetBodyContent(body_content); SetShadowContent(shadow_content1, "host1"); SetShadowContent(shadow_content2, "host2"); - one = GetDocument().GetElementById("one"); - two = GetDocument().GetElementById("two"); + one = GetDocument().getElementById("one"); + two = GetDocument().getElementById("two"); PositionInFlatTree start_ict(ToText(one->firstChild()), 0); PositionInFlatTree end_ict(ToText(two->firstChild()), 2); const std::string& serialized_ict = SerializePart<EditingInFlatTreeStrategy>( @@ -281,8 +281,8 @@ "<span id='span1' style='display: none'>11</span><span id='span2' " "style='display: none'>22</span>"; SetBodyContent(body_content); - Element* span1 = GetDocument().GetElementById("span1"); - Element* span2 = GetDocument().GetElementById("span2"); + Element* span1 = GetDocument().getElementById("span1"); + Element* span2 = GetDocument().getElementById("span2"); Position start_dom = Position::FirstPositionInNode(span1); Position end_dom = Position::LastPositionInNode(span2); EXPECT_EQ("", SerializePart<EditingStrategy>(start_dom, end_dom));
diff --git a/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.cpp b/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.cpp index 05c83354..e6f33b17 100644 --- a/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.cpp +++ b/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.cpp
@@ -183,7 +183,7 @@ // Rather than somehow wait for this async queue to drain before running // the leak detector, they're all cancelled to prevent flaky leaks being // reported. - request_queue_.Clear(); + request_queue_.clear(); // WebSpellCheckClient stores a set of WebTextCheckingCompletion objects, // which may store references to already invoked requests. We should clear // these references to prevent them from being a leak source. @@ -237,7 +237,7 @@ DCHECK(processing_request_); DCHECK_EQ(processing_request_->Data().Sequence(), sequence); if (processing_request_->Data().Sequence() != sequence) { - request_queue_.Clear(); + request_queue_.clear(); return; }
diff --git a/third_party/WebKit/Source/core/events/DOMWindowEventQueue.cpp b/third_party/WebKit/Source/core/events/DOMWindowEventQueue.cpp index 3c4f5a85..480d618b 100644 --- a/third_party/WebKit/Source/core/events/DOMWindowEventQueue.cpp +++ b/third_party/WebKit/Source/core/events/DOMWindowEventQueue.cpp
@@ -99,7 +99,7 @@ } bool DOMWindowEventQueue::CancelEvent(Event* event) { - HeapListHashSet<Member<Event>, 16>::iterator it = queued_events_.Find(event); + HeapListHashSet<Member<Event>, 16>::iterator it = queued_events_.find(event); bool found = it != queued_events_.end(); if (found) { probe::AsyncTaskCanceled(event->target()->GetExecutionContext(), event);
diff --git a/third_party/WebKit/Source/core/events/EventSender.h b/third_party/WebKit/Source/core/events/EventSender.h index a26ae98..74ce9fb 100644 --- a/third_party/WebKit/Source/core/events/EventSender.h +++ b/third_party/WebKit/Source/core/events/EventSender.h
@@ -105,7 +105,7 @@ timer_.Stop(); - dispatching_list_.Swap(dispatch_soon_list_); + dispatching_list_.swap(dispatch_soon_list_); for (auto& sender_in_list : dispatching_list_) { if (T* sender = sender_in_list) { sender_in_list = nullptr;
diff --git a/third_party/WebKit/Source/core/events/GenericEventQueue.cpp b/third_party/WebKit/Source/core/events/GenericEventQueue.cpp index 1e46007..bb76645 100644 --- a/third_party/WebKit/Source/core/events/GenericEventQueue.cpp +++ b/third_party/WebKit/Source/core/events/GenericEventQueue.cpp
@@ -91,7 +91,7 @@ DCHECK(!pending_events_.IsEmpty()); HeapVector<Member<Event>> pending_events; - pending_events_.Swap(pending_events); + pending_events_.swap(pending_events); for (const auto& pending_event : pending_events) { Event* event = pending_event.Get();
diff --git a/third_party/WebKit/Source/core/events/ScopedEventQueue.cpp b/third_party/WebKit/Source/core/events/ScopedEventQueue.cpp index 59d10c2..64f9cf3 100644 --- a/third_party/WebKit/Source/core/events/ScopedEventQueue.cpp +++ b/third_party/WebKit/Source/core/events/ScopedEventQueue.cpp
@@ -65,7 +65,7 @@ void ScopedEventQueue::DispatchAllEvents() { HeapVector<Member<EventDispatchMediator>> queued_event_dispatch_mediators; - queued_event_dispatch_mediators.Swap(queued_event_dispatch_mediators_); + queued_event_dispatch_mediators.swap(queued_event_dispatch_mediators_); for (auto& mediator : queued_event_dispatch_mediators) DispatchEvent(mediator.Release());
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp index e8e0eaa..0bdecfb8 100644 --- a/third_party/WebKit/Source/core/frame/FrameView.cpp +++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -168,8 +168,10 @@ static bool g_initial_track_all_paint_invalidations = false; -FrameView::FrameView(LocalFrame& frame) +FrameView::FrameView(LocalFrame& frame, IntRect frame_rect) : frame_(frame), + frame_rect_(frame_rect), + parent_(nullptr), display_mode_(kWebDisplayModeBrowser), can_have_scrollbars_(true), has_pending_layout_(false), @@ -216,14 +218,13 @@ } FrameView* FrameView::Create(LocalFrame& frame) { - FrameView* view = new FrameView(frame); + FrameView* view = new FrameView(frame, IntRect()); view->Show(); return view; } FrameView* FrameView::Create(LocalFrame& frame, const IntSize& initial_size) { - FrameView* view = new FrameView(frame); - view->FrameViewBase::SetFrameRect(IntRect(view->Location(), initial_size)); + FrameView* view = new FrameView(frame, IntRect(IntPoint(), initial_size)); view->SetLayoutSizeInternal(initial_size); view->Show(); @@ -236,6 +237,7 @@ DEFINE_TRACE(FrameView) { visitor->Trace(frame_); + visitor->Trace(parent_); visitor->Trace(fragment_anchor_); visitor->Trace(scrollable_areas_); visitor->Trace(animating_scrollable_areas_); @@ -544,16 +546,15 @@ layout_item.InvalidatePaintRectangle(LayoutRect(paint_invalidation_rect)); } -void FrameView::SetFrameRect(const IntRect& new_rect) { - IntRect old_rect = FrameRect(); - if (new_rect == old_rect) +void FrameView::SetFrameRect(const IntRect& frame_rect) { + if (frame_rect == frame_rect_) return; - FrameViewBase::SetFrameRect(new_rect); + const bool width_changed = frame_rect_.Width() != frame_rect.Width(); + const bool height_changed = frame_rect_.Height() != frame_rect.Height(); + frame_rect_ = frame_rect; - const bool frame_size_changed = old_rect.Size() != new_rect.Size(); - - needs_scrollbars_update_ = frame_size_changed; + needs_scrollbars_update_ = width_changed || height_changed; // TODO(wjmaclean): find out why scrollbars fail to resize for complex // subframes after changing the zoom level. For now always calling // updateScrollbarsIfNeeded() here fixes the issue, but it would be good to @@ -574,9 +575,8 @@ if (auto layout_view_item = this->GetLayoutViewItem()) layout_view_item.SetMayNeedPaintInvalidation(); - if (frame_size_changed) { - ViewportSizeChanged(new_rect.Width() != old_rect.Width(), - new_rect.Height() != old_rect.Height()); + if (width_changed || height_changed) { + ViewportSizeChanged(width_changed, height_changed); if (frame_->IsMainFrame()) frame_->GetPage()->GetVisualViewport().MainFrameDidChangeSize(); @@ -3656,7 +3656,7 @@ IntRect FrameView::ConvertToContainingFrameViewBase( const IntRect& local_rect) const { - if (const FrameView* parent = ToFrameView(Parent())) { + if (parent_) { // Get our layoutObject in the parent view LayoutPartItem layout_item = frame_->OwnerLayoutItem(); if (layout_item.IsNull()) @@ -3666,7 +3666,7 @@ // Add borders and padding?? rect.Move((layout_item.BorderLeft() + layout_item.PaddingLeft()).ToInt(), (layout_item.BorderTop() + layout_item.PaddingTop()).ToInt()); - return parent->ConvertFromLayoutItem(layout_item, rect); + return parent_->ConvertFromLayoutItem(layout_item, rect); } return local_rect; @@ -3674,10 +3674,10 @@ IntRect FrameView::ConvertFromContainingFrameViewBase( const IntRect& parent_rect) const { - if (const FrameView* parent = ToFrameView(Parent())) { + if (parent_) { IntRect local_rect = parent_rect; local_rect.SetLocation( - parent->ConvertSelfToChild(this, local_rect.Location())); + parent_->ConvertSelfToChild(this, local_rect.Location())); return local_rect; } @@ -3686,7 +3686,7 @@ IntPoint FrameView::ConvertToContainingFrameViewBase( const IntPoint& local_point) const { - if (const FrameView* parent = ToFrameView(Parent())) { + if (parent_) { // Get our layoutObject in the parent view LayoutPartItem layout_item = frame_->OwnerLayoutItem(); if (layout_item.IsNull()) @@ -3697,7 +3697,7 @@ // Add borders and padding point.Move((layout_item.BorderLeft() + layout_item.PaddingLeft()).ToInt(), (layout_item.BorderTop() + layout_item.PaddingTop()).ToInt()); - return parent->ConvertFromLayoutItem(layout_item, point); + return parent_->ConvertFromLayoutItem(layout_item, point); } return local_point; @@ -3705,13 +3705,13 @@ IntPoint FrameView::ConvertFromContainingFrameViewBase( const IntPoint& parent_point) const { - if (const FrameView* parent = ToFrameView(Parent())) { + if (parent_) { // Get our layoutObject in the parent view LayoutPartItem layout_item = frame_->OwnerLayoutItem(); if (layout_item.IsNull()) return parent_point; - IntPoint point = parent->ConvertToLayoutItem(layout_item, parent_point); + IntPoint point = parent_->ConvertToLayoutItem(layout_item, parent_point); // Subtract borders and padding point.Move((-layout_item.BorderLeft() - layout_item.PaddingLeft()).ToInt(), (-layout_item.BorderTop() - layout_item.PaddingTop()).ToInt()); @@ -3841,11 +3841,24 @@ animating_scrollable_areas_->erase(scrollable_area); } -void FrameView::SetParent(FrameViewBase* parent) { - if (parent == Parent()) +FrameView* FrameView::Root() const { + const FrameView* top = this; + while (top->Parent()) + top = ToFrameView(top->Parent()); + return const_cast<FrameView*>(top); +} + +void FrameView::SetParent(FrameViewBase* parent_frame_view_base) { + FrameView* parent = ToFrameView(parent_frame_view_base); + if (parent == parent_) return; - FrameViewBase::SetParent(parent); + DCHECK(!parent || !parent_); + if (!parent || !parent->IsVisible()) + SetParentVisible(false); + parent_ = parent; + if (parent && parent->IsVisible()) + SetParentVisible(true); UpdateParentScrollableAreaSet(); SetupRenderThrottling(); @@ -3981,7 +3994,6 @@ void FrameView::AddChild(FrameViewBase* child) { DCHECK(child != this && !child->Parent()); - DCHECK(!child->IsPluginView()); child->SetParent(this); children_.insert(child); } @@ -4735,17 +4747,17 @@ } IntRect FrameView::ConvertToRootFrame(const IntRect& local_rect) const { - if (const FrameView* parent = ToFrameView(Parent())) { + if (parent_) { IntRect parent_rect = ConvertToContainingFrameViewBase(local_rect); - return parent->ConvertToRootFrame(parent_rect); + return parent_->ConvertToRootFrame(parent_rect); } return local_rect; } IntPoint FrameView::ConvertToRootFrame(const IntPoint& local_point) const { - if (const FrameView* parent = ToFrameView(Parent())) { + if (parent_) { IntPoint parent_point = ConvertToContainingFrameViewBase(local_point); - return parent->ConvertToRootFrame(parent_point); + return parent_->ConvertToRootFrame(parent_point); } return local_point; } @@ -4774,7 +4786,7 @@ // and potentially child frame views. SetNeedsCompositingUpdate(GetLayoutViewItem(), kCompositingUpdateRebuildTree); - FrameViewBase::SetParentVisible(visible); + parent_visible_ = visible; if (!IsSelfVisible()) return;
diff --git a/third_party/WebKit/Source/core/frame/FrameView.h b/third_party/WebKit/Source/core/frame/FrameView.h index 061869d..8336242 100644 --- a/third_party/WebKit/Source/core/frame/FrameView.h +++ b/third_party/WebKit/Source/core/frame/FrameView.h
@@ -102,7 +102,8 @@ typedef unsigned long long DOMTimeStamp; class CORE_EXPORT FrameView final - : public FrameViewBase, + : public GarbageCollectedFinalized<FrameView>, + public FrameViewBase, public FrameOrPlugin, public PaintInvalidationCapableScrollableArea { USING_GARBAGE_COLLECTED_MIXIN(FrameView); @@ -120,9 +121,17 @@ void Invalidate() { InvalidateRect(IntRect(0, 0, Width(), Height())); } void InvalidateRect(const IntRect&); void SetFrameRect(const IntRect&) override; - const IntRect& FrameRect() const override { - return FrameViewBase::FrameRect(); + const IntRect& FrameRect() const override { return frame_rect_; } + int X() const { return frame_rect_.X(); } + int Y() const { return frame_rect_.Y(); } + int Width() const { return frame_rect_.Width(); } + int Height() const { return frame_rect_.Height(); } + IntSize Size() const { return frame_rect_.Size(); } + IntPoint Location() const override { return frame_rect_.Location(); } + void Resize(int width, int height) { + SetFrameRect(IntRect(frame_rect_.X(), frame_rect_.Y(), width, height)); } + void Resize(const IntSize& size) { SetFrameRect(IntRect(Location(), size)); } LocalFrame& GetFrame() const { ASSERT(frame_); @@ -474,7 +483,20 @@ typedef HeapHashSet<Member<Scrollbar>> ScrollbarsSet; // Functions for child manipulation and inspection. + bool IsSelfVisible() const { + return self_visible_; + } // Whether or not we have been explicitly marked as visible or not. + bool IsParentVisible() const { + return parent_visible_; + } // Whether or not our parent is visible. + bool IsVisible() const { + return self_visible_ && parent_visible_; + } // Whether or not we are actually visible. + void SetParentVisible(bool); + void SetSelfVisible(bool v) { self_visible_ = v; } void SetParent(FrameViewBase*) override; + FrameViewBase* Parent() const override { return parent_; } + FrameView* Root() const; void RemoveChild(FrameViewBase*); void AddChild(FrameViewBase*); const ChildrenSet* Children() const { return &children_; } @@ -640,11 +662,8 @@ const GlobalPaintFlags, const IntRect& damage_rect) const; - // FrameViewBase overrides to ensure that our children's visibility status is - // kept up to date when we get shown and hidden. void Show() override; void Hide() override; - void SetParentVisible(bool) override; bool IsPointInScrollbarCorner(const IntPoint&); bool ScrollbarCornerPresent() const; @@ -875,7 +894,7 @@ void InvalidateTreeIfNeeded(const PaintInvalidationState&); private: - explicit FrameView(LocalFrame&); + explicit FrameView(LocalFrame&, IntRect); class ScrollbarManager : public blink::ScrollbarManager { DISALLOW_NEW(); @@ -1054,6 +1073,11 @@ Member<LocalFrame> frame_; + IntRect frame_rect_; + Member<FrameView> parent_; + bool self_visible_; + bool parent_visible_; + WebDisplayMode display_mode_; DisplayShape display_shape_;
diff --git a/third_party/WebKit/Source/core/frame/FrameViewTest.cpp b/third_party/WebKit/Source/core/frame/FrameViewTest.cpp index a91b445f..93495bb 100644 --- a/third_party/WebKit/Source/core/frame/FrameViewTest.cpp +++ b/third_party/WebKit/Source/core/frame/FrameViewTest.cpp
@@ -88,7 +88,7 @@ TEST_P(FrameViewTest, SetPaintInvalidationDuringUpdateAllLifecyclePhases) { GetDocument().body()->setInnerHTML("<div id='a' style='color: blue'>A</div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - GetDocument().GetElementById("a")->setAttribute(HTMLNames::styleAttr, + GetDocument().getElementById("a")->setAttribute(HTMLNames::styleAttr, "color: green"); ChromeClient().has_scheduled_animation_ = false; GetDocument().View()->UpdateAllLifecyclePhases(); @@ -100,13 +100,13 @@ GetDocument().View()->UpdateAllLifecyclePhases(); ChromeClient().has_scheduled_animation_ = false; GetDocument() - .GetElementById("a") + .getElementById("a") ->GetLayoutObject() ->SetShouldDoFullPaintInvalidation(); EXPECT_TRUE(ChromeClient().has_scheduled_animation_); ChromeClient().has_scheduled_animation_ = false; GetDocument() - .GetElementById("a") + .getElementById("a") ->GetLayoutObject() ->SetShouldDoFullPaintInvalidation(); EXPECT_TRUE(ChromeClient().has_scheduled_animation_); @@ -158,7 +158,7 @@ GetDocument().View()->UpdateAllLifecyclePhases(); LayoutBoxModelObject* sticky = ToLayoutBoxModelObject( - GetDocument().GetElementById("sticky")->GetLayoutObject()); + GetDocument().getElementById("sticky")->GetLayoutObject()); // Deliberately invalidate the ancestor overflow layer. This approximates // http://crbug.com/696173, in which the ancestor overflow layer can be null @@ -183,14 +183,14 @@ GetDocument().View()->UpdateAllLifecyclePhases(); LayoutBoxModelObject* sticky = ToLayoutBoxModelObject( - GetDocument().GetElementById("sticky")->GetLayoutObject()); + GetDocument().getElementById("sticky")->GetLayoutObject()); EXPECT_TRUE( GetDocument().View()->ViewportConstrainedObjects()->Contains(sticky)); // Making the element non-sticky should remove it from the set of // viewport-constrained objects. - GetDocument().GetElementById("sticky")->setAttribute(HTMLNames::styleAttr, + GetDocument().getElementById("sticky")->setAttribute(HTMLNames::styleAttr, "position: relative"); GetDocument().View()->UpdateAllLifecyclePhases(); @@ -198,7 +198,7 @@ GetDocument().View()->ViewportConstrainedObjects()->Contains(sticky)); // And making it sticky again should put it back in that list. - GetDocument().GetElementById("sticky")->setAttribute(HTMLNames::styleAttr, + GetDocument().getElementById("sticky")->setAttribute(HTMLNames::styleAttr, ""); GetDocument().View()->UpdateAllLifecyclePhases();
diff --git a/third_party/WebKit/Source/core/frame/LocalFrameTest.cpp b/third_party/WebKit/Source/core/frame/LocalFrameTest.cpp index 28e4731..06d8dbe9 100644 --- a/third_party/WebKit/Source/core/frame/LocalFrameTest.cpp +++ b/third_party/WebKit/Source/core/frame/LocalFrameTest.cpp
@@ -51,7 +51,7 @@ "#sample { width: 100px; height: 100px; }" "</style>" "<div id=sample></div>"); - Element* sample = GetDocument().GetElementById("sample"); + Element* sample = GetDocument().getElementById("sample"); const std::unique_ptr<DragImage> image = GetFrame().NodeImage(*sample); EXPECT_EQ(IntSize(100, 100), image->Size()); } @@ -63,7 +63,7 @@ "span:-webkit-drag { color: #0F0 }" "</style>" "<div id=sample><span>Green when dragged</span></div>"); - Element* sample = GetDocument().GetElementById("sample"); + Element* sample = GetDocument().getElementById("sample"); const std::unique_ptr<DragImage> image = GetFrame().NodeImage(*sample); EXPECT_EQ( Color(0, 255, 0), @@ -78,7 +78,7 @@ "#sample:-webkit-drag { width: 200px; height: 200px; }" "</style>" "<div id=sample></div>"); - Element* sample = GetDocument().GetElementById("sample"); + Element* sample = GetDocument().getElementById("sample"); const std::unique_ptr<DragImage> image = GetFrame().NodeImage(*sample); EXPECT_EQ(IntSize(200, 200), image->Size()) << ":-webkit-drag should affect dragged image."; @@ -91,7 +91,7 @@ "#sample:-webkit-drag { display:none }" "</style>" "<div id=sample></div>"); - Element* sample = GetDocument().GetElementById("sample"); + Element* sample = GetDocument().getElementById("sample"); const std::unique_ptr<DragImage> image = GetFrame().NodeImage(*sample); EXPECT_EQ(nullptr, image.get()) << ":-webkit-drag blows away layout object"; } @@ -103,7 +103,7 @@ "#sample:-webkit-drag { display: inline-block; color: red; }" "</style>" "<span id=sample>foo</span>"); - Element* sample = GetDocument().GetElementById("sample"); + Element* sample = GetDocument().getElementById("sample"); UpdateAllLifecyclePhases(); LayoutObject* before_layout_object = sample->GetLayoutObject(); const std::unique_ptr<DragImage> image = GetFrame().NodeImage(*sample);
diff --git a/third_party/WebKit/Source/core/frame/RemoteFrameView.cpp b/third_party/WebKit/Source/core/frame/RemoteFrameView.cpp index daadfd1..b2bc577 100644 --- a/third_party/WebKit/Source/core/frame/RemoteFrameView.cpp +++ b/third_party/WebKit/Source/core/frame/RemoteFrameView.cpp
@@ -22,8 +22,17 @@ RemoteFrameView::~RemoteFrameView() {} -void RemoteFrameView::SetParent(FrameViewBase* parent) { - FrameViewBase::SetParent(parent); +void RemoteFrameView::SetParent(FrameViewBase* parent_frame_view_base) { + FrameView* parent = ToFrameView(parent_frame_view_base); + if (parent == parent_) + return; + + DCHECK(!parent || !parent_); + if (!parent || !parent->IsVisible()) + SetParentVisible(false); + parent_ = parent; + if (parent && parent->IsVisible()) + SetParentVisible(true); FrameRectsChanged(); } @@ -48,7 +57,7 @@ // scrollable div. Passing nullptr as an argument to // mapToVisualRectInAncestorSpace causes it to be clipped to the viewport, // even if there are RemoteFrame ancestors in the frame tree. - LayoutRect rect(0, 0, FrameRect().Width(), FrameRect().Height()); + LayoutRect rect(0, 0, frame_rect_.Width(), frame_rect_.Height()); rect.Move(remote_frame_->OwnerLayoutObject()->ContentBoxOffset()); if (!remote_frame_->OwnerLayoutObject()->MapToVisualRectInAncestorSpace( nullptr, rect)) @@ -74,7 +83,6 @@ // RemoteFrameView is disconnected before detachment. if (owner_element && owner_element->OwnedWidget() == this) owner_element->SetWidget(nullptr); - FrameViewBase::Dispose(); } void RemoteFrameView::InvalidateRect(const IntRect& rect) { @@ -88,14 +96,11 @@ layout_item.InvalidatePaintRectangle(repaint_rect); } -void RemoteFrameView::SetFrameRect(const IntRect& new_rect) { - IntRect old_rect = FrameRect(); - - if (new_rect == old_rect) +void RemoteFrameView::SetFrameRect(const IntRect& frame_rect) { + if (frame_rect == frame_rect_) return; - FrameViewBase::SetFrameRect(new_rect); - + frame_rect_ = frame_rect; FrameRectsChanged(); } @@ -103,36 +108,33 @@ // Update the rect to reflect the position of the frame relative to the // containing local frame root. The position of the local root within // any remote frames, if any, is accounted for by the embedder. - IntRect new_rect = FrameRect(); - if (const FrameView* parent = ToFrameView(Parent())) - new_rect = parent->ConvertToRootFrame(parent->ContentsToFrame(new_rect)); - + IntRect new_rect = frame_rect_; + if (parent_) + new_rect = parent_->ConvertToRootFrame(parent_->ContentsToFrame(new_rect)); remote_frame_->Client()->FrameRectsChanged(new_rect); UpdateRemoteViewportIntersection(); } void RemoteFrameView::Hide() { - SetSelfVisible(false); - + self_visible_ = false; remote_frame_->Client()->VisibilityChanged(false); } void RemoteFrameView::Show() { - SetSelfVisible(true); - + self_visible_ = true; remote_frame_->Client()->VisibilityChanged(true); } void RemoteFrameView::SetParentVisible(bool visible) { - if (IsParentVisible() == visible) + if (parent_visible_ == visible) return; - FrameViewBase::SetParentVisible(visible); - if (!IsSelfVisible()) + parent_visible_ = visible; + if (!self_visible_) return; - remote_frame_->Client()->VisibilityChanged(IsVisible()); + remote_frame_->Client()->VisibilityChanged(self_visible_ && parent_visible_); } IntRect RemoteFrameView::ConvertFromContainingFrameViewBase( @@ -149,7 +151,7 @@ DEFINE_TRACE(RemoteFrameView) { visitor->Trace(remote_frame_); - FrameViewBase::Trace(visitor); + visitor->Trace(parent_); } } // namespace blink
diff --git a/third_party/WebKit/Source/core/frame/RemoteFrameView.h b/third_party/WebKit/Source/core/frame/RemoteFrameView.h index 2bd5d74..90266252 100644 --- a/third_party/WebKit/Source/core/frame/RemoteFrameView.h +++ b/third_party/WebKit/Source/core/frame/RemoteFrameView.h
@@ -6,6 +6,7 @@ #define RemoteFrameView_h #include "core/frame/FrameOrPlugin.h" +#include "core/frame/FrameView.h" #include "platform/FrameViewBase.h" #include "platform/geometry/IntRect.h" #include "platform/heap/Handle.h" @@ -16,7 +17,9 @@ class GraphicsContext; class RemoteFrame; -class RemoteFrameView final : public FrameViewBase, public FrameOrPlugin { +class RemoteFrameView final : public GarbageCollectedFinalized<RemoteFrameView>, + public FrameViewBase, + public FrameOrPlugin { USING_GARBAGE_COLLECTED_MIXIN(RemoteFrameView); public: @@ -26,6 +29,7 @@ bool IsRemoteFrameView() const override { return true; } void SetParent(FrameViewBase*) override; + FrameViewBase* Parent() const override { return parent_; } RemoteFrame& GetFrame() const { ASSERT(remote_frame_); @@ -37,9 +41,8 @@ void FrameRectsChanged() override; void InvalidateRect(const IntRect&); void SetFrameRect(const IntRect&) override; - const IntRect& FrameRect() const override { - return FrameViewBase::FrameRect(); - } + const IntRect& FrameRect() const override { return frame_rect_; } + IntPoint Location() const override { return frame_rect_.Location(); } void Paint(GraphicsContext&, const CullRect&) const override {} void Hide() override; void Show() override; @@ -59,8 +62,11 @@ // and FrameView. Please see the FrameView::m_frame comment for // details. Member<RemoteFrame> remote_frame_; - + Member<FrameView> parent_; IntRect last_viewport_intersection_; + IntRect frame_rect_; + bool self_visible_; + bool parent_visible_; }; DEFINE_TYPE_CASTS(RemoteFrameView,
diff --git a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp index c5b7eed..8fe15e7 100644 --- a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp +++ b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp
@@ -178,35 +178,48 @@ SetupSelf(*execution_context_->GetSecurityContext().GetSecurityOrigin()); - // If we're in a Document, set mixed content checking and sandbox - // flags, then dump all the parsing error messages, then poke at histograms. - if (Document* document = this->GetDocument()) { - if (sandbox_mask_ != kSandboxNone) { - UseCounter::Count(document, UseCounter::kSandboxViaCSP); + // Set mixed content checking and sandbox flags, then dump all the parsing + // error messages, then poke at histograms. + Document* document = this->GetDocument(); + if (sandbox_mask_ != kSandboxNone) { + UseCounter::Count(execution_context_, UseCounter::kSandboxViaCSP); + if (document) document->EnforceSandboxFlags(sandbox_mask_); - } - if (treat_as_public_address_) - document->SetAddressSpace(kWebAddressSpacePublic); + else + execution_context_->GetSecurityContext().ApplySandboxFlags(sandbox_mask_); + } + if (treat_as_public_address_) { + execution_context_->GetSecurityContext().SetAddressSpace( + kWebAddressSpacePublic); + } + if (document) { document->EnforceInsecureRequestPolicy(insecure_request_policy_); - if (insecure_request_policy_ & kUpgradeInsecureRequests) { - UseCounter::Count(document, UseCounter::kUpgradeInsecureRequestsEnabled); - if (!document->Url().Host().IsEmpty()) - document->AddInsecureNavigationUpgrade( - document->Url().Host().Impl()->GetHash()); - } + } else { + execution_context_->GetSecurityContext().SetInsecureRequestPolicy( + insecure_request_policy_); + } - for (const auto& console_message : console_messages_) - execution_context_->AddConsoleMessage(console_message); - console_messages_.clear(); - - for (const auto& policy : policies_) { - UseCounter::Count(*document, GetUseCounterType(policy->HeaderType())); - if (policy->AllowDynamic()) - UseCounter::Count(*document, UseCounter::kCSPWithStrictDynamic); + if (insecure_request_policy_ & kUpgradeInsecureRequests) { + UseCounter::Count(execution_context_, + UseCounter::kUpgradeInsecureRequestsEnabled); + if (!execution_context_->Url().Host().IsEmpty()) { + execution_context_->GetSecurityContext().AddInsecureNavigationUpgrade( + execution_context_->Url().Host().Impl()->GetHash()); } } + for (const auto& console_message : console_messages_) + execution_context_->AddConsoleMessage(console_message); + console_messages_.clear(); + + for (const auto& policy : policies_) { + UseCounter::Count(execution_context_, + GetUseCounterType(policy->HeaderType())); + if (policy->AllowDynamic()) + UseCounter::Count(execution_context_, UseCounter::kCSPWithStrictDynamic); + } + // We disable 'eval()' even in the case of report-only policies, and rely on // the check in the V8Initializer::codeGenerationCheckCallbackInMainThread // callback to determine whether the call should execute or not.
diff --git a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicyTest.cpp b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicyTest.cpp index 6df8d85..98b3d02 100644 --- a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicyTest.cpp +++ b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicyTest.cpp
@@ -4,11 +4,9 @@ #include "core/frame/csp/ContentSecurityPolicy.h" -#include "core/dom/Document.h" #include "core/frame/csp/CSPDirectiveList.h" #include "core/html/HTMLScriptElement.h" -#include "core/loader/DocumentLoader.h" -#include "core/testing/DummyPageHolder.h" +#include "core/testing/NullExecutionContext.h" #include "platform/Crypto.h" #include "platform/RuntimeEnabledFeatures.h" #include "platform/loader/fetch/IntegrityMetadata.h" @@ -31,15 +29,19 @@ secure_origin(SecurityOrigin::Create(secure_url)) {} protected: - virtual void SetUp() { - document = Document::Create(); - document->SetSecurityOrigin(secure_origin); + virtual void SetUp() { execution_context = CreateExecutionContext(); } + + NullExecutionContext* CreateExecutionContext() { + NullExecutionContext* context = new NullExecutionContext(); + context->SetUpSecurityContext(); + context->SetSecurityOrigin(secure_origin); + return context; } Persistent<ContentSecurityPolicy> csp; KURL secure_url; RefPtr<SecurityOrigin> secure_origin; - Persistent<Document> document; + Persistent<NullExecutionContext> execution_context; }; TEST_F(ContentSecurityPolicyTest, ParseInsecureRequestPolicy) { @@ -63,15 +65,16 @@ kContentSecurityPolicyHeaderSourceHTTP); EXPECT_EQ(test.expected_policy, csp->GetInsecureRequestPolicy()); - document = Document::Create(); - document->SetSecurityOrigin(secure_origin); - document->SetURL(secure_url); - csp->BindToExecutionContext(document.Get()); - EXPECT_EQ(test.expected_policy, document->GetInsecureRequestPolicy()); + execution_context = CreateExecutionContext(); + execution_context->SetSecurityOrigin(secure_origin); + execution_context->SetURL(secure_url); + csp->BindToExecutionContext(execution_context.Get()); + EXPECT_EQ(test.expected_policy, + execution_context->GetInsecureRequestPolicy()); bool expect_upgrade = test.expected_policy & kUpgradeInsecureRequests; EXPECT_EQ(expect_upgrade, - document->InsecureNavigationsToUpgrade()->Contains( - document->Url().Host().Impl()->GetHash())); + execution_context->InsecureNavigationsToUpgrade()->Contains( + execution_context->Url().Host().Impl()->GetHash())); } // Report-Only @@ -83,38 +86,38 @@ kContentSecurityPolicyHeaderSourceHTTP); EXPECT_EQ(kLeaveInsecureRequestsAlone, csp->GetInsecureRequestPolicy()); - document = Document::Create(); - document->SetSecurityOrigin(secure_origin); - csp->BindToExecutionContext(document.Get()); + execution_context = CreateExecutionContext(); + execution_context->SetSecurityOrigin(secure_origin); + csp->BindToExecutionContext(execution_context.Get()); EXPECT_EQ(kLeaveInsecureRequestsAlone, - document->GetInsecureRequestPolicy()); - EXPECT_FALSE(document->InsecureNavigationsToUpgrade()->Contains( + execution_context->GetInsecureRequestPolicy()); + EXPECT_FALSE(execution_context->InsecureNavigationsToUpgrade()->Contains( secure_origin->Host().Impl()->GetHash())); } } TEST_F(ContentSecurityPolicyTest, ParseEnforceTreatAsPublicAddressDisabled) { RuntimeEnabledFeatures::setCorsRFC1918Enabled(false); - document->SetAddressSpace(kWebAddressSpacePrivate); - EXPECT_EQ(kWebAddressSpacePrivate, document->AddressSpace()); + execution_context->SetAddressSpace(kWebAddressSpacePrivate); + EXPECT_EQ(kWebAddressSpacePrivate, execution_context->AddressSpace()); csp->DidReceiveHeader("treat-as-public-address", kContentSecurityPolicyHeaderTypeEnforce, kContentSecurityPolicyHeaderSourceHTTP); - csp->BindToExecutionContext(document.Get()); - EXPECT_EQ(kWebAddressSpacePrivate, document->AddressSpace()); + csp->BindToExecutionContext(execution_context.Get()); + EXPECT_EQ(kWebAddressSpacePrivate, execution_context->AddressSpace()); } TEST_F(ContentSecurityPolicyTest, ParseEnforceTreatAsPublicAddressEnabled) { RuntimeEnabledFeatures::setCorsRFC1918Enabled(true); - document->SetAddressSpace(kWebAddressSpacePrivate); - EXPECT_EQ(kWebAddressSpacePrivate, document->AddressSpace()); + execution_context->SetAddressSpace(kWebAddressSpacePrivate); + EXPECT_EQ(kWebAddressSpacePrivate, execution_context->AddressSpace()); csp->DidReceiveHeader("treat-as-public-address", kContentSecurityPolicyHeaderTypeEnforce, kContentSecurityPolicyHeaderSourceHTTP); - csp->BindToExecutionContext(document.Get()); - EXPECT_EQ(kWebAddressSpacePublic, document->AddressSpace()); + csp->BindToExecutionContext(execution_context.Get()); + EXPECT_EQ(kWebAddressSpacePublic, execution_context->AddressSpace()); } TEST_F(ContentSecurityPolicyTest, CopyStateFrom) { @@ -202,7 +205,7 @@ // Tests that frame-ancestors directives are discarded from policies // delivered in <meta> elements. TEST_F(ContentSecurityPolicyTest, FrameAncestorsInMeta) { - csp->BindToExecutionContext(document.Get()); + csp->BindToExecutionContext(execution_context.Get()); csp->DidReceiveHeader("frame-ancestors 'none';", kContentSecurityPolicyHeaderTypeEnforce, kContentSecurityPolicyHeaderSourceMeta); @@ -216,13 +219,13 @@ // Tests that sandbox directives are discarded from policies // delivered in <meta> elements. TEST_F(ContentSecurityPolicyTest, SandboxInMeta) { - csp->BindToExecutionContext(document.Get()); + csp->BindToExecutionContext(execution_context.Get()); csp->DidReceiveHeader("sandbox;", kContentSecurityPolicyHeaderTypeEnforce, kContentSecurityPolicyHeaderSourceMeta); - EXPECT_FALSE(document->GetSecurityOrigin()->IsUnique()); + EXPECT_FALSE(execution_context->GetSecurityOrigin()->IsUnique()); csp->DidReceiveHeader("sandbox;", kContentSecurityPolicyHeaderTypeEnforce, kContentSecurityPolicyHeaderSourceHTTP); - EXPECT_TRUE(document->GetSecurityOrigin()->IsUnique()); + EXPECT_TRUE(execution_context->GetSecurityOrigin()->IsUnique()); } // Tests that report-uri directives are discarded from policies @@ -248,7 +251,7 @@ // makes. https://crbug.com/603952 TEST_F(ContentSecurityPolicyTest, ObjectSrc) { KURL url(KURL(), "https://example.test"); - csp->BindToExecutionContext(document.Get()); + csp->BindToExecutionContext(execution_context.Get()); csp->DidReceiveHeader("object-src 'none';", kContentSecurityPolicyHeaderTypeEnforce, kContentSecurityPolicyHeaderSourceMeta); @@ -271,7 +274,7 @@ TEST_F(ContentSecurityPolicyTest, ConnectSrc) { KURL url(KURL(), "https://example.test"); - csp->BindToExecutionContext(document.Get()); + csp->BindToExecutionContext(execution_context.Get()); csp->DidReceiveHeader("connect-src 'none';", kContentSecurityPolicyHeaderTypeEnforce, kContentSecurityPolicyHeaderSourceMeta); @@ -307,7 +310,7 @@ KURL url(KURL(), "https://example.test"); // Enforce Persistent<ContentSecurityPolicy> policy = ContentSecurityPolicy::Create(); - policy->BindToExecutionContext(document.Get()); + policy->BindToExecutionContext(execution_context.Get()); policy->DidReceiveHeader("require-sri-for script style", kContentSecurityPolicyHeaderTypeEnforce, kContentSecurityPolicyHeaderSourceHTTP); @@ -348,7 +351,7 @@ SecurityViolationReportingPolicy::kSuppressReporting)); // Report policy = ContentSecurityPolicy::Create(); - policy->BindToExecutionContext(document.Get()); + policy->BindToExecutionContext(execution_context.Get()); policy->DidReceiveHeader("require-sri-for script style", kContentSecurityPolicyHeaderTypeReport, kContentSecurityPolicyHeaderSourceHTTP); @@ -396,10 +399,10 @@ IntegrityMetadataSet integrity_metadata; integrity_metadata.insert( IntegrityMetadata("1234", kHashAlgorithmSha384).ToPair()); - csp->BindToExecutionContext(document.Get()); + csp->BindToExecutionContext(execution_context.Get()); // Enforce Persistent<ContentSecurityPolicy> policy = ContentSecurityPolicy::Create(); - policy->BindToExecutionContext(document.Get()); + policy->BindToExecutionContext(execution_context.Get()); policy->DidReceiveHeader("require-sri-for script style", kContentSecurityPolicyHeaderTypeEnforce, kContentSecurityPolicyHeaderSourceHTTP); @@ -436,7 +439,7 @@ // Content-Security-Policy-Report-Only is not supported in meta element, // so nothing should be blocked policy = ContentSecurityPolicy::Create(); - policy->BindToExecutionContext(document.Get()); + policy->BindToExecutionContext(execution_context.Get()); policy->DidReceiveHeader("require-sri-for script style", kContentSecurityPolicyHeaderTypeReport, kContentSecurityPolicyHeaderSourceHTTP); @@ -478,7 +481,7 @@ KURL url(KURL(), "https://example.test"); // Enforce Persistent<ContentSecurityPolicy> policy = ContentSecurityPolicy::Create(); - policy->BindToExecutionContext(document.Get()); + policy->BindToExecutionContext(execution_context.Get()); policy->DidReceiveHeader("require-sri-for script style", kContentSecurityPolicyHeaderTypeEnforce, kContentSecurityPolicyHeaderSourceMeta); @@ -520,7 +523,7 @@ // Content-Security-Policy-Report-Only is not supported in meta element, // so nothing should be blocked policy = ContentSecurityPolicy::Create(); - policy->BindToExecutionContext(document.Get()); + policy->BindToExecutionContext(execution_context.Get()); policy->DidReceiveHeader("require-sri-for script style", kContentSecurityPolicyHeaderTypeReport, kContentSecurityPolicyHeaderSourceMeta); @@ -568,10 +571,10 @@ IntegrityMetadataSet integrity_metadata; integrity_metadata.insert( IntegrityMetadata("1234", kHashAlgorithmSha384).ToPair()); - csp->BindToExecutionContext(document.Get()); + csp->BindToExecutionContext(execution_context.Get()); // Enforce Persistent<ContentSecurityPolicy> policy = ContentSecurityPolicy::Create(); - policy->BindToExecutionContext(document.Get()); + policy->BindToExecutionContext(execution_context.Get()); policy->DidReceiveHeader("require-sri-for script style", kContentSecurityPolicyHeaderTypeEnforce, kContentSecurityPolicyHeaderSourceMeta); @@ -608,7 +611,7 @@ // Content-Security-Policy-Report-Only is not supported in meta element, // so nothing should be blocked policy = ContentSecurityPolicy::Create(); - policy->BindToExecutionContext(document.Get()); + policy->BindToExecutionContext(execution_context.Get()); policy->DidReceiveHeader("require-sri-for script style", kContentSecurityPolicyHeaderTypeReport, kContentSecurityPolicyHeaderSourceMeta); @@ -671,7 +674,7 @@ // Single enforce-mode policy should match `test.expected`: Persistent<ContentSecurityPolicy> policy = ContentSecurityPolicy::Create(); - policy->BindToExecutionContext(document.Get()); + policy->BindToExecutionContext(execution_context.Get()); policy->DidReceiveHeader(test.policy, kContentSecurityPolicyHeaderTypeEnforce, kContentSecurityPolicyHeaderSourceHTTP); @@ -684,7 +687,7 @@ // Single report-mode policy should always be `true`: policy = ContentSecurityPolicy::Create(); - policy->BindToExecutionContext(document.Get()); + policy->BindToExecutionContext(execution_context.Get()); policy->DidReceiveHeader(test.policy, kContentSecurityPolicyHeaderTypeReport, kContentSecurityPolicyHeaderSourceHTTP); @@ -716,6 +719,11 @@ String context_url; String content; WTF::OrdinalNumber context_line; + + // We need document for HTMLScriptElement tests. + Document* document = Document::Create(); + document->SetSecurityOrigin(secure_origin); + for (const auto& test : cases) { SCOPED_TRACE(testing::Message() << "Policy: `" << test.policy << "`, Nonce: `" << test.nonce << "`"); @@ -725,7 +733,7 @@ // Enforce 'script-src' Persistent<ContentSecurityPolicy> policy = ContentSecurityPolicy::Create(); - policy->BindToExecutionContext(document.Get()); + policy->BindToExecutionContext(document); policy->DidReceiveHeader(String("script-src ") + test.policy, kContentSecurityPolicyHeaderTypeEnforce, kContentSecurityPolicyHeaderSourceHTTP); @@ -736,7 +744,7 @@ // Enforce 'style-src' policy = ContentSecurityPolicy::Create(); - policy->BindToExecutionContext(document.Get()); + policy->BindToExecutionContext(document); policy->DidReceiveHeader(String("style-src ") + test.policy, kContentSecurityPolicyHeaderTypeEnforce, kContentSecurityPolicyHeaderSourceHTTP); @@ -747,7 +755,7 @@ // Report 'script-src' policy = ContentSecurityPolicy::Create(); - policy->BindToExecutionContext(document.Get()); + policy->BindToExecutionContext(document); policy->DidReceiveHeader(String("script-src ") + test.policy, kContentSecurityPolicyHeaderTypeReport, kContentSecurityPolicyHeaderSourceHTTP); @@ -757,7 +765,7 @@ // Report 'style-src' policy = ContentSecurityPolicy::Create(); - policy->BindToExecutionContext(document.Get()); + policy->BindToExecutionContext(document); policy->DidReceiveHeader(String("style-src ") + test.policy, kContentSecurityPolicyHeaderTypeReport, kContentSecurityPolicyHeaderSourceHTTP); @@ -826,7 +834,7 @@ // Enforce / Report Persistent<ContentSecurityPolicy> policy = ContentSecurityPolicy::Create(); - policy->BindToExecutionContext(document.Get()); + policy->BindToExecutionContext(execution_context.Get()); policy->DidReceiveHeader(test.policy1, kContentSecurityPolicyHeaderTypeEnforce, kContentSecurityPolicyHeaderSourceHTTP); @@ -848,7 +856,7 @@ // Report / Enforce policy = ContentSecurityPolicy::Create(); - policy->BindToExecutionContext(document.Get()); + policy->BindToExecutionContext(execution_context.Get()); policy->DidReceiveHeader(test.policy1, kContentSecurityPolicyHeaderTypeReport, kContentSecurityPolicyHeaderSourceHTTP); @@ -870,7 +878,7 @@ // Enforce / Enforce policy = ContentSecurityPolicy::Create(); - policy->BindToExecutionContext(document.Get()); + policy->BindToExecutionContext(execution_context.Get()); policy->DidReceiveHeader(test.policy1, kContentSecurityPolicyHeaderTypeEnforce, kContentSecurityPolicyHeaderSourceHTTP); @@ -887,7 +895,7 @@ // Report / Report policy = ContentSecurityPolicy::Create(); - policy->BindToExecutionContext(document.Get()); + policy->BindToExecutionContext(execution_context.Get()); policy->DidReceiveHeader(test.policy1, kContentSecurityPolicyHeaderTypeReport, kContentSecurityPolicyHeaderSourceHTTP); @@ -1038,10 +1046,10 @@ TEST_F(ContentSecurityPolicyTest, RequestsAllowedWhenBypassingCSP) { KURL base; - document = Document::Create(); - document->SetSecurityOrigin(secure_origin); // https://example.com - document->SetURL(secure_url); // https://example.com - csp->BindToExecutionContext(document.Get()); + execution_context = CreateExecutionContext(); + execution_context->SetSecurityOrigin(secure_origin); // https://example.com + execution_context->SetURL(secure_url); // https://example.com + csp->BindToExecutionContext(execution_context.Get()); csp->DidReceiveHeader("default-src https://example.com", kContentSecurityPolicyHeaderTypeEnforce, kContentSecurityPolicyHeaderSourceHTTP); @@ -1078,10 +1086,10 @@ } TEST_F(ContentSecurityPolicyTest, FilesystemAllowedWhenBypassingCSP) { KURL base; - document = Document::Create(); - document->SetSecurityOrigin(secure_origin); // https://example.com - document->SetURL(secure_url); // https://example.com - csp->BindToExecutionContext(document.Get()); + execution_context = CreateExecutionContext(); + execution_context->SetSecurityOrigin(secure_origin); // https://example.com + execution_context->SetURL(secure_url); // https://example.com + csp->BindToExecutionContext(execution_context.Get()); csp->DidReceiveHeader("default-src https://example.com", kContentSecurityPolicyHeaderTypeEnforce, kContentSecurityPolicyHeaderSourceHTTP); @@ -1123,10 +1131,10 @@ TEST_F(ContentSecurityPolicyTest, BlobAllowedWhenBypassingCSP) { KURL base; - document = Document::Create(); - document->SetSecurityOrigin(secure_origin); // https://example.com - document->SetURL(secure_url); // https://example.com - csp->BindToExecutionContext(document.Get()); + execution_context = CreateExecutionContext(); + execution_context->SetSecurityOrigin(secure_origin); // https://example.com + execution_context->SetURL(secure_url); // https://example.com + csp->BindToExecutionContext(execution_context.Get()); csp->DidReceiveHeader("default-src https://example.com", kContentSecurityPolicyHeaderTypeEnforce, kContentSecurityPolicyHeaderSourceHTTP);
diff --git a/third_party/WebKit/Source/core/html/HTMLDetailsElement.cpp b/third_party/WebKit/Source/core/html/HTMLDetailsElement.cpp index a9a541c..655ff4e 100644 --- a/third_party/WebKit/Source/core/html/HTMLDetailsElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLDetailsElement.cpp
@@ -136,7 +136,7 @@ WTF::Bind(&HTMLDetailsElement::DispatchPendingEvent, WrapPersistent(this))); - Element* content = EnsureUserAgentShadowRoot().GetElementById( + Element* content = EnsureUserAgentShadowRoot().getElementById( ShadowElementNames::DetailsContent()); DCHECK(content); if (is_open_)
diff --git a/third_party/WebKit/Source/core/html/HTMLElement.cpp b/third_party/WebKit/Source/core/html/HTMLElement.cpp index d0d4c083..6d88ea1a 100644 --- a/third_party/WebKit/Source/core/html/HTMLElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLElement.cpp
@@ -1060,7 +1060,7 @@ if (context_menu_id.IsNull()) return nullptr; - Element* element = GetTreeScope().GetElementById(context_menu_id); + Element* element = GetTreeScope().getElementById(context_menu_id); // Not checking if the menu element is of type "popup". // Ignoring menu element type attribute is intentional according to the // standard. @@ -1083,7 +1083,7 @@ const AtomicString& context_menu_id(context_menu->FastGetAttribute(idAttr)); if (!context_menu_id.IsNull() && - context_menu == GetTreeScope().GetElementById(context_menu_id)) + context_menu == GetTreeScope().getElementById(context_menu_id)) setAttribute(contextmenuAttr, context_menu_id); else setAttribute(contextmenuAttr, "");
diff --git a/third_party/WebKit/Source/core/html/HTMLEmbedElementTest.cpp b/third_party/WebKit/Source/core/html/HTMLEmbedElementTest.cpp index fa396f2..7cd0db7 100644 --- a/third_party/WebKit/Source/core/html/HTMLEmbedElementTest.cpp +++ b/third_party/WebKit/Source/core/html/HTMLEmbedElementTest.cpp
@@ -53,7 +53,7 @@ "width='1' height='1' id='fce'>" "</object></div>"); - auto* object_element = GetDocument().GetElementById("fco"); + auto* object_element = GetDocument().getElementById("fco"); ASSERT_TRUE(object_element); ASSERT_TRUE(isHTMLObjectElement(object_element)); HTMLObjectElement* object = toHTMLObjectElement(object_element); @@ -65,7 +65,7 @@ EXPECT_FALSE(object->UseFallbackContent()); EXPECT_TRUE(object->WillUseFallbackContentAtLayout()); - auto* embed_element = GetDocument().GetElementById("fce"); + auto* embed_element = GetDocument().getElementById("fce"); ASSERT_TRUE(embed_element); ASSERT_TRUE(isHTMLEmbedElement(embed_element)); HTMLEmbedElement* embed = toHTMLEmbedElement(embed_element);
diff --git a/third_party/WebKit/Source/core/html/HTMLFormControlElementTest.cpp b/third_party/WebKit/Source/core/html/HTMLFormControlElementTest.cpp index 4ee8c5b3..2be5c44 100644 --- a/third_party/WebKit/Source/core/html/HTMLFormControlElementTest.cpp +++ b/third_party/WebKit/Source/core/html/HTMLFormControlElementTest.cpp
@@ -44,7 +44,7 @@ GetDocument().View()->UpdateAllLifecyclePhases(); HTMLInputElement* input = - toHTMLInputElement(GetDocument().GetElementById("input")); + toHTMLInputElement(GetDocument().getElementById("input")); input->setCustomValidity( String::FromUTF8("\xD8\xB9\xD8\xB1\xD8\xA8\xD9\x89")); input->setAttribute(
diff --git a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp index 7b84b1b..1952166 100644 --- a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp
@@ -103,7 +103,7 @@ { FrameOrPluginList list; - FrameOrPluginsPendingDispose().Swap(list); + FrameOrPluginsPendingDispose().swap(list); for (const auto& frame_or_plugin : list) { frame_or_plugin->Dispose(); }
diff --git a/third_party/WebKit/Source/core/html/HTMLImageElement.cpp b/third_party/WebKit/Source/core/html/HTMLImageElement.cpp index 9a72937..6046a9a 100644 --- a/third_party/WebKit/Source/core/html/HTMLImageElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLImageElement.cpp
@@ -253,7 +253,7 @@ const QualifiedName& name = params.name; if (name == altAttr || name == titleAttr) { if (UserAgentShadowRoot()) { - Element* text = UserAgentShadowRoot()->GetElementById("alttext"); + Element* text = UserAgentShadowRoot()->getElementById("alttext"); String value = AltText(); if (text && text->textContent() != params.new_value) text->setTextContent(AltText());
diff --git a/third_party/WebKit/Source/core/html/HTMLImageFallbackHelper.cpp b/third_party/WebKit/Source/core/html/HTMLImageFallbackHelper.cpp index 2f7e825..8a6c2400 100644 --- a/third_party/WebKit/Source/core/html/HTMLImageFallbackHelper.cpp +++ b/third_party/WebKit/Source/core/html/HTMLImageFallbackHelper.cpp
@@ -70,9 +70,9 @@ return new_style; Element* place_holder = - element.UserAgentShadowRoot()->GetElementById("alttext-container"); + element.UserAgentShadowRoot()->getElementById("alttext-container"); Element* broken_image = - element.UserAgentShadowRoot()->GetElementById("alttext-image"); + element.UserAgentShadowRoot()->getElementById("alttext-image"); // Input elements have a UA shadow root of their own. We may not have replaced // it with fallback content yet. if (!place_holder || !broken_image)
diff --git a/third_party/WebKit/Source/core/html/HTMLInputElement.cpp b/third_party/WebKit/Source/core/html/HTMLInputElement.cpp index 77db9167..ebc0cf3 100644 --- a/third_party/WebKit/Source/core/html/HTMLInputElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLInputElement.cpp
@@ -1551,7 +1551,7 @@ if (!input_type_->ShouldRespectListAttribute()) return nullptr; - Element* element = GetTreeScope().GetElementById(FastGetAttribute(listAttr)); + Element* element = GetTreeScope().getElementById(FastGetAttribute(listAttr)); if (!element) return nullptr; if (!isHTMLDataListElement(*element))
diff --git a/third_party/WebKit/Source/core/html/HTMLInputElementTest.cpp b/third_party/WebKit/Source/core/html/HTMLInputElementTest.cpp index ede34f15..7d34b17 100644 --- a/third_party/WebKit/Source/core/html/HTMLInputElementTest.cpp +++ b/third_party/WebKit/Source/core/html/HTMLInputElementTest.cpp
@@ -24,7 +24,7 @@ protected: Document& GetDocument() { return page_holder_->GetDocument(); } HTMLInputElement& TestElement() { - Element* element = GetDocument().GetElementById("test"); + Element* element = GetDocument().getElementById("test"); DCHECK(element); return toHTMLInputElement(*element); }
diff --git a/third_party/WebKit/Source/core/html/HTMLLabelElement.cpp b/third_party/WebKit/Source/core/html/HTMLLabelElement.cpp index e7201cc8..06670f2 100644 --- a/third_party/WebKit/Source/core/html/HTMLLabelElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLLabelElement.cpp
@@ -72,7 +72,7 @@ if (!IsInTreeScope()) return nullptr; - if (Element* element = GetTreeScope().GetElementById(control_id)) { + if (Element* element = GetTreeScope().getElementById(control_id)) { if (IsLabelableElement(*element) && ToLabelableElement(*element).SupportLabels()) { if (!element->IsFormControlElement())
diff --git a/third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp b/third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp index 9ba3661..4f1149f 100644 --- a/third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp
@@ -157,7 +157,7 @@ } HTMLDivElement& HTMLOptGroupElement::OptGroupLabelElement() const { - return *toHTMLDivElementOrDie(UserAgentShadowRoot()->GetElementById( + return *toHTMLDivElementOrDie(UserAgentShadowRoot()->getElementById( ShadowElementNames::OptGroupLabel())); }
diff --git a/third_party/WebKit/Source/core/html/HTMLSelectElementTest.cpp b/third_party/WebKit/Source/core/html/HTMLSelectElementTest.cpp index ecee95b..c423f1a6 100644 --- a/third_party/WebKit/Source/core/html/HTMLSelectElementTest.cpp +++ b/third_party/WebKit/Source/core/html/HTMLSelectElementTest.cpp
@@ -43,12 +43,12 @@ "<option value='111' selected id='2'>!666</option>" "<option value='999'>999</option></select>")); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* element = GetDocument().GetElementById("sel"); + Element* element = GetDocument().getElementById("sel"); HTMLFormControlElementWithState* select = toHTMLSelectElement(element); HTMLOptionElement* opt0 = - toHTMLOptionElement(GetDocument().GetElementById("0")); + toHTMLOptionElement(GetDocument().getElementById("0")); HTMLOptionElement* opt2 = - toHTMLOptionElement(GetDocument().GetElementById("2")); + toHTMLOptionElement(GetDocument().getElementById("2")); // Save the select element state, and then restore again. // Test passes if the restored state is not changed. @@ -78,14 +78,14 @@ "<option value='999' selected id='3'>999</option></select>")); GetDocument().View()->UpdateAllLifecyclePhases(); HTMLFormControlElementWithState* select = - toHTMLSelectElement(GetDocument().GetElementById("sel")); + toHTMLSelectElement(GetDocument().getElementById("sel")); HTMLOptionElement* opt0 = - toHTMLOptionElement(GetDocument().GetElementById("0")); + toHTMLOptionElement(GetDocument().getElementById("0")); HTMLOptionElement* opt2 = - toHTMLOptionElement(GetDocument().GetElementById("2")); + toHTMLOptionElement(GetDocument().getElementById("2")); HTMLOptionElement* opt3 = - toHTMLOptionElement(GetDocument().GetElementById("3")); + toHTMLOptionElement(GetDocument().getElementById("3")); // Save the select element state, and then restore again. // Test passes if the selected options are not changed. @@ -120,10 +120,10 @@ "<option id='2'>222</option>" "</select>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* element = GetDocument().GetElementById("sel"); + Element* element = GetDocument().getElementById("sel"); HTMLFormControlElementWithState* select = toHTMLSelectElement(element); HTMLOptionElement* opt2 = - toHTMLOptionElement(GetDocument().GetElementById("2")); + toHTMLOptionElement(GetDocument().getElementById("2")); toHTMLSelectElement(element)->setSelectedIndex(1); // Save the current state. @@ -319,12 +319,12 @@ HTMLSelectElement* select = toHTMLSelectElement(GetDocument().body()->firstChild()); HTMLOptionElement* option = - toHTMLOptionElement(GetDocument().GetElementById("o1")); + toHTMLOptionElement(GetDocument().getElementById("o1")); EXPECT_EQ("o2", select->NextSelectableOption(option)->FastGetAttribute( HTMLNames::idAttr)); EXPECT_EQ(nullptr, select->NextSelectableOption(toHTMLOptionElement( - GetDocument().GetElementById("o2")))); + GetDocument().getElementById("o2")))); } { GetDocument().documentElement()->setInnerHTML( @@ -334,7 +334,7 @@ HTMLSelectElement* select = toHTMLSelectElement(GetDocument().body()->firstChild()); HTMLOptionElement* option = - toHTMLOptionElement(GetDocument().GetElementById("o1")); + toHTMLOptionElement(GetDocument().getElementById("o1")); EXPECT_EQ("o2", select->NextSelectableOption(option)->FastGetAttribute( HTMLNames::idAttr)); } @@ -394,12 +394,12 @@ HTMLSelectElement* select = toHTMLSelectElement(GetDocument().body()->firstChild()); HTMLOptionElement* option = - toHTMLOptionElement(GetDocument().GetElementById("o2")); + toHTMLOptionElement(GetDocument().getElementById("o2")); EXPECT_EQ("o1", select->PreviousSelectableOption(option)->FastGetAttribute( HTMLNames::idAttr)); EXPECT_EQ(nullptr, select->PreviousSelectableOption(toHTMLOptionElement( - GetDocument().GetElementById("o1")))); + GetDocument().getElementById("o1")))); } { GetDocument().documentElement()->setInnerHTML( @@ -409,7 +409,7 @@ HTMLSelectElement* select = toHTMLSelectElement(GetDocument().body()->firstChild()); HTMLOptionElement* option = - toHTMLOptionElement(GetDocument().GetElementById("o2")); + toHTMLOptionElement(GetDocument().getElementById("o2")); EXPECT_EQ("o1", select->PreviousSelectableOption(option)->FastGetAttribute( HTMLNames::idAttr)); }
diff --git a/third_party/WebKit/Source/core/html/HTMLSlotElement.cpp b/third_party/WebKit/Source/core/html/HTMLSlotElement.cpp index 9848b3df5..c636039 100644 --- a/third_party/WebKit/Source/core/html/HTMLSlotElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLSlotElement.cpp
@@ -146,7 +146,7 @@ } void HTMLSlotElement::SaveAndClearDistribution() { - old_distributed_nodes_.Swap(distributed_nodes_); + old_distributed_nodes_.swap(distributed_nodes_); ClearDistribution(); }
diff --git a/third_party/WebKit/Source/core/html/HTMLSummaryElement.cpp b/third_party/WebKit/Source/core/html/HTMLSummaryElement.cpp index 7c687fb..2cd283d3 100644 --- a/third_party/WebKit/Source/core/html/HTMLSummaryElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLSummaryElement.cpp
@@ -72,7 +72,7 @@ } Element* HTMLSummaryElement::MarkerControl() { - return EnsureUserAgentShadowRoot().GetElementById( + return EnsureUserAgentShadowRoot().getElementById( ShadowElementNames::DetailsMarker()); }
diff --git a/third_party/WebKit/Source/core/html/ListedElement.cpp b/third_party/WebKit/Source/core/html/ListedElement.cpp index 0c3de48..ed88266 100644 --- a/third_party/WebKit/Source/core/html/ListedElement.cpp +++ b/third_party/WebKit/Source/core/html/ListedElement.cpp
@@ -114,7 +114,7 @@ // with that form element. // 3.2. Abort the "reset the form owner" steps. Element* new_form_candidate = - element->GetTreeScope().GetElementById(form_id); + element->GetTreeScope().getElementById(form_id); return isHTMLFormElement(new_form_candidate) ? toHTMLFormElement(new_form_candidate) : 0;
diff --git a/third_party/WebKit/Source/core/html/TextControlElement.cpp b/third_party/WebKit/Source/core/html/TextControlElement.cpp index a3af6b0a..7dae3dda 100644 --- a/third_party/WebKit/Source/core/html/TextControlElement.cpp +++ b/third_party/WebKit/Source/core/html/TextControlElement.cpp
@@ -149,7 +149,7 @@ HTMLElement* TextControlElement::PlaceholderElement() const { return ToHTMLElementOrDie( - UserAgentShadowRoot()->GetElementById(ShadowElementNames::Placeholder())); + UserAgentShadowRoot()->getElementById(ShadowElementNames::Placeholder())); } void TextControlElement::UpdatePlaceholderVisibility() { @@ -954,7 +954,7 @@ HTMLElement* TextControlElement::InnerEditorElement() const { return ToHTMLElementOrDie( - UserAgentShadowRoot()->GetElementById(ShadowElementNames::InnerEditor())); + UserAgentShadowRoot()->getElementById(ShadowElementNames::InnerEditor())); } void TextControlElement::CopyNonAttributePropertiesFromElement(
diff --git a/third_party/WebKit/Source/core/html/TextControlElementTest.cpp b/third_party/WebKit/Source/core/html/TextControlElementTest.cpp index ba655e23..43bd09cc 100644 --- a/third_party/WebKit/Source/core/html/TextControlElementTest.cpp +++ b/third_party/WebKit/Source/core/html/TextControlElementTest.cpp
@@ -45,9 +45,9 @@ document_->documentElement()->setInnerHTML( "<body><textarea id=textarea></textarea><input id=input /></body>"); document_->View()->UpdateAllLifecyclePhases(); - text_control_ = ToTextControlElement(document_->GetElementById("textarea")); + text_control_ = ToTextControlElement(document_->getElementById("textarea")); text_control_->focus(); - input_ = toHTMLInputElement(document_->GetElementById("input")); + input_ = toHTMLInputElement(document_->getElementById("input")); } TEST_F(TextControlElementTest, SetSelectionRange) { @@ -79,7 +79,7 @@ TEST_F(TextControlElementTest, IndexForPosition) { HTMLInputElement* input = - toHTMLInputElement(GetDocument().GetElementById("input")); + toHTMLInputElement(GetDocument().getElementById("input")); input->setValue("Hello"); HTMLElement* inner_editor = input->InnerEditorElement(); EXPECT_EQ(5u, TextControlElement::IndexForPosition(
diff --git a/third_party/WebKit/Source/core/html/TimeRanges.cpp b/third_party/WebKit/Source/core/html/TimeRanges.cpp index 682563b..83b0570 100644 --- a/third_party/WebKit/Source/core/html/TimeRanges.cpp +++ b/third_party/WebKit/Source/core/html/TimeRanges.cpp
@@ -76,7 +76,7 @@ inverted->Add(end, pos_inf); } - ranges_.Swap(inverted->ranges_); + ranges_.swap(inverted->ranges_); } void TimeRanges::IntersectWith(const TimeRanges* other) { @@ -101,7 +101,7 @@ unioned->Add(range.start_, range.end_); } - ranges_.Swap(unioned->ranges_); + ranges_.swap(unioned->ranges_); } double TimeRanges::start(unsigned index,
diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasFontCacheTest.cpp b/third_party/WebKit/Source/core/html/canvas/CanvasFontCacheTest.cpp index ade05116..b5cf051 100644 --- a/third_party/WebKit/Source/core/html/canvas/CanvasFontCacheTest.cpp +++ b/third_party/WebKit/Source/core/html/canvas/CanvasFontCacheTest.cpp
@@ -55,7 +55,7 @@ document_->documentElement()->setInnerHTML( "<body><canvas id='c'></canvas></body>"); document_->View()->UpdateAllLifecyclePhases(); - canvas_element_ = toHTMLCanvasElement(document_->GetElementById("c")); + canvas_element_ = toHTMLCanvasElement(document_->getElementById("c")); String canvas_type("2d"); CanvasContextCreationAttributes attributes; attributes.setAlpha(true);
diff --git a/third_party/WebKit/Source/core/html/forms/ImageInputType.cpp b/third_party/WebKit/Source/core/html/forms/ImageInputType.cpp index 1b92afa..4458a9bec 100644 --- a/third_party/WebKit/Source/core/html/forms/ImageInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/ImageInputType.cpp
@@ -117,7 +117,7 @@ void ImageInputType::AltAttributeChanged() { if (GetElement().UserAgentShadowRoot()) { Element* text = - GetElement().UserAgentShadowRoot()->GetElementById("alttext"); + GetElement().UserAgentShadowRoot()->getElementById("alttext"); String value = GetElement().AltText(); if (text && text->textContent() != value) text->setTextContent(GetElement().AltText());
diff --git a/third_party/WebKit/Source/core/html/forms/MultipleFieldsTemporalInputTypeView.cpp b/third_party/WebKit/Source/core/html/forms/MultipleFieldsTemporalInputTypeView.cpp index 5f0d20f..9424aeec 100644 --- a/third_party/WebKit/Source/core/html/forms/MultipleFieldsTemporalInputTypeView.cpp +++ b/third_party/WebKit/Source/core/html/forms/MultipleFieldsTemporalInputTypeView.cpp
@@ -134,28 +134,28 @@ DateTimeEditElement* MultipleFieldsTemporalInputTypeView::GetDateTimeEditElement() const { return ToDateTimeEditElementOrDie( - GetElement().UserAgentShadowRoot()->GetElementById( + GetElement().UserAgentShadowRoot()->getElementById( ShadowElementNames::DateTimeEdit())); } SpinButtonElement* MultipleFieldsTemporalInputTypeView::GetSpinButtonElement() const { return ToSpinButtonElementOrDie( - GetElement().UserAgentShadowRoot()->GetElementById( + GetElement().UserAgentShadowRoot()->getElementById( ShadowElementNames::SpinButton())); } ClearButtonElement* MultipleFieldsTemporalInputTypeView::GetClearButtonElement() const { return ToClearButtonElementOrDie( - GetElement().UserAgentShadowRoot()->GetElementById( + GetElement().UserAgentShadowRoot()->getElementById( ShadowElementNames::ClearButton())); } PickerIndicatorElement* MultipleFieldsTemporalInputTypeView::GetPickerIndicatorElement() const { return ToPickerIndicatorElementOrDie( - GetElement().UserAgentShadowRoot()->GetElementById( + GetElement().UserAgentShadowRoot()->getElementById( ShadowElementNames::PickerIndicator())); }
diff --git a/third_party/WebKit/Source/core/html/forms/RangeInputType.cpp b/third_party/WebKit/Source/core/html/forms/RangeInputType.cpp index e2436956..900a5877 100644 --- a/third_party/WebKit/Source/core/html/forms/RangeInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/RangeInputType.cpp
@@ -328,12 +328,12 @@ inline SliderThumbElement* RangeInputType::GetSliderThumbElement() const { return ToSliderThumbElementOrDie( - GetElement().UserAgentShadowRoot()->GetElementById( + GetElement().UserAgentShadowRoot()->getElementById( ShadowElementNames::SliderThumb())); } inline Element* RangeInputType::SliderTrackElement() const { - return GetElement().UserAgentShadowRoot()->GetElementById( + return GetElement().UserAgentShadowRoot()->getElementById( ShadowElementNames::SliderTrack()); }
diff --git a/third_party/WebKit/Source/core/html/forms/SearchInputType.cpp b/third_party/WebKit/Source/core/html/forms/SearchInputType.cpp index dbdb1ee..d382084e 100644 --- a/third_party/WebKit/Source/core/html/forms/SearchInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/SearchInputType.cpp
@@ -75,7 +75,7 @@ void SearchInputType::CreateShadowSubtree() { TextFieldInputType::CreateShadowSubtree(); Element* container = ContainerElement(); - Element* view_port = GetElement().UserAgentShadowRoot()->GetElementById( + Element* view_port = GetElement().UserAgentShadowRoot()->getElementById( ShadowElementNames::EditingViewPort()); DCHECK(container); DCHECK(view_port); @@ -153,7 +153,7 @@ } void SearchInputType::UpdateCancelButtonVisibility() { - Element* button = GetElement().UserAgentShadowRoot()->GetElementById( + Element* button = GetElement().UserAgentShadowRoot()->getElementById( ShadowElementNames::SearchClearButton()); if (!button) return;
diff --git a/third_party/WebKit/Source/core/html/forms/SliderThumbElement.cpp b/third_party/WebKit/Source/core/html/forms/SliderThumbElement.cpp index d3c38de..3eeedce 100644 --- a/third_party/WebKit/Source/core/html/forms/SliderThumbElement.cpp +++ b/third_party/WebKit/Source/core/html/forms/SliderThumbElement.cpp
@@ -102,7 +102,7 @@ void SliderThumbElement::SetPositionFromPoint(const LayoutPoint& point) { HTMLInputElement* input(HostInput()); - Element* track_element = input->UserAgentShadowRoot()->GetElementById( + Element* track_element = input->UserAgentShadowRoot()->getElementById( ShadowElementNames::SliderTrack()); if (!input->GetLayoutObject() || !GetLayoutBox() || @@ -364,7 +364,7 @@ TouchList* touches = event->targetTouches(); SliderThumbElement* thumb = ToSliderThumbElement( - GetTreeScope().GetElementById(ShadowElementNames::SliderThumb())); + GetTreeScope().getElementById(ShadowElementNames::SliderThumb())); if (touches->length() == 1) { if (event->type() == EventTypeNames::touchstart) { start_point_ = touches->item(0)->AbsoluteLocation();
diff --git a/third_party/WebKit/Source/core/html/forms/TextFieldInputType.cpp b/third_party/WebKit/Source/core/html/forms/TextFieldInputType.cpp index 120e587..95eab068 100644 --- a/third_party/WebKit/Source/core/html/forms/TextFieldInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/TextFieldInputType.cpp
@@ -126,7 +126,7 @@ SpinButtonElement* TextFieldInputType::GetSpinButtonElement() const { return ToSpinButtonElementOrDie( - GetElement().UserAgentShadowRoot()->GetElementById( + GetElement().UserAgentShadowRoot()->getElementById( ShadowElementNames::SpinButton())); } @@ -320,7 +320,7 @@ } Element* TextFieldInputType::ContainerElement() const { - return GetElement().UserAgentShadowRoot()->GetElementById( + return GetElement().UserAgentShadowRoot()->getElementById( ShadowElementNames::TextFieldContainer()); } @@ -333,7 +333,7 @@ void TextFieldInputType::ListAttributeTargetChanged() { if (ChromeClient* chrome_client = this->GetChromeClient()) chrome_client->TextFieldDataListChanged(GetElement()); - Element* picker = GetElement().UserAgentShadowRoot()->GetElementById( + Element* picker = GetElement().UserAgentShadowRoot()->getElementById( ShadowElementNames::PickerIndicator()); bool did_have_picker_indicator = picker; bool will_have_picker_indicator = GetElement().HasValidDataListOptions();
diff --git a/third_party/WebKit/Source/core/html/media/AutoplayUmaHelperTest.cpp b/third_party/WebKit/Source/core/html/media/AutoplayUmaHelperTest.cpp index f3bc12d8..b67791f 100644 --- a/third_party/WebKit/Source/core/html/media/AutoplayUmaHelperTest.cpp +++ b/third_party/WebKit/Source/core/html/media/AutoplayUmaHelperTest.cpp
@@ -41,7 +41,7 @@ Document& GetDocument() { return page_holder_->GetDocument(); } HTMLMediaElement& MediaElement() { - Element* element = GetDocument().GetElementById("video"); + Element* element = GetDocument().getElementById("video"); DCHECK(element); return toHTMLVideoElement(*element); }
diff --git a/third_party/WebKit/Source/core/html/parser/BackgroundHTMLParser.cpp b/third_party/WebKit/Source/core/html/parser/BackgroundHTMLParser.cpp index 505ebc50..00ead606 100644 --- a/third_party/WebKit/Source/core/html/parser/BackgroundHTMLParser.cpp +++ b/third_party/WebKit/Source/core/html/parser/BackgroundHTMLParser.cpp
@@ -342,17 +342,17 @@ preload_tokenize_delay.Count(delay); } - chunk->preloads.Swap(pending_preloads_); + chunk->preloads.swap(pending_preloads_); if (viewport_description_.set) chunk->viewport = viewport_description_; - chunk->xss_infos.Swap(pending_xss_infos_); + chunk->xss_infos.swap(pending_xss_infos_); chunk->tokenizer_state = tokenizer_->GetState(); chunk->tree_builder_state = tree_builder_simulator_.GetState(); chunk->input_checkpoint = input_.CreateCheckpoint(pending_tokens_->size()); chunk->preload_scanner_checkpoint = preload_scanner_->CreateCheckpoint(); chunk->tokens = std::move(pending_tokens_); chunk->starting_script = starting_script_; - chunk->likely_document_write_script_indices.Swap( + chunk->likely_document_write_script_indices.swap( likely_document_write_script_indices_); chunk->pending_csp_meta_token_index = pending_csp_meta_token_index_; starting_script_ = false;
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.cpp b/third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.cpp index 10e6ee07..a6fe3bdf 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.cpp
@@ -323,7 +323,7 @@ // Copy the task queue into a local variable in case executeTask re-enters the // parser. TaskQueue queue; - queue.Swap(task_queue_); + queue.swap(task_queue_); for (auto& task : queue) ExecuteTask(task);
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp b/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp index 2806615..379bf39 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp
@@ -466,7 +466,7 @@ ("Parser.DiscardedTokenCount", 1, 100000, 50)); discarded_token_count_histogram.Count(discarded_token_count); - speculations_.Clear(); + speculations_.clear(); pending_csp_meta_token_ = nullptr; queued_preloads_.clear();
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLFormattingElementList.cpp b/third_party/WebKit/Source/core/html/parser/HTMLFormattingElementList.cpp index f026929..c545723 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLFormattingElementList.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLFormattingElementList.cpp
@@ -184,7 +184,7 @@ if (remaining_candidates.size() < kNoahsArkCapacity) return; - candidates.Swap(remaining_candidates); + candidates.swap(remaining_candidates); remaining_candidates.Shrink(0); }
diff --git a/third_party/WebKit/Source/core/html/parser/ResourcePreloader.cpp b/third_party/WebKit/Source/core/html/parser/ResourcePreloader.cpp index d2dfbe7..40d52c1 100644 --- a/third_party/WebKit/Source/core/html/parser/ResourcePreloader.cpp +++ b/third_party/WebKit/Source/core/html/parser/ResourcePreloader.cpp
@@ -10,7 +10,7 @@ void ResourcePreloader::TakeAndPreload(PreloadRequestStream& r) { PreloadRequestStream requests; NetworkHintsInterfaceImpl network_hints_interface; - requests.Swap(r); + requests.swap(r); for (PreloadRequestStream::iterator it = requests.begin(); it != requests.end(); ++it)
diff --git a/third_party/WebKit/Source/core/html/parser/TokenizedChunkQueue.cpp b/third_party/WebKit/Source/core/html/parser/TokenizedChunkQueue.cpp index 1289fff..dac3543 100644 --- a/third_party/WebKit/Source/core/html/parser/TokenizedChunkQueue.cpp +++ b/third_party/WebKit/Source/core/html/parser/TokenizedChunkQueue.cpp
@@ -36,7 +36,7 @@ void TokenizedChunkQueue::TakeAll( Vector<std::unique_ptr<HTMLDocumentParser::TokenizedChunk>>& vector) { DCHECK(vector.IsEmpty()); - pending_chunks_.Swap(vector); + pending_chunks_.swap(vector); } size_t TokenizedChunkQueue::PeakPendingChunkCount() {
diff --git a/third_party/WebKit/Source/core/html/track/vtt/VTTParser.cpp b/third_party/WebKit/Source/core/html/track/vtt/VTTParser.cpp index 70e0860..385ea3ec 100644 --- a/third_party/WebKit/Source/core/html/track/vtt/VTTParser.cpp +++ b/third_party/WebKit/Source/core/html/track/vtt/VTTParser.cpp
@@ -89,7 +89,7 @@ void VTTParser::GetNewCues(HeapVector<Member<TextTrackCue>>& output_cues) { DCHECK(output_cues.IsEmpty()); - output_cues.Swap(cue_list_); + output_cues.swap(cue_list_); } void VTTParser::ParseBytes(const char* data, size_t length) {
diff --git a/third_party/WebKit/Source/core/input/EventHandlerTest.cpp b/third_party/WebKit/Source/core/input/EventHandlerTest.cpp index ab27ef7..2a0c6f7 100644 --- a/third_party/WebKit/Source/core/input/EventHandlerTest.cpp +++ b/third_party/WebKit/Source/core/input/EventHandlerTest.cpp
@@ -155,7 +155,7 @@ "<body contenteditable='true'><span class='line' id='line'>One Two " "Three</span></body>"); - Node* line = GetDocument().GetElementById("line")->firstChild(); + Node* line = GetDocument().getElementById("line")->firstChild(); TapEventBuilder single_tap_event(IntPoint(0, 0), 1); GetDocument().GetFrame()->GetEventHandler().HandleGestureEvent( @@ -205,7 +205,7 @@ "height: 30px; } </style>" "<span class='line' id='line'>One Two Three</span>"); - Node* line = GetDocument().GetElementById("line")->firstChild(); + Node* line = GetDocument().getElementById("line")->firstChild(); TapEventBuilder single_tap_event(IntPoint(0, 0), 1); GetDocument().GetFrame()->GetEventHandler().HandleGestureEvent(
diff --git a/third_party/WebKit/Source/core/input/PointerEventManager.cpp b/third_party/WebKit/Source/core/input/PointerEventManager.cpp index b67374f..b4bf754 100644 --- a/third_party/WebKit/Source/core/input/PointerEventManager.cpp +++ b/third_party/WebKit/Source/core/input/PointerEventManager.cpp
@@ -66,7 +66,7 @@ touch_event_manager_->Clear(); in_canceled_state_for_pointer_type_touch_ = false; pointer_event_factory_.Clear(); - touch_ids_for_canceled_pointerdowns_.Clear(); + touch_ids_for_canceled_pointerdowns_.clear(); node_under_pointer_.clear(); pointer_capture_target_.clear(); pending_pointer_capture_target_.clear();
diff --git a/third_party/WebKit/Source/core/inspector/ConsoleMessageStorage.cpp b/third_party/WebKit/Source/core/inspector/ConsoleMessageStorage.cpp index 4766bab..07a80aa 100644 --- a/third_party/WebKit/Source/core/inspector/ConsoleMessageStorage.cpp +++ b/third_party/WebKit/Source/core/inspector/ConsoleMessageStorage.cpp
@@ -25,7 +25,7 @@ } void ConsoleMessageStorage::Clear() { - messages_.Clear(); + messages_.clear(); expired_count_ = 0; }
diff --git a/third_party/WebKit/Source/core/inspector/NetworkResourcesData.cpp b/third_party/WebKit/Source/core/inspector/NetworkResourcesData.cpp index 4dd18aa9..bddc64f 100644 --- a/third_party/WebKit/Source/core/inspector/NetworkResourcesData.cpp +++ b/third_party/WebKit/Source/core/inspector/NetworkResourcesData.cpp
@@ -381,7 +381,7 @@ void NetworkResourcesData::Clear(const String& preserved_loader_id) { if (!request_id_to_resource_data_map_.size()) return; - request_ids_deque_.Clear(); + request_ids_deque_.clear(); content_size_ = 0; ResourceDataMap preserved_map;
diff --git a/third_party/WebKit/Source/core/layout/ImageQualityControllerTest.cpp b/third_party/WebKit/Source/core/layout/ImageQualityControllerTest.cpp index 28de305..d4f9424 100644 --- a/third_party/WebKit/Source/core/layout/ImageQualityControllerTest.cpp +++ b/third_party/WebKit/Source/core/layout/ImageQualityControllerTest.cpp
@@ -221,9 +221,9 @@ "<img id='myAnimatingImage' src='myimage'></img> <img " "id='myNonAnimatingImage' src='myimage2'></img>"); LayoutImage* animating_image = ToLayoutImage( - GetDocument().GetElementById("myAnimatingImage")->GetLayoutObject()); + GetDocument().getElementById("myAnimatingImage")->GetLayoutObject()); LayoutImage* non_animating_image = ToLayoutImage( - GetDocument().GetElementById("myNonAnimatingImage")->GetLayoutObject()); + GetDocument().getElementById("myNonAnimatingImage")->GetLayoutObject()); RefPtr<TestImageLowQuality> test_image = AdoptRef(new TestImageLowQuality); std::unique_ptr<PaintController> paint_controller = PaintController::Create();
diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp b/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp index a4d3b0b..88b6440 100644 --- a/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp +++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
@@ -1060,7 +1060,7 @@ FloatingObjectSetIterator end = floating_object_set.end(); if (layout_state.LastFloat()) { FloatingObjectSetIterator last_float_iterator = - floating_object_set.Find(layout_state.LastFloat()); + floating_object_set.find(layout_state.LastFloat()); DCHECK(last_float_iterator != end); ++last_float_iterator; it = last_float_iterator;
diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockTest.cpp b/third_party/WebKit/Source/core/layout/LayoutBlockTest.cpp index 02531c8..03d9f975 100644 --- a/third_party/WebKit/Source/core/layout/LayoutBlockTest.cpp +++ b/third_party/WebKit/Source/core/layout/LayoutBlockTest.cpp
@@ -33,7 +33,7 @@ " <div style='height:20px'>Item</div>" " <div style='height:20px'>Item</div>" "</div>"); - Element* list_element = GetDocument().GetElementById("list"); + Element* list_element = GetDocument().getElementById("list"); ASSERT_TRUE(list_element); LayoutBox* list_box = ToLayoutBox(list_element->GetLayoutObject()); Element* item_element = ElementTraversal::FirstChild(*list_element);
diff --git a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp index 45138328..2765ac21 100644 --- a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp +++ b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
@@ -439,7 +439,7 @@ size_t non_empty_tracks_after_end_line = grid.NumTracks(direction) - end_line; auto current_empty_track = - grid.AutoRepeatEmptyTracks(direction)->Find(end_line - 1); + grid.AutoRepeatEmptyTracks(direction)->find(end_line - 1); auto end_empty_track = grid.AutoRepeatEmptyTracks(direction)->end(); // HashSet iterators do not implement operator- so we have to manually // iterate to know the number of remaining empty tracks.
diff --git a/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp b/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp index bc5b01e..7d2e99a 100644 --- a/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp +++ b/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp
@@ -892,7 +892,7 @@ if (LayoutMultiColumnSet* next_set = column_set->NextSiblingMultiColumnSet()) { LayoutMultiColumnSetList::iterator it = - multi_column_set_list_.Find(next_set); + multi_column_set_list_.find(next_set); DCHECK(it != multi_column_set_list_.end()); multi_column_set_list_.InsertBefore(it, column_set); } else {
diff --git a/third_party/WebKit/Source/core/layout/LayoutObjectTest.cpp b/third_party/WebKit/Source/core/layout/LayoutObjectTest.cpp index 6c30269f..11469d3 100644 --- a/third_party/WebKit/Source/core/layout/LayoutObjectTest.cpp +++ b/third_party/WebKit/Source/core/layout/LayoutObjectTest.cpp
@@ -20,7 +20,7 @@ TEST_F(LayoutObjectTest, LayoutDecoratedNameCalledWithPositionedObject) { SetBodyInnerHTML("<div id='div' style='position: fixed'>test</div>"); - Element* div = GetDocument().GetElementById(AtomicString("div")); + Element* div = GetDocument().getElementById(AtomicString("div")); DCHECK(div); LayoutObject* obj = div->GetLayoutObject(); DCHECK(obj);
diff --git a/third_party/WebKit/Source/core/layout/LayoutProgressTest.cpp b/third_party/WebKit/Source/core/layout/LayoutProgressTest.cpp index 2c63ab3..14e09f1 100644 --- a/third_party/WebKit/Source/core/layout/LayoutProgressTest.cpp +++ b/third_party/WebKit/Source/core/layout/LayoutProgressTest.cpp
@@ -24,7 +24,7 @@ "<progress id=\"progressElement\" value=0.3 max=1.0></progress>"); GetDocument().View()->UpdateAllLifecyclePhases(); Element* progress_element = - GetDocument().GetElementById(AtomicString("progressElement")); + GetDocument().getElementById(AtomicString("progressElement")); LayoutProgress* layout_progress = ToLayoutProgress(progress_element->GetLayoutObject());
diff --git a/third_party/WebKit/Source/core/layout/LayoutSearchField.cpp b/third_party/WebKit/Source/core/layout/LayoutSearchField.cpp index 51dd291..5f9f9ec 100644 --- a/third_party/WebKit/Source/core/layout/LayoutSearchField.cpp +++ b/third_party/WebKit/Source/core/layout/LayoutSearchField.cpp
@@ -43,12 +43,12 @@ LayoutSearchField::~LayoutSearchField() {} inline Element* LayoutSearchField::SearchDecorationElement() const { - return InputElement()->UserAgentShadowRoot()->GetElementById( + return InputElement()->UserAgentShadowRoot()->getElementById( ShadowElementNames::SearchDecoration()); } inline Element* LayoutSearchField::CancelButtonElement() const { - return InputElement()->UserAgentShadowRoot()->GetElementById( + return InputElement()->UserAgentShadowRoot()->getElementById( ShadowElementNames::ClearButton()); }
diff --git a/third_party/WebKit/Source/core/layout/LayoutSlider.cpp b/third_party/WebKit/Source/core/layout/LayoutSlider.cpp index d9feea0..a6bd208 100644 --- a/third_party/WebKit/Source/core/layout/LayoutSlider.cpp +++ b/third_party/WebKit/Source/core/layout/LayoutSlider.cpp
@@ -59,7 +59,7 @@ inline SliderThumbElement* LayoutSlider::GetSliderThumbElement() const { return ToSliderThumbElement( - ToElement(GetNode())->UserAgentShadowRoot()->GetElementById( + ToElement(GetNode())->UserAgentShadowRoot()->getElementById( ShadowElementNames::SliderThumb())); }
diff --git a/third_party/WebKit/Source/core/layout/LayoutSliderContainer.cpp b/third_party/WebKit/Source/core/layout/LayoutSliderContainer.cpp index 090b693..fc4b6f2d 100644 --- a/third_party/WebKit/Source/core/layout/LayoutSliderContainer.cpp +++ b/third_party/WebKit/Source/core/layout/LayoutSliderContainer.cpp
@@ -108,9 +108,9 @@ MutableStyleRef().SetDirection(TextDirection::kLtr); } - Element* thumb_element = input->UserAgentShadowRoot()->GetElementById( + Element* thumb_element = input->UserAgentShadowRoot()->getElementById( ShadowElementNames::SliderThumb()); - Element* track_element = input->UserAgentShadowRoot()->GetElementById( + Element* track_element = input->UserAgentShadowRoot()->getElementById( ShadowElementNames::SliderTrack()); LayoutBox* thumb = thumb_element ? thumb_element->GetLayoutBox() : 0; LayoutBox* track = track_element ? track_element->GetLayoutBox() : 0;
diff --git a/third_party/WebKit/Source/core/layout/LayoutTableCellTest.cpp b/third_party/WebKit/Source/core/layout/LayoutTableCellTest.cpp index 45fa034..4daee62 100644 --- a/third_party/WebKit/Source/core/layout/LayoutTableCellTest.cpp +++ b/third_party/WebKit/Source/core/layout/LayoutTableCellTest.cpp
@@ -156,10 +156,10 @@ SetBodyInnerHTML(body_content); // Create an overflow recalc. - Element* cell = GetDocument().GetElementById(AtomicString("cell")); + Element* cell = GetDocument().getElementById(AtomicString("cell")); cell->setAttribute(HTMLNames::styleAttr, "outline: 1px solid black;"); // Trigger a layout on the table that doesn't require cell layout. - Element* table = GetDocument().GetElementById(AtomicString("table")); + Element* table = GetDocument().getElementById(AtomicString("table")); table->setAttribute(HTMLNames::styleAttr, "position: absolute; left: 2px;"); GetDocument().View()->UpdateAllLifecyclePhases();
diff --git a/third_party/WebKit/Source/core/layout/LayoutTestHelper.h b/third_party/WebKit/Source/core/layout/LayoutTestHelper.h index 6211bdf..3242fe1 100644 --- a/third_party/WebKit/Source/core/layout/LayoutTestHelper.h +++ b/third_party/WebKit/Source/core/layout/LayoutTestHelper.h
@@ -111,7 +111,7 @@ } LayoutObject* GetLayoutObjectByElementId(const char* id) const { - Node* node = GetDocument().GetElementById(id); + Node* node = GetDocument().getElementById(id); return node ? node->GetLayoutObject() : nullptr; }
diff --git a/third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.cpp b/third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.cpp index eaec3c7..8fb4b4e 100644 --- a/third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.cpp +++ b/third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.cpp
@@ -51,18 +51,18 @@ LayoutTextControlSingleLine::~LayoutTextControlSingleLine() {} inline Element* LayoutTextControlSingleLine::ContainerElement() const { - return InputElement()->UserAgentShadowRoot()->GetElementById( + return InputElement()->UserAgentShadowRoot()->getElementById( ShadowElementNames::TextFieldContainer()); } inline Element* LayoutTextControlSingleLine::EditingViewPortElement() const { - return InputElement()->UserAgentShadowRoot()->GetElementById( + return InputElement()->UserAgentShadowRoot()->getElementById( ShadowElementNames::EditingViewPort()); } inline HTMLElement* LayoutTextControlSingleLine::InnerSpinButtonElement() const { - return ToHTMLElement(InputElement()->UserAgentShadowRoot()->GetElementById( + return ToHTMLElement(InputElement()->UserAgentShadowRoot()->getElementById( ShadowElementNames::SpinButton())); }
diff --git a/third_party/WebKit/Source/core/layout/LayoutThemeTest.cpp b/third_party/WebKit/Source/core/layout/LayoutThemeTest.cpp index 88b81e1..a1488be 100644 --- a/third_party/WebKit/Source/core/layout/LayoutThemeTest.cpp +++ b/third_party/WebKit/Source/core/layout/LayoutThemeTest.cpp
@@ -52,7 +52,7 @@ TEST_F(LayoutThemeTest, ChangeFocusRingColor) { SetHtmlInnerHTML("<span id=span tabIndex=0>Span</span>"); - Element* span = GetDocument().GetElementById(AtomicString("span")); + Element* span = GetDocument().getElementById(AtomicString("span")); EXPECT_NE(nullptr, span); EXPECT_NE(nullptr, span->GetLayoutObject());
diff --git a/third_party/WebKit/Source/core/layout/MapCoordinatesTest.cpp b/third_party/WebKit/Source/core/layout/MapCoordinatesTest.cpp index b444ba6..bd9d5aa 100644 --- a/third_party/WebKit/Source/core/layout/MapCoordinatesTest.cpp +++ b/third_party/WebKit/Source/core/layout/MapCoordinatesTest.cpp
@@ -702,7 +702,7 @@ ScrollOffset(0.0, 1000), kProgrammaticScroll); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* target = ChildDocument().GetElementById("target"); + Element* target = ChildDocument().getElementById("target"); ASSERT_TRUE(target); FloatPoint mapped_point = MapAncestorToLocal(target->GetLayoutObject(), nullptr, FloatPoint(10, 70), @@ -732,7 +732,7 @@ ScrollOffset(0.0, 1000), kProgrammaticScroll); ChildDocument().View()->UpdateAllLifecyclePhases(); - Element* target = ChildDocument().GetElementById("target"); + Element* target = ChildDocument().getElementById("target"); ASSERT_TRUE(target); FloatPoint mapped_point = MapAncestorToLocal( target->GetLayoutObject(), nullptr, FloatPoint(200, 200), @@ -766,7 +766,7 @@ ScrollOffset(0.0, 1000), kProgrammaticScroll); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* target = ChildDocument().GetElementById("target"); + Element* target = ChildDocument().getElementById("target"); ASSERT_TRUE(target); FloatPoint mapped_point = MapAncestorToLocal(target->GetLayoutObject(), nullptr, FloatPoint(0, 0),
diff --git a/third_party/WebKit/Source/core/layout/PaintContainmentTest.cpp b/third_party/WebKit/Source/core/layout/PaintContainmentTest.cpp index c73c5103..9fc241fd 100644 --- a/third_party/WebKit/Source/core/layout/PaintContainmentTest.cpp +++ b/third_party/WebKit/Source/core/layout/PaintContainmentTest.cpp
@@ -34,7 +34,7 @@ TEST_F(PaintContainmentTest, BlockPaintContainment) { SetBodyInnerHTML("<div id='div' style='contain: paint'></div>"); - Element* div = GetDocument().GetElementById(AtomicString("div")); + Element* div = GetDocument().getElementById(AtomicString("div")); DCHECK(div); LayoutObject* obj = div->GetLayoutObject(); DCHECK(obj); @@ -48,7 +48,7 @@ TEST_F(PaintContainmentTest, InlinePaintContainment) { SetBodyInnerHTML( "<div><span id='test' style='contain: paint'>Foo</span></div>"); - Element* span = GetDocument().GetElementById(AtomicString("test")); + Element* span = GetDocument().getElementById(AtomicString("test")); DCHECK(span); // The inline should have been coerced into a block in StyleAdjuster. LayoutObject* obj = span->GetLayoutObject();
diff --git a/third_party/WebKit/Source/core/layout/ScrollAnchorTest.cpp b/third_party/WebKit/Source/core/layout/ScrollAnchorTest.cpp index 0f5729a7..572aa8b 100644 --- a/third_party/WebKit/Source/core/layout/ScrollAnchorTest.cpp +++ b/third_party/WebKit/Source/core/layout/ScrollAnchorTest.cpp
@@ -90,12 +90,12 @@ 0); // Height changed, verify metric updated once. - SetHeight(GetDocument().GetElementById("block1"), 200); + SetHeight(GetDocument().getElementById("block1"), 200); histogram_tester.ExpectUniqueSample( "Layout.ScrollAnchor.AdjustedScrollOffset", 1, 1); EXPECT_EQ(250, viewport->ScrollOffsetInt().Height()); - EXPECT_EQ(GetDocument().GetElementById("block2")->GetLayoutObject(), + EXPECT_EQ(GetDocument().getElementById("block2")->GetLayoutObject(), GetScrollAnchor(viewport).AnchorObject()); } @@ -111,10 +111,10 @@ EXPECT_EQ(nullptr, GetScrollAnchor(viewport).AnchorObject()); ScrollLayoutViewport(ScrollOffset(0, 150)); - SetHeight(GetDocument().GetElementById("block1"), 200); + SetHeight(GetDocument().getElementById("block1"), 200); EXPECT_EQ(250, viewport->ScrollOffsetInt().Height()); - EXPECT_EQ(GetDocument().GetElementById("block2")->GetLayoutObject(), + EXPECT_EQ(GetDocument().getElementById("block2")->GetLayoutObject(), GetScrollAnchor(viewport).AnchorObject()); // ScrollableArea::userScroll should clear the anchor. @@ -141,16 +141,16 @@ // Scroll the visual viewport to bring #text to the top. int top = - GetDocument().GetElementById("text")->getBoundingClientRect()->top(); + GetDocument().getElementById("text")->getBoundingClientRect()->top(); v_viewport.SetLocation(FloatPoint(0, top)); - SetHeight(GetDocument().GetElementById("div"), 10); - EXPECT_EQ(GetDocument().GetElementById("text")->GetLayoutObject(), + SetHeight(GetDocument().getElementById("div"), 10); + EXPECT_EQ(GetDocument().getElementById("text")->GetLayoutObject(), GetScrollAnchor(l_viewport).AnchorObject()); EXPECT_EQ(top - 90, v_viewport.ScrollOffsetInt().Height()); - SetHeight(GetDocument().GetElementById("div"), 100); - EXPECT_EQ(GetDocument().GetElementById("text")->GetLayoutObject(), + SetHeight(GetDocument().getElementById("div"), 100); + EXPECT_EQ(GetDocument().getElementById("text")->GetLayoutObject(), GetScrollAnchor(l_viewport).AnchorObject()); EXPECT_EQ(top, v_viewport.ScrollOffsetInt().Height()); @@ -181,20 +181,20 @@ "<div id='outerAnchor' class='anchor'></div>"); ScrollableArea* scroller = - ScrollerForElement(GetDocument().GetElementById("scroller")); + ScrollerForElement(GetDocument().getElementById("scroller")); ScrollableArea* viewport = LayoutViewport(); - GetDocument().GetElementById("scroller")->setScrollTop(100); + GetDocument().getElementById("scroller")->setScrollTop(100); ScrollLayoutViewport(ScrollOffset(0, 350)); - SetHeight(GetDocument().GetElementById("innerChanger"), 200); - SetHeight(GetDocument().GetElementById("outerChanger"), 150); + SetHeight(GetDocument().getElementById("innerChanger"), 200); + SetHeight(GetDocument().getElementById("outerChanger"), 150); EXPECT_EQ(300, scroller->ScrollOffsetInt().Height()); - EXPECT_EQ(GetDocument().GetElementById("innerAnchor")->GetLayoutObject(), + EXPECT_EQ(GetDocument().getElementById("innerAnchor")->GetLayoutObject(), GetScrollAnchor(scroller).AnchorObject()); EXPECT_EQ(500, viewport->ScrollOffsetInt().Height()); - EXPECT_EQ(GetDocument().GetElementById("outerAnchor")->GetLayoutObject(), + EXPECT_EQ(GetDocument().getElementById("outerAnchor")->GetLayoutObject(), GetScrollAnchor(viewport).AnchorObject()); } @@ -214,10 +214,10 @@ ScrollableArea* viewport = LayoutViewport(); ScrollLayoutViewport(ScrollOffset(0, 1600)); - SetHeight(GetDocument().GetElementById("changer"), 0); + SetHeight(GetDocument().getElementById("changer"), 0); EXPECT_EQ(100, viewport->ScrollOffsetInt().Height()); - EXPECT_EQ(GetDocument().GetElementById("anchor")->GetLayoutObject(), + EXPECT_EQ(GetDocument().getElementById("anchor")->GetLayoutObject(), GetScrollAnchor(viewport).AnchorObject()); } @@ -239,14 +239,14 @@ "</div>"); ScrollableArea* scroller = - ScrollerForElement(GetDocument().GetElementById("scroller")); + ScrollerForElement(GetDocument().getElementById("scroller")); - GetDocument().GetElementById("scroller")->setScrollTop(1600); + GetDocument().getElementById("scroller")->setScrollTop(1600); - SetHeight(GetDocument().GetElementById("changer"), 0); + SetHeight(GetDocument().getElementById("changer"), 0); EXPECT_EQ(100, scroller->ScrollOffsetInt().Height()); - EXPECT_EQ(GetDocument().GetElementById("anchor")->GetLayoutObject(), + EXPECT_EQ(GetDocument().getElementById("anchor")->GetLayoutObject(), GetScrollAnchor(scroller).AnchorObject()); } @@ -265,15 +265,15 @@ ScrollableArea* viewport = LayoutViewport(); ScrollLayoutViewport(ScrollOffset(0, 250)); - SetHeight(GetDocument().GetElementById("changer"), 300); + SetHeight(GetDocument().getElementById("changer"), 300); EXPECT_EQ(350, viewport->ScrollOffsetInt().Height()); - EXPECT_EQ(GetDocument().GetElementById("anchor")->GetLayoutObject(), + EXPECT_EQ(GetDocument().getElementById("anchor")->GetLayoutObject(), GetScrollAnchor(viewport).AnchorObject()); // Scrolling the nested scroller should clear the anchor on the main frame. ScrollableArea* scroller = - ScrollerForElement(GetDocument().GetElementById("scroller")); + ScrollerForElement(GetDocument().getElementById("scroller")); scroller->ScrollBy(ScrollOffset(0, 100), kUserScroll); EXPECT_EQ(nullptr, GetScrollAnchor(viewport).AnchorObject()); } @@ -297,9 +297,9 @@ "<div id='s2' class='scroller'>" " <div class='space'></div>" "</div>"); - Element* s1 = GetDocument().GetElementById("s1"); - Element* s2 = GetDocument().GetElementById("s2"); - Element* anchor = GetDocument().GetElementById("anchor"); + Element* s1 = GetDocument().getElementById("s1"); + Element* s2 = GetDocument().getElementById("s2"); + Element* anchor = GetDocument().getElementById("anchor"); // Set non-zero scroll offsets for #s1 and #document s1->setScrollTop(100); @@ -328,7 +328,7 @@ ScrollableArea* viewport = LayoutViewport(); ScrollLayoutViewport(ScrollOffset(0, 100)); - GetDocument().GetElementById("block1")->setAttribute(HTMLNames::styleAttr, + GetDocument().getElementById("block1")->setAttribute(HTMLNames::styleAttr, "height: 50.6px"); Update(); @@ -349,9 +349,9 @@ "</div></div>"); ScrollableArea* scroller = - ScrollerForElement(GetDocument().GetElementById("scroller")); - Element* block1 = GetDocument().GetElementById("block1"); - Element* block2 = GetDocument().GetElementById("block2"); + ScrollerForElement(GetDocument().getElementById("scroller")); + Element* block1 = GetDocument().getElementById("block1"); + Element* block2 = GetDocument().getElementById("block2"); scroller->ScrollBy(ScrollOffset(0, 150), kUserScroll); @@ -387,10 +387,10 @@ ScrollableArea* viewport = LayoutViewport(); ScrollableArea* scroller = - ScrollerForElement(GetDocument().GetElementById("scroller")); - Element* changer1 = GetDocument().GetElementById("changer1"); - Element* changer2 = GetDocument().GetElementById("changer2"); - Element* anchor = GetDocument().GetElementById("anchor"); + ScrollerForElement(GetDocument().getElementById("scroller")); + Element* changer1 = GetDocument().getElementById("changer1"); + Element* changer2 = GetDocument().getElementById("changer2"); + Element* anchor = GetDocument().getElementById("anchor"); scroller->ScrollBy(ScrollOffset(0, 150), kUserScroll); ScrollLayoutViewport(ScrollOffset(0, 50)); @@ -406,7 +406,7 @@ GetScrollAnchor(viewport).AnchorObject()); // Test that the inner scroller can be destroyed without crashing. - GetDocument().GetElementById("scroller")->remove(); + GetDocument().getElementById("scroller")->remove(); Update(); } @@ -427,14 +427,14 @@ "<div id=a>after</div>"); ScrollableArea* viewport = LayoutViewport(); - Element* inline_elem = GetDocument().GetElementById("inline"); + Element* inline_elem = GetDocument().getElementById("inline"); EXPECT_TRUE(inline_elem->GetLayoutObject()->Parent()->IsAnonymous()); // Scroll #div into view, making anonymous block a viable candidate. - GetDocument().GetElementById("div")->scrollIntoView(); + GetDocument().getElementById("div")->scrollIntoView(); // Trigger layout and verify that we don't anchor to the anonymous block. - SetHeight(GetDocument().GetElementById("a"), 100); + SetHeight(GetDocument().getElementById("a"), 100); Update(); EXPECT_EQ(inline_elem->GetLayoutObject()->SlowFirstChild(), GetScrollAnchor(viewport).AnchorObject()); @@ -460,10 +460,10 @@ ScrollLayoutViewport(ScrollOffset(0, 150)); - Element* ib1 = GetDocument().GetElementById("ib1"); + Element* ib1 = GetDocument().getElementById("ib1"); ib1->setAttribute(HTMLNames::styleAttr, "line-height: 150px"); Update(); - EXPECT_EQ(GetDocument().GetElementById("ib2")->GetLayoutObject(), + EXPECT_EQ(GetDocument().getElementById("ib2")->GetLayoutObject(), GetScrollAnchor(LayoutViewport()).AnchorObject()); } @@ -483,9 +483,9 @@ ScrollLayoutViewport(ScrollOffset(0, 150)); - SetHeight(GetDocument().GetElementById("a"), 100); + SetHeight(GetDocument().getElementById("a"), 100); EXPECT_EQ( - GetDocument().GetElementById("b")->GetLayoutObject()->SlowFirstChild(), + GetDocument().getElementById("b")->GetLayoutObject()->SlowFirstChild(), GetScrollAnchor(LayoutViewport()).AnchorObject()); } @@ -502,8 +502,8 @@ ScrollLayoutViewport(ScrollOffset(0, 50)); - SetHeight(GetDocument().GetElementById("a"), 100); - EXPECT_EQ(GetDocument().GetElementById("c")->GetLayoutObject(), + SetHeight(GetDocument().getElementById("a"), 100); + EXPECT_EQ(GetDocument().getElementById("c")->GetLayoutObject(), GetScrollAnchor(LayoutViewport()).AnchorObject()); } @@ -530,13 +530,13 @@ " <div id=a>after</div>" "</div></div>"); - Element* scroller_element = GetDocument().GetElementById("scroller"); + Element* scroller_element = GetDocument().getElementById("scroller"); ScrollableArea* scroller = ScrollerForElement(scroller_element); - Element* abs_pos = GetDocument().GetElementById("abs"); - Element* rel_pos = GetDocument().GetElementById("rel"); + Element* abs_pos = GetDocument().getElementById("abs"); + Element* rel_pos = GetDocument().getElementById("rel"); scroller->ScrollBy(ScrollOffset(0, 25), kUserScroll); - SetHeight(GetDocument().GetElementById("a"), 100); + SetHeight(GetDocument().getElementById("a"), 100); // When the scroller is position:static, the anchor cannot be // position:absolute. @@ -546,7 +546,7 @@ scroller_element->setAttribute(HTMLNames::styleAttr, "position: relative"); Update(); scroller->ScrollBy(ScrollOffset(0, 25), kUserScroll); - SetHeight(GetDocument().GetElementById("a"), 125); + SetHeight(GetDocument().getElementById("a"), 125); // When the scroller is position:relative, the anchor may be // position:absolute. @@ -578,7 +578,7 @@ "</div>"); ScrollLayoutViewport(ScrollOffset(0, 120)); - SetHeight(GetDocument().GetElementById("changer"), 100); + SetHeight(GetDocument().getElementById("changer"), 100); EXPECT_EQ(220, LayoutViewport()->ScrollOffsetInt().Height()); } @@ -603,10 +603,10 @@ ScrollableArea* viewport = LayoutViewport(); ScrollLayoutViewport(ScrollOffset(0, 200)); - SetHeight(GetDocument().GetElementById("changer"), 200); + SetHeight(GetDocument().getElementById("changer"), 200); EXPECT_EQ(300, viewport->ScrollOffsetInt().Height()); - EXPECT_EQ(GetDocument().GetElementById("bottom")->GetLayoutObject(), + EXPECT_EQ(GetDocument().getElementById("bottom")->GetLayoutObject(), GetScrollAnchor(viewport).AnchorObject()); } @@ -631,7 +631,7 @@ ScrollableArea* viewport = LayoutViewport(); ScrollLayoutViewport(ScrollOffset(0, 250)); - SetHeight(GetDocument().GetElementById("changer"), 200); + SetHeight(GetDocument().getElementById("changer"), 200); EXPECT_EQ(350, viewport->ScrollOffsetInt().Height()); } @@ -659,17 +659,17 @@ EXPECT_EQ( 0, - ToLayoutBox(GetDocument().GetElementById("zeroheight")->GetLayoutObject()) + ToLayoutBox(GetDocument().getElementById("zeroheight")->GetLayoutObject()) ->Size() .Height()); ScrollableArea* viewport = LayoutViewport(); ScrollLayoutViewport(ScrollOffset(0, 200)); - SetHeight(GetDocument().GetElementById("a"), 100); + SetHeight(GetDocument().getElementById("a"), 100); EXPECT_EQ(200, viewport->ScrollOffsetInt().Height()); - EXPECT_EQ(GetDocument().GetElementById("float")->GetLayoutObject(), + EXPECT_EQ(GetDocument().getElementById("float")->GetLayoutObject(), GetScrollAnchor(viewport).AnchorObject()); } @@ -688,7 +688,7 @@ ScrollableArea* viewport = LayoutViewport(); ScrollLayoutViewport(ScrollOffset(0, 200)); - GetDocument().GetElementById("header")->setAttribute(HTMLNames::styleAttr, + GetDocument().getElementById("header")->setAttribute(HTMLNames::styleAttr, "position: fixed;"); Update(); @@ -713,10 +713,10 @@ "</div>"); ScrollableArea* scroller = - ScrollerForElement(GetDocument().GetElementById("scroller")); - GetDocument().GetElementById("scroller")->setScrollTop(100); + ScrollerForElement(GetDocument().getElementById("scroller")); + GetDocument().getElementById("scroller")->setScrollTop(100); - GetDocument().GetElementById("changer")->setAttribute(HTMLNames::styleAttr, + GetDocument().getElementById("changer")->setAttribute(HTMLNames::styleAttr, "position: absolute;"); Update(); @@ -746,10 +746,10 @@ " </div>" "</div>"); - Element* scroller = GetDocument().GetElementById("scroller"); + Element* scroller = GetDocument().getElementById("scroller"); scroller->setScrollTop(100); - SetHeight(GetDocument().GetElementById("before"), 100); + SetHeight(GetDocument().getElementById("before"), 100); EXPECT_EQ(150, ScrollerForElement(scroller)->ScrollOffsetInt().Height()); } @@ -775,10 +775,10 @@ " </div>" "</div>"); - Element* scroller = GetDocument().GetElementById("scroller"); + Element* scroller = GetDocument().getElementById("scroller"); scroller->setScrollTop(100); - GetDocument().GetElementById("spacer")->setAttribute(HTMLNames::styleAttr, + GetDocument().getElementById("spacer")->setAttribute(HTMLNames::styleAttr, "margin-top: 50px"); Update(); EXPECT_EQ(100, ScrollerForElement(scroller)->ScrollOffsetInt().Height()); @@ -807,23 +807,23 @@ ScrollLayoutViewport(ScrollOffset(0, 50)); // No opt-out. - SetHeight(GetDocument().GetElementById("changer"), 100); + SetHeight(GetDocument().getElementById("changer"), 100); EXPECT_EQ(150, viewport->ScrollOffsetInt().Height()); - EXPECT_EQ(GetDocument().GetElementById("innerDiv")->GetLayoutObject(), + EXPECT_EQ(GetDocument().getElementById("innerDiv")->GetLayoutObject(), GetScrollAnchor(viewport).AnchorObject()); // Clear anchor and opt-out element. ScrollLayoutViewport(ScrollOffset(0, 10)); GetDocument() - .GetElementById("firstDiv") + .getElementById("firstDiv") ->setAttribute(HTMLNames::styleAttr, AtomicString("overflow-anchor: none")); Update(); // Opted out element and it's children skipped. - SetHeight(GetDocument().GetElementById("changer"), 200); + SetHeight(GetDocument().getElementById("changer"), 200); EXPECT_EQ(260, viewport->ScrollOffsetInt().Height()); - EXPECT_EQ(GetDocument().GetElementById("secondDiv")->GetLayoutObject(), + EXPECT_EQ(GetDocument().getElementById("secondDiv")->GetLayoutObject(), GetScrollAnchor(viewport).AnchorObject()); } @@ -853,10 +853,10 @@ ScrollLayoutViewport(ScrollOffset(0, 150)); GetDocument().body()->setAttribute(HTMLNames::styleAttr, "color: red"); - SetHeight(GetDocument().GetElementById("block1"), 200); + SetHeight(GetDocument().getElementById("block1"), 200); EXPECT_EQ(250, viewport->ScrollOffsetInt().Height()); - EXPECT_EQ(GetDocument().GetElementById("block2")->GetLayoutObject(), + EXPECT_EQ(GetDocument().getElementById("block2")->GetLayoutObject(), GetScrollAnchor(viewport).AnchorObject()); } @@ -872,13 +872,13 @@ ScrollableArea* viewport = LayoutViewport(); ScrollLayoutViewport(ScrollOffset(0, 50)); - GetDocument().GetElementById("block1")->setAttribute( + GetDocument().getElementById("block1")->setAttribute( HTMLNames::styleAttr, "transform: matrix(1, 0, 0, 1, 25, 25);"); Update(); - GetDocument().GetElementById("block1")->setAttribute( + GetDocument().getElementById("block1")->setAttribute( HTMLNames::styleAttr, "transform: matrix(1, 0, 0, 1, 50, 50);"); - SetHeight(GetDocument().GetElementById("a"), 100); + SetHeight(GetDocument().getElementById("a"), 100); Update(); EXPECT_EQ(50, viewport->ScrollOffsetInt().Height()); @@ -905,18 +905,18 @@ "</div>"); ScrollableArea* scroller = - ScrollerForElement(GetDocument().GetElementById("scroller")); + ScrollerForElement(GetDocument().getElementById("scroller")); ScrollableArea* viewport = LayoutViewport(); - GetDocument().GetElementById("scroller")->setScrollTop(100); + GetDocument().getElementById("scroller")->setScrollTop(100); ScrollLayoutViewport(ScrollOffset(0, 100)); - SetHeight(GetDocument().GetElementById("innerChanger"), 200); - SetHeight(GetDocument().GetElementById("outerChanger"), 150); + SetHeight(GetDocument().getElementById("innerChanger"), 200); + SetHeight(GetDocument().getElementById("outerChanger"), 150); // Scroll anchoring should apply within #scroller. EXPECT_EQ(300, scroller->ScrollOffsetInt().Height()); - EXPECT_EQ(GetDocument().GetElementById("innerAnchor")->GetLayoutObject(), + EXPECT_EQ(GetDocument().getElementById("innerAnchor")->GetLayoutObject(), GetScrollAnchor(scroller).AnchorObject()); // Scroll anchoring should not apply within main frame. EXPECT_EQ(100, viewport->ScrollOffsetInt().Height()); @@ -946,21 +946,21 @@ "</div>"); ScrollableArea* scroller = - ScrollerForElement(GetDocument().GetElementById("scroller")); + ScrollerForElement(GetDocument().getElementById("scroller")); ScrollableArea* viewport = LayoutViewport(); - GetDocument().GetElementById("scroller")->setScrollTop(100); + GetDocument().getElementById("scroller")->setScrollTop(100); ScrollLayoutViewport(ScrollOffset(0, 100)); - SetHeight(GetDocument().GetElementById("innerChanger"), 200); - SetHeight(GetDocument().GetElementById("outerChanger"), 150); + SetHeight(GetDocument().getElementById("innerChanger"), 200); + SetHeight(GetDocument().getElementById("outerChanger"), 150); // Scroll anchoring should not apply within #scroller. EXPECT_EQ(100, scroller->ScrollOffsetInt().Height()); EXPECT_EQ(nullptr, GetScrollAnchor(scroller).AnchorObject()); // Scroll anchoring should apply within main frame. EXPECT_EQ(250, viewport->ScrollOffsetInt().Height()); - EXPECT_EQ(GetDocument().GetElementById("outerAnchor")->GetLayoutObject(), + EXPECT_EQ(GetDocument().getElementById("outerAnchor")->GetLayoutObject(), GetScrollAnchor(viewport).AnchorObject()); } @@ -990,7 +990,7 @@ "</div>" "<div class='spacer'></div>"); - Element* root_scroller_element = GetDocument().GetElementById("rootscroller"); + Element* root_scroller_element = GetDocument().getElementById("rootscroller"); NonThrowableExceptionState non_throw; GetDocument().setRootScroller(root_scroller_element, non_throw); @@ -1008,11 +1008,11 @@ root_scroller_element->setScrollTop(600); - SetHeight(GetDocument().GetElementById("firstChild"), 1000); + SetHeight(GetDocument().getElementById("firstChild"), 1000); // Scroll anchoring should be applied to #rootScroller. EXPECT_EQ(1000, scroller->GetScrollOffset().Height()); - EXPECT_EQ(GetDocument().GetElementById("target")->GetLayoutObject(), + EXPECT_EQ(GetDocument().getElementById("target")->GetLayoutObject(), GetScrollAnchor(scroller).AnchorObject()); // Scroll anchoring should not apply within main frame. EXPECT_EQ(0, LayoutViewport()->GetScrollOffset().Height()); @@ -1043,7 +1043,7 @@ ScrollOffset start_offset, ScrollOffset expected_adjustment) { ScrollableArea* viewport = LayoutViewport(); - Element* element = GetDocument().GetElementById("changer"); + Element* element = GetDocument().getElementById("changer"); viewport->SetScrollOffset(start_offset, kUserScroll); element->setAttribute(HTMLNames::classAttr, "change"); @@ -1053,7 +1053,7 @@ end_pos += expected_adjustment; EXPECT_EQ(end_pos, viewport->GetScrollOffset()); - EXPECT_EQ(GetDocument().GetElementById("a")->GetLayoutObject(), + EXPECT_EQ(GetDocument().getElementById("a")->GetLayoutObject(), GetScrollAnchor(viewport).AnchorObject()); EXPECT_EQ(corner, GetScrollAnchor(viewport).GetCorner()); @@ -1143,9 +1143,9 @@ ScrollableArea* viewport = LayoutViewport(); ScrollLayoutViewport(ScrollOffset(150, 0)); - Element* a = GetDocument().GetElementById("a"); - Element* b = GetDocument().GetElementById("b"); - Element* c = GetDocument().GetElementById("c"); + Element* a = GetDocument().getElementById("a"); + Element* b = GetDocument().getElementById("b"); + Element* c = GetDocument().getElementById("c"); a->setAttribute(HTMLNames::styleAttr, "height: 150px"); Update();
diff --git a/third_party/WebKit/Source/core/layout/TextAutosizerTest.cpp b/third_party/WebKit/Source/core/layout/TextAutosizerTest.cpp index da485a3..da1c5880 100644 --- a/third_party/WebKit/Source/core/layout/TextAutosizerTest.cpp +++ b/third_party/WebKit/Source/core/layout/TextAutosizerTest.cpp
@@ -32,7 +32,7 @@ " pariatur. Excepteur sint occaecat cupidatat non proident, sunt in" " culpa qui officia deserunt mollit anim id est laborum." "</div>"); - Element* autosized = GetDocument().GetElementById("autosized"); + Element* autosized = GetDocument().getElementById("autosized"); EXPECT_FLOAT_EQ(16.f, autosized->GetLayoutObject()->Style()->SpecifiedFontSize()); // (specified font-size = 16px) * (viewport width = 800px) / @@ -75,15 +75,15 @@ " culpa qui officia deserunt mollit anim id est laborum." "</div>"); LayoutObject* text_size_adjust_auto = - GetDocument().GetElementById("textSizeAdjustAuto")->GetLayoutObject(); + GetDocument().getElementById("textSizeAdjustAuto")->GetLayoutObject(); EXPECT_FLOAT_EQ(16.f, text_size_adjust_auto->Style()->SpecifiedFontSize()); EXPECT_FLOAT_EQ(40.f, text_size_adjust_auto->Style()->ComputedFontSize()); LayoutObject* text_size_adjust_none = - GetDocument().GetElementById("textSizeAdjustNone")->GetLayoutObject(); + GetDocument().getElementById("textSizeAdjustNone")->GetLayoutObject(); EXPECT_FLOAT_EQ(16.f, text_size_adjust_none->Style()->SpecifiedFontSize()); EXPECT_FLOAT_EQ(16.f, text_size_adjust_none->Style()->ComputedFontSize()); LayoutObject* text_size_adjust100 = - GetDocument().GetElementById("textSizeAdjust100")->GetLayoutObject(); + GetDocument().getElementById("textSizeAdjust100")->GetLayoutObject(); EXPECT_FLOAT_EQ(16.f, text_size_adjust100->Style()->SpecifiedFontSize()); EXPECT_FLOAT_EQ(16.f, text_size_adjust100->Style()->ComputedFontSize()); } @@ -106,7 +106,7 @@ " pariatur. Excepteur sint occaecat cupidatat non proident, sunt in" " culpa qui officia deserunt mollit anim id est laborum." "</div>"); - Element* autosized_div = GetDocument().GetElementById("autosized"); + Element* autosized_div = GetDocument().getElementById("autosized"); EXPECT_FLOAT_EQ( 16.f, autosized_div->GetLayoutObject()->Style()->SpecifiedFontSize()); EXPECT_FLOAT_EQ( @@ -157,7 +157,7 @@ " culpa qui officia deserunt mollit anim id est laborum." "</div>"); LayoutObject* text_size_adjust_zero = - GetDocument().GetElementById("textSizeAdjustZero")->GetLayoutObject(); + GetDocument().getElementById("textSizeAdjustZero")->GetLayoutObject(); EXPECT_FLOAT_EQ(16.f, text_size_adjust_zero->Style()->SpecifiedFontSize()); EXPECT_FLOAT_EQ(0.f, text_size_adjust_zero->Style()->ComputedFontSize()); } @@ -179,7 +179,7 @@ " culpa qui officia deserunt mollit anim id est laborum." "</div>"); LayoutObject* text_size_adjust_negative = - GetDocument().GetElementById("textSizeAdjustNegative")->GetLayoutObject(); + GetDocument().getElementById("textSizeAdjustNegative")->GetLayoutObject(); EXPECT_FLOAT_EQ(16.f, text_size_adjust_negative->Style()->SpecifiedFontSize()); EXPECT_FLOAT_EQ(40.f, text_size_adjust_negative->Style()->ComputedFontSize()); @@ -202,7 +202,7 @@ " culpa qui officia deserunt mollit anim id est laborum." "</div>"); LayoutObject* text_size_adjust_pixels = - GetDocument().GetElementById("textSizeAdjustPixels")->GetLayoutObject(); + GetDocument().getElementById("textSizeAdjustPixels")->GetLayoutObject(); EXPECT_FLOAT_EQ(16.f, text_size_adjust_pixels->Style()->SpecifiedFontSize()); EXPECT_FLOAT_EQ(40.f, text_size_adjust_pixels->Style()->ComputedFontSize()); } @@ -232,12 +232,12 @@ " </div>" "</div>"); LayoutObject* text_size_adjust_a = - GetDocument().GetElementById("textSizeAdjustA")->GetLayoutObject(); + GetDocument().getElementById("textSizeAdjustA")->GetLayoutObject(); EXPECT_FLOAT_EQ(16.f, text_size_adjust_a->Style()->SpecifiedFontSize()); // 16px * 47% = 7.52 EXPECT_FLOAT_EQ(7.52f, text_size_adjust_a->Style()->ComputedFontSize()); LayoutObject* text_size_adjust_b = - GetDocument().GetElementById("textSizeAdjustB")->GetLayoutObject(); + GetDocument().getElementById("textSizeAdjustB")->GetLayoutObject(); EXPECT_FLOAT_EQ(16.f, text_size_adjust_b->Style()->SpecifiedFontSize()); // 16px * 53% = 8.48 EXPECT_FLOAT_EQ(8.48f, text_size_adjust_b->Style()->ComputedFontSize()); @@ -259,7 +259,7 @@ " culpa qui officia deserunt mollit anim id est laborum." "</div>"); LayoutObject* text_size_adjust = - GetDocument().GetElementById("textSizeAdjust")->GetLayoutObject(); + GetDocument().getElementById("textSizeAdjust")->GetLayoutObject(); EXPECT_FLOAT_EQ(16.f, text_size_adjust->Style()->SpecifiedFontSize()); EXPECT_FLOAT_EQ(8.f, text_size_adjust->Style()->ComputedFontSize()); EXPECT_FLOAT_EQ(.5f, @@ -282,7 +282,7 @@ " pariatur. Excepteur sint occaecat cupidatat non proident, sunt in" " culpa qui officia deserunt mollit anim id est laborum." "</div>"); - Element* autosized = GetDocument().GetElementById("autosized"); + Element* autosized = GetDocument().getElementById("autosized"); EXPECT_FLOAT_EQ(16.f, autosized->GetLayoutObject()->Style()->SpecifiedFontSize()); // 1.5 * (specified font-size = 16px) * (viewport width = 800px) / @@ -318,7 +318,7 @@ " pariatur. Excepteur sint occaecat cupidatat non proident, sunt in" " culpa qui officia deserunt mollit anim id est laborum." "</div>"); - Element* autosized = GetDocument().GetElementById("autosized"); + Element* autosized = GetDocument().getElementById("autosized"); EXPECT_FLOAT_EQ(16.f, autosized->GetLayoutObject()->Style()->SpecifiedFontSize()); // 1.5 * (specified font-size = 16px) = 24px. @@ -327,7 +327,7 @@ // Because this does not autosize (due to the width), no accessibility font // scale factor should be applied. - Element* not_autosized = GetDocument().GetElementById("notAutosized"); + Element* not_autosized = GetDocument().getElementById("notAutosized"); EXPECT_FLOAT_EQ( 16.f, not_autosized->GetLayoutObject()->Style()->SpecifiedFontSize()); // specified font-size = 16px. @@ -351,7 +351,7 @@ " pariatur. Excepteur sint occaecat cupidatat non proident, sunt in" " culpa qui officia deserunt mollit anim id est laborum." "</div>"); - Element* autosized = GetDocument().GetElementById("autosized"); + Element* autosized = GetDocument().getElementById("autosized"); EXPECT_FLOAT_EQ(16.f, autosized->GetLayoutObject()->Style()->SpecifiedFontSize()); // 1.0 * (specified font-size = 16px) * (viewport width = 800px) / @@ -396,7 +396,7 @@ " culpa qui officia deserunt mollit anim id est laborum." "</div>"); Element* text_size_adjust_none = - GetDocument().GetElementById("textSizeAdjustNone"); + GetDocument().getElementById("textSizeAdjustNone"); EXPECT_FLOAT_EQ( 16.f, text_size_adjust_none->GetLayoutObject()->Style()->SpecifiedFontSize()); @@ -406,7 +406,7 @@ text_size_adjust_none->GetLayoutObject()->Style()->ComputedFontSize()); Element* text_size_adjust_double = - GetDocument().GetElementById("textSizeAdjustDouble"); + GetDocument().getElementById("textSizeAdjustDouble"); EXPECT_FLOAT_EQ( 16.f, text_size_adjust_double->GetLayoutObject()->Style()->SpecifiedFontSize()); @@ -451,7 +451,7 @@ "</div>"); LayoutObject* text_size_adjust = - GetDocument().GetElementById("textSizeAdjust")->GetLayoutObject(); + GetDocument().getElementById("textSizeAdjust")->GetLayoutObject(); EXPECT_FLOAT_EQ(16.f, text_size_adjust->Style()->SpecifiedFontSize()); EXPECT_FLOAT_EQ(24.f, text_size_adjust->Style()->ComputedFontSize()); EXPECT_FLOAT_EQ(1.5f, @@ -479,7 +479,7 @@ GetDocument().GetSettings()->SetDeviceScaleAdjustment(1.5f); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* autosized = GetDocument().GetElementById("autosized"); + Element* autosized = GetDocument().getElementById("autosized"); EXPECT_FLOAT_EQ(16.f, autosized->GetLayoutObject()->Style()->SpecifiedFontSize()); // (specified font-size = 16px) * (viewport width = 800px) / @@ -491,7 +491,7 @@ GetDocument().GetSettings()->SetViewportMetaEnabled(false); GetDocument().View()->UpdateAllLifecyclePhases(); - autosized = GetDocument().GetElementById("autosized"); + autosized = GetDocument().getElementById("autosized"); EXPECT_FLOAT_EQ(16.f, autosized->GetLayoutObject()->Style()->SpecifiedFontSize()); // (device scale adjustment = 1.5) * (specified font-size = 16px) * @@ -516,7 +516,7 @@ "</div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* long_text_element = GetDocument().GetElementById("longText"); + Element* long_text_element = GetDocument().getElementById("longText"); long_text_element->setInnerHTML( " Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed " "do eiusmod tempor" @@ -533,13 +533,13 @@ GetDocument().View()->UpdateAllLifecyclePhases(); LayoutObject* long_text = - GetDocument().GetElementById("longText")->GetLayoutObject(); + GetDocument().getElementById("longText")->GetLayoutObject(); EXPECT_FLOAT_EQ(16.f, long_text->Style()->SpecifiedFontSize()); //(specified font-size = 16px) * (block width = 560px) / // (window width = 320px) = 28px. EXPECT_FLOAT_EQ(28.f, long_text->Style()->ComputedFontSize()); LayoutObject* short_text = - GetDocument().GetElementById("shortText")->GetLayoutObject(); + GetDocument().getElementById("shortText")->GetLayoutObject(); EXPECT_FLOAT_EQ(16.f, short_text->Style()->SpecifiedFontSize()); EXPECT_FLOAT_EQ(28.f, short_text->Style()->ComputedFontSize()); } @@ -560,7 +560,7 @@ "</div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* long_text_element = GetDocument().GetElementById("longText"); + Element* long_text_element = GetDocument().getElementById("longText"); long_text_element->setInnerHTML( " Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed " "do eiusmod tempor" @@ -577,13 +577,13 @@ GetDocument().View()->UpdateAllLifecyclePhases(); LayoutObject* long_text = - GetDocument().GetElementById("longText")->GetLayoutObject(); + GetDocument().getElementById("longText")->GetLayoutObject(); EXPECT_FLOAT_EQ(16.f, long_text->Style()->SpecifiedFontSize()); //(specified font-size = 16px) * (block width = 560px) / // (window width = 320px) = 28px. EXPECT_FLOAT_EQ(28.f, long_text->Style()->ComputedFontSize()); LayoutObject* short_text = - GetDocument().GetElementById("shortText")->GetLayoutObject(); + GetDocument().getElementById("shortText")->GetLayoutObject(); EXPECT_FLOAT_EQ(16.f, short_text->Style()->SpecifiedFontSize()); EXPECT_FLOAT_EQ(28.f, short_text->Style()->ComputedFontSize()); } @@ -604,7 +604,7 @@ "<div id='container'></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* container = GetDocument().GetElementById("container"); + Element* container = GetDocument().getElementById("container"); container->setInnerHTML( "<div class='supercluster' id='longText'>" " Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed " @@ -623,13 +623,13 @@ GetDocument().View()->UpdateAllLifecyclePhases(); LayoutObject* long_text = - GetDocument().GetElementById("longText")->GetLayoutObject(); + GetDocument().getElementById("longText")->GetLayoutObject(); EXPECT_FLOAT_EQ(16.f, long_text->Style()->SpecifiedFontSize()); //(specified font-size = 16px) * (block width = 560px) / // (window width = 320px) = 28px. EXPECT_FLOAT_EQ(28.f, long_text->Style()->ComputedFontSize()); LayoutObject* short_text = - GetDocument().GetElementById("shortText")->GetLayoutObject(); + GetDocument().getElementById("shortText")->GetLayoutObject(); EXPECT_FLOAT_EQ(16.f, short_text->Style()->SpecifiedFontSize()); EXPECT_FLOAT_EQ(28.f, short_text->Style()->ComputedFontSize()); } @@ -651,7 +651,7 @@ "</div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* long_text_element = GetDocument().GetElementById("longText"); + Element* long_text_element = GetDocument().getElementById("longText"); long_text_element->setInnerHTML( " Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed " "do eiusmod tempor" @@ -668,13 +668,13 @@ GetDocument().View()->UpdateAllLifecyclePhases(); LayoutObject* long_text = - GetDocument().GetElementById("longText")->GetLayoutObject(); + GetDocument().getElementById("longText")->GetLayoutObject(); EXPECT_FLOAT_EQ(16.f, long_text->Style()->SpecifiedFontSize()); //(specified font-size = 16px) * (block width = 560px) / // (window width = 320px) = 28px. EXPECT_FLOAT_EQ(28.f, long_text->Style()->ComputedFontSize()); LayoutObject* short_text = - GetDocument().GetElementById("shortText")->GetLayoutObject(); + GetDocument().getElementById("shortText")->GetLayoutObject(); EXPECT_FLOAT_EQ(16.f, short_text->Style()->SpecifiedFontSize()); EXPECT_FLOAT_EQ(28.f, short_text->Style()->ComputedFontSize()); } @@ -716,7 +716,7 @@ "</div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* ruby_inline = GetDocument().GetElementById("rubyInline"); + Element* ruby_inline = GetDocument().getElementById("rubyInline"); EXPECT_FLOAT_EQ(16.f, ruby_inline->GetLayoutObject()->Style()->SpecifiedFontSize()); // (specified font-size = 16px) * (viewport width = 800px) / @@ -724,7 +724,7 @@ EXPECT_FLOAT_EQ(40.f, ruby_inline->GetLayoutObject()->Style()->ComputedFontSize()); - Element* ruby_block = GetDocument().GetElementById("rubyBlock"); + Element* ruby_block = GetDocument().getElementById("rubyBlock"); EXPECT_FLOAT_EQ(16.f, ruby_block->GetLayoutObject()->Style()->SpecifiedFontSize()); // (specified font-size = 16px) * (viewport width = 800px) /
diff --git a/third_party/WebKit/Source/core/layout/VisualRectMappingTest.cpp b/third_party/WebKit/Source/core/layout/VisualRectMappingTest.cpp index a59ab61..5c28245 100644 --- a/third_party/WebKit/Source/core/layout/VisualRectMappingTest.cpp +++ b/third_party/WebKit/Source/core/layout/VisualRectMappingTest.cpp
@@ -202,7 +202,7 @@ LayoutBlock* frame_container = ToLayoutBlock(GetLayoutObjectByElementId("frameContainer")); LayoutObject* target = - ChildDocument().GetElementById("target")->GetLayoutObject(); + ChildDocument().getElementById("target")->GetLayoutObject(); LayoutRect rect(0, 0, 100, 100); EXPECT_TRUE(target->MapToVisualRectInAncestorSpace(frame_container, rect)); // When passing from the iframe to the parent frame, the rect of (0.5, 0, 100, @@ -242,7 +242,7 @@ EXPECT_TRUE(frame_div->MapToVisualRectInAncestorSpace(frame_container, rect)); EXPECT_EQ(rect, LayoutRect(4, 13, 20, 37)); - Element* frame_element = GetDocument().GetElementById("frame"); + Element* frame_element = GetDocument().getElementById("frame"); frame_element->SetInlineStyleProperty(CSSPropertyDisplay, "none"); GetDocument().View()->UpdateAllLifecyclePhases();
diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp index 3a595e1c..2d2167e 100644 --- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp +++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
@@ -3443,7 +3443,7 @@ // The below is an artificial construct formed intentionally to focus a // microbenchmark on the cost of paint with a partial invalidation. Element* target_element = - owning_layer_.GetLayoutObject().GetDocument().GetElementById( + owning_layer_.GetLayoutObject().GetDocument().getElementById( AtomicString(kTestPaintInvalidationTargetName)); // TODO(wkorman): If we don't find the expected target element, we could // consider walking to the first leaf node so that the partial-invalidation
diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMappingTest.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMappingTest.cpp index 5fb0c3b..8f61c0e 100644 --- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMappingTest.cpp +++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMappingTest.cpp
@@ -80,7 +80,7 @@ "transform'></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* element = GetDocument().GetElementById("target"); + Element* element = GetDocument().getElementById("target"); PaintLayer* paint_layer = ToLayoutBoxModelObject(element->GetLayoutObject())->Layer(); ASSERT_TRUE(paint_layer->GraphicsLayerBacking()); @@ -95,7 +95,7 @@ "transform'></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* element = GetDocument().GetElementById("target"); + Element* element = GetDocument().getElementById("target"); PaintLayer* paint_layer = ToLayoutBoxModelObject(element->GetLayoutObject())->Layer(); ASSERT_TRUE(paint_layer->GraphicsLayerBacking()); @@ -113,7 +113,7 @@ GetDocument().GetSettings()->SetMainFrameClipsContent(false); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* element = GetDocument().GetElementById("target"); + Element* element = GetDocument().getElementById("target"); PaintLayer* paint_layer = ToLayoutBoxModelObject(element->GetLayoutObject())->Layer(); ASSERT_TRUE(paint_layer->GraphicsLayerBacking()); @@ -154,7 +154,7 @@ "transform; transform: rotateZ(45deg)'></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* element = GetDocument().GetElementById("target"); + Element* element = GetDocument().getElementById("target"); PaintLayer* paint_layer = ToLayoutBoxModelObject(element->GetLayoutObject())->Layer(); ASSERT_TRUE(!!paint_layer->GraphicsLayerBacking()); @@ -168,7 +168,7 @@ "transform; transform: rotateY(89.9999deg)'></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* element = GetDocument().GetElementById("target"); + Element* element = GetDocument().getElementById("target"); PaintLayer* paint_layer = ToLayoutBoxModelObject(element->GetLayoutObject())->Layer(); ASSERT_TRUE(!!paint_layer->GraphicsLayerBacking()); @@ -189,7 +189,7 @@ "transform; transform: rotateY(90deg)'></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* element = GetDocument().GetElementById("target"); + Element* element = GetDocument().getElementById("target"); PaintLayer* paint_layer = ToLayoutBoxModelObject(element->GetLayoutObject())->Layer(); ASSERT_TRUE(!!paint_layer->GraphicsLayerBacking()); @@ -203,7 +203,7 @@ "transform; transform: rotateY(45deg)'></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* element = GetDocument().GetElementById("target"); + Element* element = GetDocument().getElementById("target"); PaintLayer* paint_layer = ToLayoutBoxModelObject(element->GetLayoutObject())->Layer(); ASSERT_TRUE(!!paint_layer->GraphicsLayerBacking()); @@ -217,7 +217,7 @@ "transform; transform: rotateZ(45deg)'></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* element = GetDocument().GetElementById("target"); + Element* element = GetDocument().getElementById("target"); PaintLayer* paint_layer = ToLayoutBoxModelObject(element->GetLayoutObject())->Layer(); ASSERT_TRUE(!!paint_layer->GraphicsLayerBacking()); @@ -231,7 +231,7 @@ "transform'></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* element = GetDocument().GetElementById("target"); + Element* element = GetDocument().getElementById("target"); PaintLayer* paint_layer = ToLayoutBoxModelObject(element->GetLayoutObject())->Layer(); ASSERT_TRUE(!!paint_layer->GraphicsLayerBacking()); @@ -248,7 +248,7 @@ "transform; position: fixed; top: 100px; left: 200px;'></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* element = GetDocument().GetElementById("target"); + Element* element = GetDocument().getElementById("target"); PaintLayer* paint_layer = ToLayoutBoxModelObject(element->GetLayoutObject())->Layer(); ASSERT_TRUE(!!paint_layer->GraphicsLayerBacking()); @@ -263,7 +263,7 @@ "</div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* element = GetDocument().GetElementById("target"); + Element* element = GetDocument().getElementById("target"); PaintLayer* paint_layer = ToLayoutBoxModelObject(element->GetLayoutObject())->Layer(); ASSERT_TRUE(!!paint_layer->GraphicsLayerBacking()); @@ -280,7 +280,7 @@ "<div style='width: 100px; height: 10000px'></div></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* element = GetDocument().GetElementById("target"); + Element* element = GetDocument().getElementById("target"); PaintLayer* paint_layer = ToLayoutBoxModelObject(element->GetLayoutObject())->Layer(); ASSERT_TRUE(paint_layer->GraphicsLayerBacking()); @@ -297,7 +297,7 @@ "transform'></div></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* element = GetDocument().GetElementById("target"); + Element* element = GetDocument().getElementById("target"); PaintLayer* paint_layer = ToLayoutBoxModelObject(element->GetLayoutObject())->Layer(); ASSERT_TRUE(paint_layer->GraphicsLayerBacking()); @@ -321,7 +321,7 @@ style_without_clipping + "'></video>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* video_element = GetDocument().GetElementById("video"); + Element* video_element = GetDocument().getElementById("video"); GraphicsLayer* graphics_layer = ToLayoutBoxModelObject(video_element->GetLayoutObject()) ->Layer() @@ -353,7 +353,7 @@ "<div style='width: 1000px; height: 1000px;'>Foo</div>Foo</div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* element = GetDocument().GetElementById("scroller"); + Element* element = GetDocument().getElementById("scroller"); PaintLayer* paint_layer = ToLayoutBoxModelObject(element->GetLayoutObject())->Layer(); CompositedLayerMapping* composited_layer_mapping = @@ -551,7 +551,7 @@ "</div"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* scroller = GetDocument().GetElementById("scroller"); + Element* scroller = GetDocument().getElementById("scroller"); GraphicsLayer* scrolling_layer = scroller->GetLayoutBox()->Layer()->GraphicsLayerBacking(); EXPECT_RECT_EQ(IntRect(0, 0, 400, 4600), @@ -615,7 +615,7 @@ "</div"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* scroller = GetDocument().GetElementById("scroller"); + Element* scroller = GetDocument().getElementById("scroller"); GraphicsLayer* scrolling_layer = scroller->GetLayoutBox()->Layer()->GraphicsLayerBacking(); @@ -631,7 +631,7 @@ PreviousInterestRect(scrolling_layer)); // Paint invalidation and repaint should change previous paint interest rect. - GetDocument().GetElementById("content")->setTextContent("Change"); + GetDocument().getElementById("content")->setTextContent("Change"); GetDocument().View()->UpdateAllLifecyclePhases(); EXPECT_RECT_EQ(IntRect(0, 5400, 400, 4600), RecomputeInterestRect(scrolling_layer)); @@ -651,7 +651,7 @@ "</div>"); EXPECT_EQ(GetDocument() - .GetElementById("inside") + .getElementById("inside") ->GetLayoutBox() ->VisualOverflowRect() .Size() @@ -659,7 +659,7 @@ 100); CompositedLayerMapping* grouped_mapping = GetDocument() - .GetElementById("squashed") + .getElementById("squashed") ->GetLayoutBox() ->Layer() ->GroupedMapping(); @@ -687,7 +687,7 @@ "</div>"); CompositedLayerMapping* grouped_mapping = GetDocument() - .GetElementById("squashed") + .getElementById("squashed") ->GetLayoutBox() ->Layer() ->GroupedMapping(); @@ -715,7 +715,7 @@ ScrollOffset(0.0, 8000.0), kProgrammaticScroll); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* target = ChildDocument().GetElementById("target"); + Element* target = ChildDocument().getElementById("target"); ASSERT_TRUE(target); EXPECT_RECT_EQ( @@ -818,7 +818,7 @@ mapping->ForegroundLayer()->PaintingPhase()); Element* negative_composited_child = - GetDocument().GetElementById("negative-composited-child"); + GetDocument().getElementById("negative-composited-child"); negative_composited_child->parentNode()->RemoveChild( negative_composited_child); GetDocument().View()->UpdateAllLifecyclePhases(); @@ -849,7 +849,7 @@ "</div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* element = GetDocument().GetElementById("target"); + Element* element = GetDocument().getElementById("target"); PaintLayer* paint_layer = ToLayoutBoxModelObject(element->GetLayoutObject())->Layer(); ASSERT_TRUE(paint_layer); @@ -885,7 +885,7 @@ "</div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* scroller = GetDocument().GetElementById("scroller"); + Element* scroller = GetDocument().getElementById("scroller"); PaintLayer* paint_layer = ToLayoutBoxModelObject(scroller->GetLayoutObject())->Layer(); ASSERT_TRUE(paint_layer); @@ -1036,7 +1036,7 @@ "</div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* ancestor = GetDocument().GetElementById("ancestor"); + Element* ancestor = GetDocument().getElementById("ancestor"); ASSERT_TRUE(ancestor); PaintLayer* ancestor_paint_layer = ToLayoutBoxModelObject(ancestor->GetLayoutObject())->Layer(); @@ -1046,7 +1046,7 @@ ancestor_paint_layer->GetCompositedLayerMapping(); ASSERT_FALSE(ancestor_mapping); - Element* child = GetDocument().GetElementById("child"); + Element* child = GetDocument().getElementById("child"); ASSERT_TRUE(child); PaintLayer* child_paint_layer = ToLayoutBoxModelObject(child->GetLayoutObject())->Layer(); @@ -1119,7 +1119,7 @@ "</div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* ancestor = GetDocument().GetElementById("ancestor"); + Element* ancestor = GetDocument().getElementById("ancestor"); ASSERT_TRUE(ancestor); PaintLayer* ancestor_paint_layer = ToLayoutBoxModelObject(ancestor->GetLayoutObject())->Layer(); @@ -1129,7 +1129,7 @@ ancestor_paint_layer->GetCompositedLayerMapping(); ASSERT_FALSE(ancestor_mapping); - Element* child1 = GetDocument().GetElementById("child1"); + Element* child1 = GetDocument().getElementById("child1"); ASSERT_TRUE(child1); PaintLayer* child1_paint_layer = ToLayoutBoxModelObject(child1->GetLayoutObject())->Layer(); @@ -1138,7 +1138,7 @@ child1_paint_layer->GetCompositedLayerMapping(); ASSERT_FALSE(child1_mapping); - Element* child2 = GetDocument().GetElementById("child2"); + Element* child2 = GetDocument().getElementById("child2"); ASSERT_TRUE(child2); PaintLayer* child2_paint_layer = ToLayoutBoxModelObject(child2->GetLayoutObject())->Layer(); @@ -1255,7 +1255,7 @@ "</div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* ancestor = GetDocument().GetElementById("ancestor"); + Element* ancestor = GetDocument().getElementById("ancestor"); ASSERT_TRUE(ancestor); PaintLayer* ancestor_paint_layer = ToLayoutBoxModelObject(ancestor->GetLayoutObject())->Layer(); @@ -1265,7 +1265,7 @@ ancestor_paint_layer->GetCompositedLayerMapping(); ASSERT_FALSE(ancestor_mapping); - Element* child = GetDocument().GetElementById("child"); + Element* child = GetDocument().getElementById("child"); ASSERT_TRUE(child); PaintLayer* child_paint_layer = ToLayoutBoxModelObject(child->GetLayoutObject())->Layer(); @@ -1274,7 +1274,7 @@ child_paint_layer->GetCompositedLayerMapping(); ASSERT_FALSE(child_mapping); - Element* grandchild = GetDocument().GetElementById("grandchild"); + Element* grandchild = GetDocument().getElementById("grandchild"); ASSERT_TRUE(grandchild); PaintLayer* grandchild_paint_layer = ToLayoutBoxModelObject(grandchild->GetLayoutObject())->Layer(); @@ -1369,7 +1369,7 @@ "</div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* ancestor = GetDocument().GetElementById("ancestor"); + Element* ancestor = GetDocument().getElementById("ancestor"); ASSERT_TRUE(ancestor); PaintLayer* ancestor_paint_layer = ToLayoutBoxModelObject(ancestor->GetLayoutObject())->Layer(); @@ -1379,7 +1379,7 @@ ancestor_paint_layer->GetCompositedLayerMapping(); ASSERT_FALSE(ancestor_mapping); - Element* child = GetDocument().GetElementById("child"); + Element* child = GetDocument().getElementById("child"); ASSERT_TRUE(child); PaintLayer* child_paint_layer = ToLayoutBoxModelObject(child->GetLayoutObject())->Layer(); @@ -1411,7 +1411,7 @@ "</div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* ancestor = GetDocument().GetElementById("ancestor"); + Element* ancestor = GetDocument().getElementById("ancestor"); ASSERT_TRUE(ancestor); PaintLayer* ancestor_paint_layer = ToLayoutBoxModelObject(ancestor->GetLayoutObject())->Layer(); @@ -1421,7 +1421,7 @@ ancestor_paint_layer->GetCompositedLayerMapping(); ASSERT_FALSE(ancestor_mapping); - Element* child = GetDocument().GetElementById("child"); + Element* child = GetDocument().getElementById("child"); ASSERT_TRUE(child); PaintLayer* child_paint_layer = ToLayoutBoxModelObject(child->GetLayoutObject())->Layer(); @@ -1453,7 +1453,7 @@ "</div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* ancestor = GetDocument().GetElementById("ancestor"); + Element* ancestor = GetDocument().getElementById("ancestor"); ASSERT_TRUE(ancestor); PaintLayer* ancestor_paint_layer = ToLayoutBoxModelObject(ancestor->GetLayoutObject())->Layer(); @@ -1463,7 +1463,7 @@ ancestor_paint_layer->GetCompositedLayerMapping(); ASSERT_FALSE(ancestor_mapping); - Element* child = GetDocument().GetElementById("child"); + Element* child = GetDocument().getElementById("child"); ASSERT_TRUE(child); PaintLayer* child_paint_layer = ToLayoutBoxModelObject(child->GetLayoutObject())->Layer();
diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositingReasonFinderTest.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositingReasonFinderTest.cpp index 1ce76b1..d0f3d30 100644 --- a/third_party/WebKit/Source/core/layout/compositing/CompositingReasonFinderTest.cpp +++ b/third_party/WebKit/Source/core/layout/compositing/CompositingReasonFinderTest.cpp
@@ -42,21 +42,21 @@ GetDocument().View()->UpdateAllLifecyclePhases(); // The translucent fixed box should not be promoted. - Element* element = GetDocument().GetElementById("translucent"); + Element* element = GetDocument().getElementById("translucent"); PaintLayer* paint_layer = ToLayoutBoxModelObject(element->GetLayoutObject())->Layer(); EXPECT_EQ(kNotComposited, paint_layer->GetCompositingState()); // The opaque fixed box should be promoted and be opaque so that text will be // drawn with subpixel anti-aliasing. - element = GetDocument().GetElementById("opaque"); + element = GetDocument().getElementById("opaque"); paint_layer = ToLayoutBoxModelObject(element->GetLayoutObject())->Layer(); EXPECT_EQ(kPaintsIntoOwnBacking, paint_layer->GetCompositingState()); EXPECT_TRUE(paint_layer->GraphicsLayerBacking()->ContentsOpaque()); // The opaque fixed box with shadow should not be promoted because the layer // will include the shadow which is not opaque. - element = GetDocument().GetElementById("opaque-with-shadow"); + element = GetDocument().getElementById("opaque-with-shadow"); paint_layer = ToLayoutBoxModelObject(element->GetLayoutObject())->Layer(); EXPECT_EQ(kNotComposited, paint_layer->GetCompositingState()); } @@ -130,8 +130,8 @@ GetDocument().View()->UpdateAllLifecyclePhases(); EXPECT_TRUE(RuntimeEnabledFeatures::compositeOpaqueScrollersEnabled()); - Element* parent = GetDocument().GetElementById("parent"); - Element* fixed = GetDocument().GetElementById("fixed"); + Element* parent = GetDocument().getElementById("parent"); + Element* fixed = GetDocument().getElementById("fixed"); PaintLayer* paint_layer = ToLayoutBoxModelObject(fixed->GetLayoutObject())->Layer(); ASSERT_TRUE(paint_layer); @@ -179,8 +179,8 @@ GetDocument().View()->UpdateAllLifecyclePhases(); EXPECT_TRUE(RuntimeEnabledFeatures::compositeOpaqueScrollersEnabled()); - Element* parent = GetDocument().GetElementById("parent"); - Element* fixed = GetDocument().GetElementById("fixed"); + Element* parent = GetDocument().getElementById("parent"); + Element* fixed = GetDocument().getElementById("fixed"); PaintLayer* paint_layer = ToLayoutBoxModelObject(fixed->GetLayoutObject())->Layer(); ASSERT_TRUE(paint_layer); @@ -339,12 +339,12 @@ "</div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* outer_sticky = GetDocument().GetElementById("outerSticky"); + Element* outer_sticky = GetDocument().getElementById("outerSticky"); PaintLayer* outer_sticky_layer = ToLayoutBoxModelObject(outer_sticky->GetLayoutObject())->Layer(); ASSERT_TRUE(outer_sticky_layer); - Element* inner_sticky = GetDocument().GetElementById("innerSticky"); + Element* inner_sticky = GetDocument().getElementById("innerSticky"); PaintLayer* inner_sticky_layer = ToLayoutBoxModelObject(inner_sticky->GetLayoutObject())->Layer(); ASSERT_TRUE(inner_sticky_layer);
diff --git a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositorTest.cpp b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositorTest.cpp index b9c7489..b553e9e 100644 --- a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositorTest.cpp +++ b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositorTest.cpp
@@ -49,8 +49,8 @@ "<div id='box'></div>" "<div id='otherBox'></div>"); - Element* box = GetDocument().GetElementById("box"); - Element* otherBox = GetDocument().GetElementById("otherBox"); + Element* box = GetDocument().getElementById("box"); + Element* otherBox = GetDocument().getElementById("otherBox"); ASSERT_TRUE(box); ASSERT_TRUE(otherBox);
diff --git a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.cc b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.cc index 470da16..9608c31 100644 --- a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.cc +++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.cc
@@ -341,7 +341,7 @@ } } - line_item_chunks->Swap(line_item_chunks_in_visual_order); + line_item_chunks->swap(line_item_chunks_in_visual_order); } // TODO(glebl): Add the support of clearance for inline floats.
diff --git a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm_test.cc b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm_test.cc index bee54c30..946359d2 100644 --- a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm_test.cc +++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm_test.cc
@@ -187,7 +187,7 @@ // 30 == narrow-float's width. EXPECT_EQ(LayoutUnit(30), inline_text_box1->X()); - Element* narrow_float = GetDocument().GetElementById("narrow-float"); + Element* narrow_float = GetDocument().getElementById("narrow-float"); // 8 == body's margin. EXPECT_EQ(8, narrow_float->OffsetLeft()); EXPECT_EQ(8, narrow_float->OffsetTop()); @@ -224,7 +224,7 @@ InlineTextBox* inline_text_box1 = layout_text->FirstTextBox(); EXPECT_EQ(LayoutUnit(), inline_text_box1->X()); - Element* wide_float = GetDocument().GetElementById("wide-float"); + Element* wide_float = GetDocument().getElementById("wide-float"); // 8 == body's margin. EXPECT_EQ(8, wide_float->OffsetLeft()); } @@ -258,11 +258,11 @@ </span> </div> )HTML"); - Element* wide_float = GetDocument().GetElementById("left-wide"); + Element* wide_float = GetDocument().getElementById("left-wide"); // 8 == body's margin. EXPECT_EQ(8, wide_float->OffsetLeft()); - Element* narrow_float = GetDocument().GetElementById("left-narrow"); + Element* narrow_float = GetDocument().getElementById("left-narrow"); // 160 float-wide's width + 8 body's margin. EXPECT_EQ(160 + 8, narrow_float->OffsetLeft());
diff --git a/third_party/WebKit/Source/core/layout/ng/inline/ng_physical_line_box_fragment.cc b/third_party/WebKit/Source/core/layout/ng/inline/ng_physical_line_box_fragment.cc index 58c6ff9..89fa2171 100644 --- a/third_party/WebKit/Source/core/layout/ng/inline/ng_physical_line_box_fragment.cc +++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_physical_line_box_fragment.cc
@@ -18,7 +18,7 @@ kFragmentLineBox, std::move(break_token)), metrics_(metrics) { - children_.Swap(children); + children_.swap(children); } } // namespace blink
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_break_token.cc b/third_party/WebKit/Source/core/layout/ng/ng_block_break_token.cc index 56a85e5..a3e3570 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_block_break_token.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_block_break_token.cc
@@ -14,7 +14,7 @@ Vector<RefPtr<NGBreakToken>>& child_break_tokens) : NGBreakToken(kBlockBreakToken, kUnfinished, node), used_block_size_(used_block_size) { - child_break_tokens_.Swap(child_break_tokens); + child_break_tokens_.swap(child_break_tokens); } NGBlockBreakToken::NGBlockBreakToken(NGLayoutInputNode* node)
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc index 73f8eabf..6a43153e 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc
@@ -358,7 +358,7 @@ EXPECT_THAT(float_nonempties_fragment->LeftOffset(), LayoutUnit(0)); // ** Verify layout tree ** - Element* first_child = GetDocument().GetElementById("first-child"); + Element* first_child = GetDocument().getElementById("first-child"); // -7 = body_top_offset EXPECT_EQ(body_top_offset, first_child->OffsetTop()); } @@ -387,7 +387,7 @@ const NGPhysicalBoxFragment* child_fragment; RefPtr<const NGPhysicalBoxFragment> fragment; auto run_test = [&](const Length& container_height) { - Element* container = GetDocument().GetElementById("container"); + Element* container = GetDocument().getElementById("container"); container->MutableComputedStyle()->SetHeight(container_height); std::tie(fragment, std::ignore) = RunBlockLayoutAlgorithmForElement( GetDocument().getElementsByTagName("html")->item(0)); @@ -441,7 +441,7 @@ const NGPhysicalBoxFragment* child_fragment; RefPtr<const NGPhysicalBoxFragment> fragment; auto run_test = [&](const Length& container_padding_top) { - Element* container = GetDocument().GetElementById("container"); + Element* container = GetDocument().getElementById("container"); container->MutableComputedStyle()->SetPaddingTop(container_padding_top); std::tie(fragment, std::ignore) = RunBlockLayoutAlgorithmForElement( GetDocument().getElementsByTagName("html")->item(0)); @@ -891,7 +891,7 @@ NGPhysicalOffset(LayoutUnit(25) + right_float_offset, LayoutUnit(15))); // ** Verify layout tree ** - Element* left_float = GetDocument().GetElementById("left-float"); + Element* left_float = GetDocument().getElementById("left-float"); // 88 = body's margin(8) + // empty1's padding and margin + empty2's padding and margins + float's // padding @@ -901,7 +901,7 @@ // ** Legacy Floating objects ** // #container is the 1st non-empty block so floats are attached to it. - Element* container = GetDocument().GetElementById("container"); + Element* container = GetDocument().getElementById("container"); auto& floating_objects = const_cast<FloatingObjects*>( ToLayoutBlockFlow(container->GetLayoutObject())->GetFloatingObjects()) @@ -989,7 +989,7 @@ ASSERT_EQ(4UL, container_fragment->PositionedFloats().size()); // ** Verify layout tree ** - Element* left_float = GetDocument().GetElementById("left-float"); + Element* left_float = GetDocument().getElementById("left-float"); // 8 = body's margin-top int left_float_block_offset = 8; EXPECT_EQ(left_float_block_offset, left_float->OffsetTop()); @@ -997,7 +997,7 @@ container_fragment->PositionedFloats().at(0)->fragment; EXPECT_THAT(LayoutUnit(), left_float_fragment->TopOffset()); - Element* left_wide_float = GetDocument().GetElementById("left-wide-float"); + Element* left_wide_float = GetDocument().getElementById("left-wide-float"); // left-wide-float is positioned right below left-float as it's too wide. // 38 = left_float_block_offset + // left-float's height 30 @@ -1008,7 +1008,7 @@ // 30 = left-float's height. EXPECT_THAT(LayoutUnit(30), left_wide_float_fragment->TopOffset()); - Element* regular = GetDocument().GetElementById("regular"); + Element* regular = GetDocument().getElementById("regular"); // regular_block_offset = body's margin-top 8 int regular_block_offset = 8; EXPECT_EQ(regular_block_offset, regular->OffsetTop()); @@ -1016,7 +1016,7 @@ ToNGPhysicalBoxFragment(container_fragment->Children()[0].Get()); EXPECT_THAT(LayoutUnit(), regular_block_fragment->TopOffset()); - Element* right_float = GetDocument().GetElementById("right-float"); + Element* right_float = GetDocument().getElementById("right-float"); // 158 = body's margin-left 8 + container's width 200 - right_float's width 50 int right_float_inline_offset = 158; // it's positioned right after our left_wide_float @@ -1034,7 +1034,7 @@ right_float_fragment->LeftOffset()); Element* left_float_with_margin = - GetDocument().GetElementById("left-float-with-margin"); + GetDocument().getElementById("left-float-with-margin"); // 18 = body's margin(8) + left-float-with-margin's margin(10) int left_float_with_margin_inline_offset = 18; EXPECT_EQ(left_float_with_margin_inline_offset, @@ -1110,7 +1110,7 @@ const NGPhysicalBoxFragment* adjoining_clearance_fragment; RefPtr<const NGPhysicalBoxFragment> fragment; auto run_with_clearance = [&](EClear clear_value) { - Element* el_with_clear = GetDocument().GetElementById("clearance"); + Element* el_with_clear = GetDocument().getElementById("clearance"); el_with_clear->MutableComputedStyle()->SetClear(clear_value); std::tie(fragment, std::ignore) = RunBlockLayoutAlgorithmForElement( GetDocument().getElementsByTagName("html")->item(0)); @@ -1898,7 +1898,7 @@ </div> )HTML"); // #container is the new parent for our float because it's height != 0. - Element* container = GetDocument().GetElementById("container"); + Element* container = GetDocument().getElementById("container"); auto& floating_objects = const_cast<FloatingObjects*>( ToLayoutBlockFlow(container->GetLayoutObject())->GetFloatingObjects()) @@ -1992,7 +1992,7 @@ // 60 = block1's height 30 + std::max(block1's margin 20, zero's margin 30) EXPECT_THAT(NGPhysicalOffset(LayoutUnit(0), LayoutUnit(60)), container_clear_fragment->Offset()); - Element* container_clear = GetDocument().GetElementById("container-clear"); + Element* container_clear = GetDocument().getElementById("container-clear"); // 190 = block1's margin 130 + block1's height 30 + // std::max(block1's margin 20, zero's margin 30) EXPECT_THAT(container_clear->OffsetTop(), 190); @@ -2299,7 +2299,7 @@ const NGPhysicalBoxFragment* new_fc_fragment; RefPtr<const NGPhysicalBoxFragment> fragment; auto run_test = [&](const Length& block_width) { - Element* new_fc_block = GetDocument().GetElementById("new-fc"); + Element* new_fc_block = GetDocument().getElementById("new-fc"); new_fc_block->MutableComputedStyle()->SetWidth(block_width); std::tie(fragment, std::ignore) = RunBlockLayoutAlgorithmForElement( GetDocument().getElementsByTagName("html")->item(0));
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_layout_result.cc b/third_party/WebKit/Source/core/layout/ng/ng_layout_result.cc index 30dedaa..f257bd3 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_layout_result.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_layout_result.cc
@@ -15,7 +15,7 @@ : physical_fragment_(std::move(physical_fragment)), out_of_flow_descendants_(out_of_flow_descendants), out_of_flow_positions_(out_of_flow_positions) { - unpositioned_floats_.Swap(unpositioned_floats); + unpositioned_floats_.swap(unpositioned_floats); } } // namespace blink
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_out_of_flow_layout_part_test.cc b/third_party/WebKit/Source/core/layout/ng/ng_out_of_flow_layout_part_test.cc index a937be91..fc4a0c68 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_out_of_flow_layout_part_test.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_out_of_flow_layout_part_test.cc
@@ -62,7 +62,7 @@ )HTML"); // Test whether the oof fragments have been collected at NG->Legacy boundary. - Element* rel = GetDocument().GetElementById("rel"); + Element* rel = GetDocument().getElementById("rel"); LayoutNGBlockFlow* block_flow = ToLayoutNGBlockFlow(rel->GetLayoutObject()); RefPtr<NGConstraintSpace> space = NGConstraintSpace::CreateFromLayoutObject(*block_flow); @@ -71,8 +71,8 @@ EXPECT_EQ(result->OutOfFlowDescendants().size(), (size_t)2); // Test the final result. - Element* fixed_1 = GetDocument().GetElementById("fixed1"); - Element* fixed_2 = GetDocument().GetElementById("fixed2"); + Element* fixed_1 = GetDocument().getElementById("fixed1"); + Element* fixed_2 = GetDocument().getElementById("fixed2"); // fixed1 top is static: #abs.top + #pad.height EXPECT_EQ(fixed_1->OffsetTop(), LayoutUnit(99)); // fixed2 top is positioned: #fixed2.top
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_physical_box_fragment.cc b/third_party/WebKit/Source/core/layout/ng/ng_physical_box_fragment.cc index 7a6877e..3d0b71b 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_physical_box_fragment.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_physical_box_fragment.cc
@@ -25,7 +25,7 @@ positioned_floats_(positioned_floats), bfc_offset_(bfc_offset), end_margin_strut_(end_margin_strut) { - children_.Swap(children); + children_.swap(children); } } // namespace blink
diff --git a/third_party/WebKit/Source/core/layout/svg/LayoutSVGForeignObjectTest.cpp b/third_party/WebKit/Source/core/layout/svg/LayoutSVGForeignObjectTest.cpp index 9b61c6a..33fc9cf29 100644 --- a/third_party/WebKit/Source/core/layout/svg/LayoutSVGForeignObjectTest.cpp +++ b/third_party/WebKit/Source/core/layout/svg/LayoutSVGForeignObjectTest.cpp
@@ -32,7 +32,7 @@ " </foreignObject>" "</svg>"); - const auto& svg = *GetDocument().GetElementById("svg"); + const auto& svg = *GetDocument().getElementById("svg"); const auto& foreign_object = *GetLayoutObjectByElementId("foreign"); const auto& div = *GetLayoutObjectByElementId("div"); @@ -91,9 +91,9 @@ "<div id='div' style='margin: 70px; width: 100px; height: 50px'></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - const auto& svg = *GetDocument().GetElementById("svg"); + const auto& svg = *GetDocument().getElementById("svg"); const auto& foreign_object = *GetLayoutObjectByElementId("foreign"); - const auto& div = *ChildDocument().GetElementById("div")->GetLayoutObject(); + const auto& div = *ChildDocument().getElementById("div")->GetLayoutObject(); EXPECT_EQ(FloatRect(100, 100, 300, 250), foreign_object.ObjectBoundingBox()); EXPECT_EQ(AffineTransform(), foreign_object.LocalSVGTransform());
diff --git a/third_party/WebKit/Source/core/page/ContextMenuControllerTest.cpp b/third_party/WebKit/Source/core/page/ContextMenuControllerTest.cpp index 3ea1544..51277e72 100644 --- a/third_party/WebKit/Source/core/page/ContextMenuControllerTest.cpp +++ b/third_party/WebKit/Source/core/page/ContextMenuControllerTest.cpp
@@ -95,8 +95,8 @@ // Create right button click event and pass it to context menu controller. Event* event = MouseEvent::Create(nullptr, EventTypeNames::click, mouse_initializer); - GetDocument().GetElementById("button_id")->focus(); - event->SetTarget(GetDocument().GetElementById("button_id")); + GetDocument().getElementById("button_id")->focus(); + event->SetTarget(GetDocument().getElementById("button_id")); GetDocument().GetPage()->GetContextMenuController().HandleContextMenuEvent( event);
diff --git a/third_party/WebKit/Source/core/page/scrolling/SnapCoordinatorTest.cpp b/third_party/WebKit/Source/core/page/scrolling/SnapCoordinatorTest.cpp index 719439ba..648eb1c 100644 --- a/third_party/WebKit/Source/core/page/scrolling/SnapCoordinatorTest.cpp +++ b/third_party/WebKit/Source/core/page/scrolling/SnapCoordinatorTest.cpp
@@ -63,7 +63,7 @@ } Element& SnapContainer() { - return *GetDocument().GetElementById("snap-container"); + return *GetDocument().getElementById("snap-container"); } SnapCoordinator& Coordinator() { return *GetDocument().GetSnapCoordinator(); } @@ -139,7 +139,7 @@ } TEST_P(SnapCoordinatorTest, SimpleSnapElement) { - Element& snap_element = *GetDocument().GetElementById("snap-element"); + Element& snap_element = *GetDocument().getElementById("snap-element"); snap_element.setAttribute(styleAttr, "scroll-snap-coordinate: 10px 11px;"); GetDocument().UpdateStyleAndLayout(); @@ -161,7 +161,7 @@ } TEST_P(SnapCoordinatorTest, NestedSnapElement) { - Element& snap_element = *GetDocument().GetElementById("nested-snap-element"); + Element& snap_element = *GetDocument().getElementById("nested-snap-element"); snap_element.setAttribute(styleAttr, "scroll-snap-coordinate: 20px 25px;"); GetDocument().UpdateStyleAndLayout(); @@ -170,10 +170,10 @@ } TEST_P(SnapCoordinatorTest, NestedSnapElementCaptured) { - Element& snap_element = *GetDocument().GetElementById("nested-snap-element"); + Element& snap_element = *GetDocument().getElementById("nested-snap-element"); snap_element.setAttribute(styleAttr, "scroll-snap-coordinate: 20px 25px;"); - Element* intermediate = GetDocument().GetElementById("intermediate"); + Element* intermediate = GetDocument().getElementById("intermediate"); intermediate->setAttribute(styleAttr, "overflow: scroll;"); GetDocument().UpdateStyleAndLayout(); @@ -186,7 +186,7 @@ TEST_P(SnapCoordinatorTest, PositionFixedSnapElement) { Element& snap_element = - *GetDocument().GetElementById("snap-element-fixed-position"); + *GetDocument().getElementById("snap-element-fixed-position"); snap_element.setAttribute(styleAttr, "scroll-snap-coordinate: 1px 1px;"); GetDocument().UpdateStyleAndLayout(); @@ -204,10 +204,10 @@ TEST_P(SnapCoordinatorTest, RepeatAndSnapElementTogether) { GetDocument() - .GetElementById("snap-element") + .getElementById("snap-element") ->setAttribute(styleAttr, "scroll-snap-coordinate: 5px 10px;"); GetDocument() - .GetElementById("nested-snap-element") + .getElementById("nested-snap-element") ->setAttribute(styleAttr, "scroll-snap-coordinate: 250px 450px;"); SnapContainer().setAttribute(styleAttr, @@ -232,7 +232,7 @@ } TEST_P(SnapCoordinatorTest, SnapPointsAreScrollOffsetIndependent) { - Element& snap_element = *GetDocument().GetElementById("snap-element"); + Element& snap_element = *GetDocument().getElementById("snap-element"); snap_element.setAttribute(styleAttr, "scroll-snap-coordinate: 10px 11px;"); SnapContainer().scrollBy(100, 100); GetDocument().UpdateStyleAndLayout(); @@ -244,7 +244,7 @@ } TEST_P(SnapCoordinatorTest, UpdateStyleForSnapElement) { - Element& snap_element = *GetDocument().GetElementById("snap-element"); + Element& snap_element = *GetDocument().getElementById("snap-element"); snap_element.setAttribute(styleAttr, "scroll-snap-coordinate: 10px 11px;"); GetDocument().UpdateStyleAndLayout(); @@ -258,7 +258,7 @@ EXPECT_EQ(0U, SnapOffsets(SnapContainer(), kVerticalScrollbar).size()); // Add a new snap element - Element& container = *GetDocument().GetElementById("snap-container"); + Element& container = *GetDocument().getElementById("snap-container"); container.setInnerHTML( "<div style='scroll-snap-coordinate: 20px 22px;'><div " "style='width:2000px; height:2000px;'></div></div>");
diff --git a/third_party/WebKit/Source/core/paint/BoxPaintInvalidatorTest.cpp b/third_party/WebKit/Source/core/paint/BoxPaintInvalidatorTest.cpp index eb453b8..d0503634 100644 --- a/third_party/WebKit/Source/core/paint/BoxPaintInvalidatorTest.cpp +++ b/third_party/WebKit/Source/core/paint/BoxPaintInvalidatorTest.cpp
@@ -71,7 +71,7 @@ TEST_P(BoxPaintInvalidatorTest, IncrementalInvalidationExpand) { GetDocument().View()->SetTracksPaintInvalidations(true); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); target->setAttribute(HTMLNames::styleAttr, "width: 100px; height: 200px"); GetDocument().View()->UpdateAllLifecyclePhases(); const auto& raster_invalidations = @@ -86,7 +86,7 @@ TEST_P(BoxPaintInvalidatorTest, IncrementalInvalidationShrink) { GetDocument().View()->SetTracksPaintInvalidations(true); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); target->setAttribute(HTMLNames::styleAttr, "width: 20px; height: 80px"); GetDocument().View()->UpdateAllLifecyclePhases(); const auto& raster_invalidations = @@ -101,7 +101,7 @@ TEST_P(BoxPaintInvalidatorTest, IncrementalInvalidationMixed) { GetDocument().View()->SetTracksPaintInvalidations(true); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); target->setAttribute(HTMLNames::styleAttr, "width: 100px; height: 80px"); GetDocument().View()->UpdateAllLifecyclePhases(); const auto& raster_invalidations = @@ -118,7 +118,7 @@ ScopedSlimmingPaintInvalidationForTest scoped_slimming_paint_invalidation( true); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); GetDocument().View()->SetTracksPaintInvalidations(true); target->setAttribute(HTMLNames::styleAttr, "width: 100.6px; height: 70.3px"); @@ -149,7 +149,7 @@ ScopedSlimmingPaintInvalidationForTest scoped_slimming_paint_invalidation( true); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); target->setAttribute(HTMLNames::classAttr, "border transform"); GetDocument().View()->UpdateAllLifecyclePhases(); @@ -186,7 +186,7 @@ ScopedSlimmingPaintInvalidationForTest scoped_slimming_paint_invalidation( true); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); LayoutObject* target_object = target->GetLayoutObject(); EXPECT_EQ(LayoutRect(0, 0, 70, 140), target_object->VisualRect()); @@ -225,7 +225,7 @@ ScopedSlimmingPaintInvalidationForTest scoped_slimming_paint_invalidation( true); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); target->setAttribute(HTMLNames::styleAttr, "transform: rotate(45deg)"); GetDocument().View()->UpdateAllLifecyclePhases(); @@ -247,14 +247,14 @@ ScopedSlimmingPaintInvalidationForTest scoped_slimming_paint_invalidation( true); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); target->setAttribute(HTMLNames::styleAttr, "transform: rotate(45deg); width: 200px"); target->setInnerHTML( "<div id=child style='width: 50px; height: 50px; background: " "red'></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* child = GetDocument().GetElementById("child"); + Element* child = GetDocument().getElementById("child"); // Should do full invalidation a rotated object is resized. GetDocument().View()->SetTracksPaintInvalidations(true); @@ -272,7 +272,7 @@ TEST_P(BoxPaintInvalidatorTest, CompositedLayoutViewResize) { EnableCompositing(); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); target->setAttribute(HTMLNames::classAttr, ""); target->setAttribute(HTMLNames::styleAttr, "height: 2000px"); GetDocument().View()->UpdateAllLifecyclePhases(); @@ -307,7 +307,7 @@ TEST_P(BoxPaintInvalidatorTest, CompositedLayoutViewGradientResize) { EnableCompositing(); GetDocument().body()->setAttribute(HTMLNames::classAttr, "gradient"); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); target->setAttribute(HTMLNames::classAttr, ""); target->setAttribute(HTMLNames::styleAttr, "height: 2000px"); GetDocument().View()->UpdateAllLifecyclePhases(); @@ -355,8 +355,8 @@ "</style>" "<div id='content' style='width: 200px; height: 200px'></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* iframe = GetDocument().GetElementById("iframe"); - Element* content = ChildDocument().GetElementById("content"); + Element* iframe = GetDocument().getElementById("iframe"); + Element* content = ChildDocument().getElementById("content"); EXPECT_EQ(GetLayoutView(), content->GetLayoutObject()->ContainerForPaintInvalidation()); @@ -412,8 +412,8 @@ "</style>" "<div id='content' style='width: 200px; height: 200px'></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* iframe = GetDocument().GetElementById("iframe"); - Element* content = ChildDocument().GetElementById("content"); + Element* iframe = GetDocument().getElementById("iframe"); + Element* content = ChildDocument().getElementById("content"); LayoutView* frame_layout_view = content->GetLayoutObject()->View(); EXPECT_EQ(GetLayoutView(), content->GetLayoutObject()->ContainerForPaintInvalidation()); @@ -460,13 +460,13 @@ TEST_P(BoxPaintInvalidatorTest, CompositedBackgroundAttachmentLocalResize) { EnableCompositing(); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); target->setAttribute(HTMLNames::classAttr, "border local-background"); target->setAttribute(HTMLNames::styleAttr, "will-change: transform"); target->setInnerHTML( "<div id=child style='width: 500px; height: 500px'></div>", ASSERT_NO_EXCEPTION); - Element* child = GetDocument().GetElementById("child"); + Element* child = GetDocument().getElementById("child"); GetDocument().View()->UpdateAllLifecyclePhases(); // Resize the content. @@ -516,14 +516,14 @@ CompositedBackgroundAttachmentLocalGradientResize) { EnableCompositing(); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); target->setAttribute(HTMLNames::classAttr, "border local-background gradient"); target->setAttribute(HTMLNames::styleAttr, "will-change: transform"); target->setInnerHTML( "<div id='child' style='width: 500px; height: 500px'></div>", ASSERT_NO_EXCEPTION); - Element* child = GetDocument().GetElementById("child"); + Element* child = GetDocument().getElementById("child"); GetDocument().View()->UpdateAllLifecyclePhases(); // Resize the content. @@ -570,12 +570,12 @@ } TEST_P(BoxPaintInvalidatorTest, NonCompositedBackgroundAttachmentLocalResize) { - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); target->setAttribute(HTMLNames::classAttr, "border local-background"); target->setInnerHTML( "<div id=child style='width: 500px; height: 500px'></div>", ASSERT_NO_EXCEPTION); - Element* child = GetDocument().GetElementById("child"); + Element* child = GetDocument().getElementById("child"); GetDocument().View()->UpdateAllLifecyclePhases(); EXPECT_EQ(&GetLayoutView(), &target->GetLayoutObject()->ContainerForPaintInvalidation());
diff --git a/third_party/WebKit/Source/core/paint/PaintInvalidationTest.cpp b/third_party/WebKit/Source/core/paint/PaintInvalidationTest.cpp index 324131b..dc4f14d 100644 --- a/third_party/WebKit/Source/core/paint/PaintInvalidationTest.cpp +++ b/third_party/WebKit/Source/core/paint/PaintInvalidationTest.cpp
@@ -50,7 +50,7 @@ ASSERT_EQ(scrollable_area->MaximumScrollOffset().Height(), 0); EXPECT_FALSE(GetDocument().GetLayoutView()->MayNeedPaintInvalidation()); - Element* container = GetDocument().GetElementById("container"); + Element* container = GetDocument().getElementById("container"); container->setAttribute(HTMLNames::styleAttr, "transform: translateY(1000px);"); GetDocument().UpdateStyleAndLayoutTree(); @@ -71,7 +71,7 @@ "</style>" "<iframe id='iframe'></iframe>"); - Element* iframe = GetDocument().GetElementById("iframe"); + Element* iframe = GetDocument().getElementById("iframe"); LayoutView* child_layout_view = ChildDocument().GetLayoutView(); EXPECT_EQ(GetDocument().GetLayoutView(), &child_layout_view->ContainerForPaintInvalidation()); @@ -111,10 +111,10 @@ " <div id='transform'></div>" "</div>"); - auto& fixed = *GetDocument().GetElementById("fixed"); + auto& fixed = *GetDocument().getElementById("fixed"); const auto& fixed_object = ToLayoutBox(*fixed.GetLayoutObject()); const auto& fixed_layer = *fixed_object.Layer(); - auto& transform = *GetDocument().GetElementById("transform"); + auto& transform = *GetDocument().getElementById("transform"); EXPECT_TRUE(fixed_layer.SubtreeIsInvisible()); EXPECT_EQ(LayoutRect(0, 0, 110, 120), fixed_object.LayoutOverflowRect());
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerClipperTest.cpp b/third_party/WebKit/Source/core/paint/PaintLayerClipperTest.cpp index 62cd610..5d6d0ec1 100644 --- a/third_party/WebKit/Source/core/paint/PaintLayerClipperTest.cpp +++ b/third_party/WebKit/Source/core/paint/PaintLayerClipperTest.cpp
@@ -44,7 +44,7 @@ " <rect width=400 height=500 fill='blue'/>" "</svg>"); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); PaintLayer* target_paint_layer = ToLayoutBoxModelObject(target->GetLayoutObject())->Layer(); ClipRectsContext context( @@ -76,7 +76,7 @@ "<!DOCTYPE html>" "<input id=target style='position:absolute; width: 200px; height: 300px'" " type=button>"); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); PaintLayer* target_paint_layer = ToLayoutBoxModelObject(target->GetLayoutObject())->Layer(); ClipRectsContext context(GetDocument().GetLayoutView()->Layer(), @@ -118,7 +118,7 @@ " overflow: hidden; border-radius: 1px'>" "</div>"); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); PaintLayer* target_paint_layer = ToLayoutBoxModelObject(target->GetLayoutObject())->Layer(); ClipRectsContext context(GetDocument().GetLayoutView()->Layer(), @@ -157,11 +157,11 @@ " </div>" "</div>"); - Element* parent = GetDocument().GetElementById("parent"); + Element* parent = GetDocument().getElementById("parent"); PaintLayer* parent_paint_layer = ToLayoutBoxModelObject(parent->GetLayoutObject())->Layer(); - Element* child = GetDocument().GetElementById("child"); + Element* child = GetDocument().getElementById("child"); PaintLayer* child_paint_layer = ToLayoutBoxModelObject(child->GetLayoutObject())->Layer(); @@ -192,7 +192,7 @@ " Test long texttttttttttttttttttttttttttttttt" " </option>" "</select>"); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); PaintLayer* target_paint_layer = ToLayoutBoxModelObject(target->GetLayoutObject())->Layer(); ClipRectsContext context(GetDocument().GetLayoutView()->Layer(), @@ -229,7 +229,7 @@ " </foreignObject>" "</svg>"); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); PaintLayer* target_paint_layer = ToLayoutBoxModelObject(target->GetLayoutObject())->Layer(); ClipRectsContext context(GetDocument().GetLayoutView()->Layer(),
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp b/third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp index 13e261855..8fe045b8 100644 --- a/third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp +++ b/third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp
@@ -93,13 +93,13 @@ GetDocument().View()->UpdateAllLifecyclePhases(); LayoutObject& container1 = - *GetDocument().GetElementById("container1")->GetLayoutObject(); + *GetDocument().getElementById("container1")->GetLayoutObject(); LayoutObject& content1 = - *GetDocument().GetElementById("content1")->GetLayoutObject(); + *GetDocument().getElementById("content1")->GetLayoutObject(); LayoutObject& container2 = - *GetDocument().GetElementById("container2")->GetLayoutObject(); + *GetDocument().getElementById("container2")->GetLayoutObject(); LayoutObject& content2 = - *GetDocument().GetElementById("content2")->GetLayoutObject(); + *GetDocument().getElementById("content2")->GetLayoutObject(); if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { EXPECT_DISPLAY_LIST( @@ -159,9 +159,9 @@ "50px'></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - LayoutObject& svg = *GetDocument().GetElementById("svg")->GetLayoutObject(); - LayoutObject& rect = *GetDocument().GetElementById("rect")->GetLayoutObject(); - LayoutObject& div = *GetDocument().GetElementById("div")->GetLayoutObject(); + LayoutObject& svg = *GetDocument().getElementById("svg")->GetLayoutObject(); + LayoutObject& rect = *GetDocument().getElementById("rect")->GetLayoutObject(); + LayoutObject& div = *GetDocument().getElementById("div")->GetLayoutObject(); if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { // SPv2 slips the clip box (see BoxClipper). @@ -249,19 +249,19 @@ RootPaintController().InvalidateAll(); LayoutObject& container1 = - *GetDocument().GetElementById("container1")->GetLayoutObject(); + *GetDocument().getElementById("container1")->GetLayoutObject(); LayoutObject& content1 = - *GetDocument().GetElementById("content1")->GetLayoutObject(); + *GetDocument().getElementById("content1")->GetLayoutObject(); LayoutObject& container2 = - *GetDocument().GetElementById("container2")->GetLayoutObject(); + *GetDocument().getElementById("container2")->GetLayoutObject(); LayoutObject& content2a = - *GetDocument().GetElementById("content2a")->GetLayoutObject(); + *GetDocument().getElementById("content2a")->GetLayoutObject(); LayoutObject& content2b = - *GetDocument().GetElementById("content2b")->GetLayoutObject(); + *GetDocument().getElementById("content2b")->GetLayoutObject(); LayoutObject& container3 = - *GetDocument().GetElementById("container3")->GetLayoutObject(); + *GetDocument().getElementById("container3")->GetLayoutObject(); LayoutObject& content3 = - *GetDocument().GetElementById("content3")->GetLayoutObject(); + *GetDocument().getElementById("content3")->GetLayoutObject(); GetDocument().View()->UpdateAllLifecyclePhasesExceptPaint(); IntRect interest_rect(0, 0, 400, 300); @@ -322,13 +322,13 @@ Paint(&interest_rect); LayoutObject& container1 = - *GetDocument().GetElementById("container1")->GetLayoutObject(); + *GetDocument().getElementById("container1")->GetLayoutObject(); LayoutObject& content1 = - *GetDocument().GetElementById("content1")->GetLayoutObject(); + *GetDocument().getElementById("content1")->GetLayoutObject(); LayoutObject& container2 = - *GetDocument().GetElementById("container2")->GetLayoutObject(); + *GetDocument().getElementById("container2")->GetLayoutObject(); LayoutObject& content2 = - *GetDocument().GetElementById("content2")->GetLayoutObject(); + *GetDocument().getElementById("content2")->GetLayoutObject(); if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { EXPECT_DISPLAY_LIST( @@ -392,18 +392,18 @@ " </div>" "</div>"); LayoutObject& outline_div = - *GetDocument().GetElementById("outline")->GetLayoutObject(); + *GetDocument().getElementById("outline")->GetLayoutObject(); ToHTMLElement(outline_div.GetNode()) ->setAttribute(HTMLNames::styleAttr, style_without_outline); GetDocument().View()->UpdateAllLifecyclePhases(); LayoutBoxModelObject& self_painting_layer_object = *ToLayoutBoxModelObject( - GetDocument().GetElementById("self-painting-layer")->GetLayoutObject()); + GetDocument().getElementById("self-painting-layer")->GetLayoutObject()); PaintLayer& self_painting_layer = *self_painting_layer_object.Layer(); ASSERT_TRUE(self_painting_layer.IsSelfPaintingLayer()); PaintLayer& non_self_painting_layer = *ToLayoutBoxModelObject(GetDocument() - .GetElementById("non-self-painting-layer") + .getElementById("non-self-painting-layer") ->GetLayoutObject()) ->Layer(); ASSERT_FALSE(non_self_painting_layer.IsSelfPaintingLayer()); @@ -458,18 +458,18 @@ " </div>" "</div>"); LayoutObject& float_div = - *GetDocument().GetElementById("float")->GetLayoutObject(); + *GetDocument().getElementById("float")->GetLayoutObject(); ToHTMLElement(float_div.GetNode()) ->setAttribute(HTMLNames::styleAttr, style_without_float); GetDocument().View()->UpdateAllLifecyclePhases(); LayoutBoxModelObject& self_painting_layer_object = *ToLayoutBoxModelObject( - GetDocument().GetElementById("self-painting-layer")->GetLayoutObject()); + GetDocument().getElementById("self-painting-layer")->GetLayoutObject()); PaintLayer& self_painting_layer = *self_painting_layer_object.Layer(); ASSERT_TRUE(self_painting_layer.IsSelfPaintingLayer()); PaintLayer& non_self_painting_layer = *ToLayoutBoxModelObject(GetDocument() - .GetElementById("non-self-painting-layer") + .getElementById("non-self-painting-layer") ->GetLayoutObject()) ->Layer(); ASSERT_FALSE(non_self_painting_layer.IsSelfPaintingLayer()); @@ -511,19 +511,19 @@ GetDocument().View()->UpdateAllLifecyclePhases(); LayoutObject& float_div = - *GetDocument().GetElementById("float")->GetLayoutObject(); + *GetDocument().getElementById("float")->GetLayoutObject(); LayoutBoxModelObject& span = *ToLayoutBoxModelObject( - GetDocument().GetElementById("span")->GetLayoutObject()); + GetDocument().getElementById("span")->GetLayoutObject()); PaintLayer& span_layer = *span.Layer(); ASSERT_TRUE(&span_layer == float_div.EnclosingLayer()); ASSERT_FALSE(span_layer.NeedsPaintPhaseFloat()); LayoutBoxModelObject& self_painting_layer_object = *ToLayoutBoxModelObject( - GetDocument().GetElementById("self-painting-layer")->GetLayoutObject()); + GetDocument().getElementById("self-painting-layer")->GetLayoutObject()); PaintLayer& self_painting_layer = *self_painting_layer_object.Layer(); ASSERT_TRUE(self_painting_layer.IsSelfPaintingLayer()); PaintLayer& non_self_painting_layer = *ToLayoutBoxModelObject(GetDocument() - .GetElementById("non-self-painting-layer") + .getElementById("non-self-painting-layer") ->GetLayoutObject()) ->Layer(); ASSERT_FALSE(non_self_painting_layer.IsSelfPaintingLayer()); @@ -549,18 +549,18 @@ " </div>" "</div>"); LayoutObject& background_div = - *GetDocument().GetElementById("background")->GetLayoutObject(); + *GetDocument().getElementById("background")->GetLayoutObject(); ToHTMLElement(background_div.GetNode()) ->setAttribute(HTMLNames::styleAttr, style_without_background); GetDocument().View()->UpdateAllLifecyclePhases(); LayoutBoxModelObject& self_painting_layer_object = *ToLayoutBoxModelObject( - GetDocument().GetElementById("self-painting-layer")->GetLayoutObject()); + GetDocument().getElementById("self-painting-layer")->GetLayoutObject()); PaintLayer& self_painting_layer = *self_painting_layer_object.Layer(); ASSERT_TRUE(self_painting_layer.IsSelfPaintingLayer()); PaintLayer& non_self_painting_layer = *ToLayoutBoxModelObject(GetDocument() - .GetElementById("non-self-painting-layer") + .getElementById("non-self-painting-layer") ->GetLayoutObject()) ->Layer(); ASSERT_FALSE(non_self_painting_layer.IsSelfPaintingLayer()); @@ -615,7 +615,7 @@ "</div>"); LayoutBoxModelObject& layer_div = *ToLayoutBoxModelObject( - GetDocument().GetElementById("layer")->GetLayoutObject()); + GetDocument().getElementById("layer")->GetLayoutObject()); PaintLayer& layer = *layer_div.Layer(); ASSERT_TRUE(layer.IsSelfPaintingLayer()); EXPECT_TRUE(layer.NeedsPaintPhaseDescendantOutlines()); @@ -650,7 +650,7 @@ "</div>"); LayoutBoxModelObject& layer_div = *ToLayoutBoxModelObject( - GetDocument().GetElementById("will-be-layer")->GetLayoutObject()); + GetDocument().getElementById("will-be-layer")->GetLayoutObject()); EXPECT_FALSE(layer_div.HasLayer()); PaintLayer& html_layer = @@ -683,7 +683,7 @@ "</div>"); LayoutBoxModelObject& layer_div = *ToLayoutBoxModelObject( - GetDocument().GetElementById("will-be-self-painting")->GetLayoutObject()); + GetDocument().getElementById("will-be-self-painting")->GetLayoutObject()); ASSERT_TRUE(layer_div.HasLayer()); EXPECT_FALSE(layer_div.Layer()->IsSelfPaintingLayer()); @@ -717,7 +717,7 @@ LayoutBoxModelObject& layer_div = *ToLayoutBoxModelObject(GetDocument() - .GetElementById("will-be-non-self-painting") + .getElementById("will-be-non-self-painting") ->GetLayoutObject()); ASSERT_TRUE(layer_div.HasLayer()); PaintLayer& layer = *layer_div.Layer();
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerScrollableAreaTest.cpp b/third_party/WebKit/Source/core/paint/PaintLayerScrollableAreaTest.cpp index 2693110..aff30d959 100644 --- a/third_party/WebKit/Source/core/paint/PaintLayerScrollableAreaTest.cpp +++ b/third_party/WebKit/Source/core/paint/PaintLayerScrollableAreaTest.cpp
@@ -223,7 +223,7 @@ GetDocument().View()->UpdateAllLifecyclePhases(); EXPECT_TRUE(RuntimeEnabledFeatures::compositeOpaqueScrollersEnabled()); - Element* scroller = GetDocument().GetElementById("scroller"); + Element* scroller = GetDocument().getElementById("scroller"); PaintLayer* paint_layer = ToLayoutBoxModelObject(scroller->GetLayoutObject())->Layer(); ASSERT_TRUE(paint_layer); @@ -254,7 +254,7 @@ GetDocument().View()->UpdateAllLifecyclePhases(); EXPECT_TRUE(RuntimeEnabledFeatures::compositeOpaqueScrollersEnabled()); - Element* scroller = GetDocument().GetElementById("scroller"); + Element* scroller = GetDocument().getElementById("scroller"); PaintLayer* paint_layer = ToLayoutBoxModelObject(scroller->GetLayoutObject())->Layer(); ASSERT_TRUE(paint_layer); @@ -277,7 +277,7 @@ GetDocument().View()->UpdateAllLifecyclePhases(); EXPECT_TRUE(RuntimeEnabledFeatures::compositeOpaqueScrollersEnabled()); - Element* scroller = GetDocument().GetElementById("scroller"); + Element* scroller = GetDocument().getElementById("scroller"); PaintLayer* paint_layer = ToLayoutBoxModelObject(scroller->GetLayoutObject())->Layer(); ASSERT_TRUE(paint_layer); @@ -299,7 +299,7 @@ GetDocument().View()->UpdateAllLifecyclePhases(); EXPECT_TRUE(RuntimeEnabledFeatures::compositeOpaqueScrollersEnabled()); - Element* scroller = GetDocument().GetElementById("scroller"); + Element* scroller = GetDocument().getElementById("scroller"); PaintLayer* paint_layer = ToLayoutBoxModelObject(scroller->GetLayoutObject())->Layer(); ASSERT_TRUE(paint_layer); @@ -330,7 +330,7 @@ GetDocument().View()->UpdateAllLifecyclePhases(); EXPECT_TRUE(RuntimeEnabledFeatures::compositeOpaqueScrollersEnabled()); - Element* scroller = GetDocument().GetElementById("scroller"); + Element* scroller = GetDocument().getElementById("scroller"); PaintLayer* paint_layer = ToLayoutBoxModelObject(scroller->GetLayoutObject())->Layer(); ASSERT_TRUE(paint_layer); @@ -366,8 +366,8 @@ GetDocument().View()->UpdateAllLifecyclePhases(); EXPECT_TRUE(RuntimeEnabledFeatures::compositeOpaqueScrollersEnabled()); - Element* parent = GetDocument().GetElementById("parent"); - Element* scroller = GetDocument().GetElementById("scroller"); + Element* parent = GetDocument().getElementById("parent"); + Element* scroller = GetDocument().getElementById("scroller"); PaintLayer* paint_layer = ToLayoutBoxModelObject(scroller->GetLayoutObject())->Layer(); ASSERT_TRUE(paint_layer); @@ -420,8 +420,8 @@ GetDocument().View()->UpdateAllLifecyclePhases(); EXPECT_TRUE(RuntimeEnabledFeatures::compositeOpaqueScrollersEnabled()); - Element* parent = GetDocument().GetElementById("parent"); - Element* scroller = GetDocument().GetElementById("scroller"); + Element* parent = GetDocument().getElementById("parent"); + Element* scroller = GetDocument().getElementById("scroller"); PaintLayer* paint_layer = ToLayoutBoxModelObject(scroller->GetLayoutObject())->Layer(); ASSERT_TRUE(paint_layer); @@ -470,9 +470,9 @@ "<div id=\"black\">c</div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* none = GetDocument().GetElementById("none"); - Element* white = GetDocument().GetElementById("white"); - Element* black = GetDocument().GetElementById("black"); + Element* none = GetDocument().getElementById("none"); + Element* white = GetDocument().getElementById("white"); + Element* black = GetDocument().getElementById("black"); PaintLayer* none_layer = ToLayoutBoxModelObject(none->GetLayoutObject())->Layer(); @@ -508,7 +508,7 @@ "<div id=\"scroller\"><div id=\"scrolled\"></div></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* scroller = GetDocument().GetElementById("scroller"); + Element* scroller = GetDocument().getElementById("scroller"); PaintLayer* paint_layer = ToLayoutBoxModelObject(scroller->GetLayoutObject())->Layer(); ASSERT_TRUE(paint_layer); @@ -538,7 +538,7 @@ "<div id=\"scroller\"><div id=\"scrolled\"></div></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* scroller = GetDocument().GetElementById("scroller"); + Element* scroller = GetDocument().getElementById("scroller"); PaintLayerScrollableArea* scrollable_area = ToLayoutBoxModelObject(scroller->GetLayoutObject())->GetScrollableArea(); ASSERT_TRUE(scrollable_area); @@ -565,7 +565,7 @@ "</style>" "<div id=\"scroller\"><div id=\"scrolled\"></div></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* scroller = GetDocument().GetElementById("scroller"); + Element* scroller = GetDocument().getElementById("scroller"); ASSERT_TRUE(scroller); PaintLayerScrollableArea* scrollable_area = ToLayoutBoxModelObject(scroller->GetLayoutObject())->GetScrollableArea(); @@ -593,7 +593,7 @@ " <div id='innerDiv'></div>" "</div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* outer_div = GetDocument().GetElementById("outerDiv"); + Element* outer_div = GetDocument().getElementById("outerDiv"); ASSERT_TRUE(outer_div); outer_div->GetLayoutObject()->SetNeedsLayout("test"); GetDocument().View()->UpdateAllLifecyclePhases(); @@ -621,7 +621,7 @@ " </div>" "</div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - Element* container = GetDocument().GetElementById("container"); + Element* container = GetDocument().getElementById("container"); ASSERT_TRUE(container); PaintLayerScrollableArea* scrollable_area = ToLayoutBoxModelObject(container->GetLayoutObject())->GetScrollableArea();
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerTest.cpp b/third_party/WebKit/Source/core/paint/PaintLayerTest.cpp index 34b8339..0a48768 100644 --- a/third_party/WebKit/Source/core/paint/PaintLayerTest.cpp +++ b/third_party/WebKit/Source/core/paint/PaintLayerTest.cpp
@@ -309,7 +309,7 @@ EXPECT_FALSE(grandchild1->SupportsSubsequenceCaching()); GetDocument() - .GetElementById("grandchild1") + .getElementById("grandchild1") ->setAttribute(HTMLNames::styleAttr, "isolation: isolate"); GetDocument().View()->UpdateAllLifecyclePhases(); @@ -389,7 +389,7 @@ EXPECT_FALSE(parent->Has3DTransformedDescendant()); EXPECT_FALSE(child->Has3DTransformedDescendant()); - GetDocument().GetElementById("child")->setAttribute( + GetDocument().getElementById("child")->setAttribute( HTMLNames::styleAttr, "transform: translateZ(1px)"); GetDocument().View()->UpdateAllLifecyclePhases(); @@ -444,7 +444,7 @@ " style='transform: translate3d(4px, 5px, 6px);'/>"); // Move the child frame offscreen so it becomes available for throttling. - auto* iframe = toHTMLIFrameElement(GetDocument().GetElementById("iframe")); + auto* iframe = toHTMLIFrameElement(GetDocument().getElementById("iframe")); iframe->setAttribute(HTMLNames::styleAttr, "transform: translateY(5555px)"); GetDocument().View()->UpdateAllLifecyclePhases(); // Ensure intersection observer notifications get delivered. @@ -1010,7 +1010,7 @@ SetBodyInnerHTML("<div id='target' style='will-change: transform'></div>"); LayoutObject* target_object = - GetDocument().GetElementById("target")->GetLayoutObject(); + GetDocument().getElementById("target")->GetLayoutObject(); PaintLayer* target_paint_layer = ToLayoutBoxModelObject(target_object)->Layer(); EXPECT_EQ(nullptr, target_paint_layer->Transform());
diff --git a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp index b14582cd..da5a8c4 100644 --- a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp +++ b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp
@@ -62,7 +62,7 @@ const ObjectPaintProperties* PaintPropertyTreeBuilderTest::PaintPropertiesForElement(const char* name) { return GetDocument() - .GetElementById(name) + .getElementById(name) ->GetLayoutObject() ->PaintProperties(); } @@ -125,10 +125,10 @@ TEST_P(PaintPropertyTreeBuilderTest, FixedPosition) { LoadTestData("fixed-position.html"); - Element* positioned_scroll = GetDocument().GetElementById("positionedScroll"); + Element* positioned_scroll = GetDocument().getElementById("positionedScroll"); positioned_scroll->setScrollTop(3); Element* transformed_scroll = - GetDocument().GetElementById("transformedScroll"); + GetDocument().getElementById("transformedScroll"); transformed_scroll->setScrollTop(5); FrameView* frame_view = GetDocument().View(); @@ -137,7 +137,7 @@ // target1 is a fixed-position element inside an absolute-position scrolling // element. It should be attached under the viewport to skip scrolling and // offset of the parent. - Element* target1 = GetDocument().GetElementById("target1"); + Element* target1 = GetDocument().getElementById("target1"); const ObjectPaintProperties* target1_properties = target1->GetLayoutObject()->PaintProperties(); EXPECT_EQ(FloatRoundedRect(200, 150, 100, 100), @@ -162,10 +162,10 @@ // target2 is a fixed-position element inside a transformed scrolling element. // It should be attached under the scrolled box of the transformed element. - Element* target2 = GetDocument().GetElementById("target2"); + Element* target2 = GetDocument().getElementById("target2"); const ObjectPaintProperties* target2_properties = target2->GetLayoutObject()->PaintProperties(); - Element* scroller = GetDocument().GetElementById("transformedScroll"); + Element* scroller = GetDocument().getElementById("transformedScroll"); const ObjectPaintProperties* scroller_properties = scroller->GetLayoutObject()->PaintProperties(); EXPECT_EQ(FloatRoundedRect(200, 150, 100, 100), @@ -192,7 +192,7 @@ TEST_P(PaintPropertyTreeBuilderTest, PositionAndScroll) { LoadTestData("position-and-scroll.html"); - Element* scroller = GetDocument().GetElementById("scroller"); + Element* scroller = GetDocument().getElementById("scroller"); scroller->scrollTo(0, 100); FrameView* frame_view = GetDocument().View(); frame_view->UpdateAllLifecyclePhases(); @@ -219,7 +219,7 @@ // The relative-positioned element should have accumulated box offset (exclude // scrolling), and should be affected by ancestor scroll transforms. - Element* rel_pos = GetDocument().GetElementById("rel-pos"); + Element* rel_pos = GetDocument().getElementById("rel-pos"); const ObjectPaintProperties* rel_pos_properties = rel_pos->GetLayoutObject()->PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate(680, 1120), @@ -237,7 +237,7 @@ // The absolute-positioned element should not be affected by non-positioned // scroller at all. - Element* abs_pos = GetDocument().GetElementById("abs-pos"); + Element* abs_pos = GetDocument().getElementById("abs-pos"); const ObjectPaintProperties* abs_pos_properties = abs_pos->GetLayoutObject()->PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate(123, 456), @@ -300,7 +300,7 @@ "<div id='perspective'>" " <div id='inner'></div>" "</div>"); - Element* perspective = GetDocument().GetElementById("perspective"); + Element* perspective = GetDocument().getElementById("perspective"); const ObjectPaintProperties* perspective_properties = perspective->GetLayoutObject()->PaintProperties(); EXPECT_EQ(TransformationMatrix().ApplyPerspective(100), @@ -314,7 +314,7 @@ // Adding perspective doesn't clear paint offset. The paint offset will be // passed down to children. - Element* inner = GetDocument().GetElementById("inner"); + Element* inner = GetDocument().getElementById("inner"); const ObjectPaintProperties* inner_properties = inner->GetLayoutObject()->PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate(50, 100), @@ -352,7 +352,7 @@ " transform: translate3d(123px, 456px, 789px)'>" "</div>"); - Element* transform = GetDocument().GetElementById("transform"); + Element* transform = GetDocument().getElementById("transform"); const ObjectPaintProperties* transform_properties = transform->GetLayoutObject()->PaintProperties(); @@ -400,7 +400,7 @@ "</div>" "</div>"); - Element* preserve = GetDocument().GetElementById("preserve"); + Element* preserve = GetDocument().getElementById("preserve"); const ObjectPaintProperties* preserve_properties = preserve->GetLayoutObject()->PaintProperties(); @@ -418,7 +418,7 @@ "</div>" "</div>"); - Element* perspective = GetDocument().GetElementById("perspective"); + Element* perspective = GetDocument().getElementById("perspective"); const ObjectPaintProperties* perspective_properties = perspective->GetLayoutObject()->PaintProperties(); @@ -457,7 +457,7 @@ " will-change: transform'>" "</div>"); - Element* transform = GetDocument().GetElementById("transform"); + Element* transform = GetDocument().getElementById("transform"); const ObjectPaintProperties* transform_properties = transform->GetLayoutObject()->PaintProperties(); @@ -498,7 +498,7 @@ " will-change: transform, contents'>" "</div>"); - Element* transform = GetDocument().GetElementById("transform"); + Element* transform = GetDocument().getElementById("transform"); EXPECT_EQ(nullptr, transform->GetLayoutObject()->PaintProperties()); CHECK_EXACT_VISUAL_RECT(LayoutRect(50, 100, 400, 300), transform->GetLayoutObject(), @@ -508,7 +508,7 @@ TEST_P(PaintPropertyTreeBuilderTest, RelativePositionInline) { LoadTestData("relative-position-inline.html"); - Element* inline_block = GetDocument().GetElementById("inline-block"); + Element* inline_block = GetDocument().getElementById("inline-block"); const ObjectPaintProperties* inline_block_properties = inline_block->GetLayoutObject()->PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate(135, 490), @@ -534,7 +534,7 @@ "</div>"); LayoutObject* node_without_opacity = - GetDocument().GetElementById("nodeWithoutOpacity")->GetLayoutObject(); + GetDocument().getElementById("nodeWithoutOpacity")->GetLayoutObject(); const ObjectPaintProperties* node_without_opacity_properties = node_without_opacity->PaintProperties(); EXPECT_EQ(nullptr, node_without_opacity_properties); @@ -542,7 +542,7 @@ GetDocument().View()->GetLayoutView()); LayoutObject* child_with_opacity = - GetDocument().GetElementById("childWithOpacity")->GetLayoutObject(); + GetDocument().getElementById("childWithOpacity")->GetLayoutObject(); const ObjectPaintProperties* child_with_opacity_properties = child_with_opacity->PaintProperties(); EXPECT_EQ(0.5f, child_with_opacity_properties->Effect()->Opacity()); @@ -553,7 +553,7 @@ LayoutObject* grand_child_without_opacity = GetDocument() - .GetElementById("grandChildWithoutOpacity") + .getElementById("grandChildWithoutOpacity") ->GetLayoutObject(); EXPECT_EQ(nullptr, grand_child_without_opacity->PaintProperties()); CHECK_EXACT_VISUAL_RECT(LayoutRect(8, 8, 20, 30), grand_child_without_opacity, @@ -561,7 +561,7 @@ LayoutObject* great_grand_child_with_opacity = GetDocument() - .GetElementById("greatGrandChildWithOpacity") + .getElementById("greatGrandChildWithOpacity") ->GetLayoutObject(); const ObjectPaintProperties* great_grand_child_with_opacity_properties = great_grand_child_with_opacity->PaintProperties(); @@ -600,7 +600,7 @@ "</div>"); LayoutObject* node_with_opacity = - GetDocument().GetElementById("nodeWithOpacity")->GetLayoutObject(); + GetDocument().getElementById("nodeWithOpacity")->GetLayoutObject(); const ObjectPaintProperties* node_with_opacity_properties = node_with_opacity->PaintProperties(); EXPECT_EQ(0.6f, node_with_opacity_properties->Effect()->Opacity()); @@ -610,7 +610,7 @@ GetDocument().View()->GetLayoutView()); LayoutObject* child_with_transform = - GetDocument().GetElementById("childWithTransform")->GetLayoutObject(); + GetDocument().getElementById("childWithTransform")->GetLayoutObject(); const ObjectPaintProperties* child_with_transform_properties = child_with_transform->PaintProperties(); EXPECT_EQ(nullptr, child_with_transform_properties->Effect()); @@ -620,7 +620,7 @@ GetDocument().View()->GetLayoutView()); LayoutObject* grand_child_with_opacity = - GetDocument().GetElementById("grandChildWithOpacity")->GetLayoutObject(); + GetDocument().getElementById("grandChildWithOpacity")->GetLayoutObject(); const ObjectPaintProperties* grand_child_with_opacity_properties = grand_child_with_opacity->PaintProperties(); EXPECT_EQ(0.4f, grand_child_with_opacity_properties->Effect()->Opacity()); @@ -643,7 +643,7 @@ "</div>"); LayoutObject* node_with_opacity = - GetDocument().GetElementById("nodeWithOpacity")->GetLayoutObject(); + GetDocument().getElementById("nodeWithOpacity")->GetLayoutObject(); const ObjectPaintProperties* node_with_opacity_properties = node_with_opacity->PaintProperties(); EXPECT_EQ(0.6f, node_with_opacity_properties->Effect()->Opacity()); @@ -654,7 +654,7 @@ LayoutObject* child_with_stacking_context = GetDocument() - .GetElementById("childWithStackingContext") + .getElementById("childWithStackingContext") ->GetLayoutObject(); const ObjectPaintProperties* child_with_stacking_context_properties = child_with_stacking_context->PaintProperties(); @@ -663,7 +663,7 @@ GetDocument().View()->GetLayoutView()); LayoutObject* grand_child_with_opacity = - GetDocument().GetElementById("grandChildWithOpacity")->GetLayoutObject(); + GetDocument().getElementById("grandChildWithOpacity")->GetLayoutObject(); const ObjectPaintProperties* grand_child_with_opacity_properties = grand_child_with_opacity->PaintProperties(); EXPECT_EQ(0.4f, grand_child_with_opacity_properties->Effect()->Opacity()); @@ -687,20 +687,20 @@ "</svg>"); LayoutObject* group_with_opacity = - GetDocument().GetElementById("groupWithOpacity")->GetLayoutObject(); + GetDocument().getElementById("groupWithOpacity")->GetLayoutObject(); const ObjectPaintProperties* group_with_opacity_properties = group_with_opacity->PaintProperties(); EXPECT_EQ(0.6f, group_with_opacity_properties->Effect()->Opacity()); EXPECT_NE(nullptr, group_with_opacity_properties->Effect()->Parent()); LayoutObject& rect_without_opacity = - *GetDocument().GetElementById("rectWithoutOpacity")->GetLayoutObject(); + *GetDocument().getElementById("rectWithoutOpacity")->GetLayoutObject(); const ObjectPaintProperties* rect_without_opacity_properties = rect_without_opacity.PaintProperties(); EXPECT_EQ(nullptr, rect_without_opacity_properties); LayoutObject& rect_with_opacity = - *GetDocument().GetElementById("rectWithOpacity")->GetLayoutObject(); + *GetDocument().getElementById("rectWithOpacity")->GetLayoutObject(); const ObjectPaintProperties* rect_with_opacity_properties = rect_with_opacity.PaintProperties(); EXPECT_EQ(0.4f, rect_with_opacity_properties->Effect()->Opacity()); @@ -710,7 +710,7 @@ // Ensure that opacity nodes are created for LayoutSVGText which inherits from // LayoutSVGBlock instead of LayoutSVGModelObject. LayoutObject& text_with_opacity = - *GetDocument().GetElementById("textWithOpacity")->GetLayoutObject(); + *GetDocument().getElementById("textWithOpacity")->GetLayoutObject(); const ObjectPaintProperties* text_with_opacity_properties = text_with_opacity.PaintProperties(); EXPECT_EQ(0.2f, text_with_opacity_properties->Effect()->Opacity()); @@ -720,7 +720,7 @@ // Ensure that opacity nodes are created for LayoutSVGTSpan which inherits // from LayoutSVGInline instead of LayoutSVGModelObject. LayoutObject& tspan_with_opacity = - *GetDocument().GetElementById("tspanWithOpacity")->GetLayoutObject(); + *GetDocument().getElementById("tspanWithOpacity")->GetLayoutObject(); const ObjectPaintProperties* tspan_with_opacity_properties = tspan_with_opacity.PaintProperties(); EXPECT_EQ(0.1f, tspan_with_opacity_properties->Effect()->Opacity()); @@ -737,14 +737,14 @@ "</div>"); LayoutObject& div_with_opacity = - *GetDocument().GetElementById("divWithOpacity")->GetLayoutObject(); + *GetDocument().getElementById("divWithOpacity")->GetLayoutObject(); const ObjectPaintProperties* div_with_opacity_properties = div_with_opacity.PaintProperties(); EXPECT_EQ(0.2f, div_with_opacity_properties->Effect()->Opacity()); EXPECT_NE(nullptr, div_with_opacity_properties->Effect()->Parent()); LayoutObject& svg_root_with_opacity = - *GetDocument().GetElementById("svgRootWithOpacity")->GetLayoutObject(); + *GetDocument().getElementById("svgRootWithOpacity")->GetLayoutObject(); const ObjectPaintProperties* svg_root_with_opacity_properties = svg_root_with_opacity.PaintProperties(); EXPECT_EQ(0.3f, svg_root_with_opacity_properties->Effect()->Opacity()); @@ -752,7 +752,7 @@ svg_root_with_opacity_properties->Effect()->Parent()); LayoutObject& rect_with_opacity = - *GetDocument().GetElementById("rectWithOpacity")->GetLayoutObject(); + *GetDocument().getElementById("rectWithOpacity")->GetLayoutObject(); const ObjectPaintProperties* rect_with_opacity_properties = rect_with_opacity.PaintProperties(); EXPECT_EQ(0.4f, rect_with_opacity_properties->Effect()->Opacity()); @@ -771,7 +771,7 @@ "</svg>"); LayoutObject& svg_root_with_opacity = - *GetDocument().GetElementById("svgRootWithOpacity")->GetLayoutObject(); + *GetDocument().getElementById("svgRootWithOpacity")->GetLayoutObject(); const ObjectPaintProperties* svg_root_with_opacity_properties = svg_root_with_opacity.PaintProperties(); EXPECT_EQ(0.3f, svg_root_with_opacity_properties->Effect()->Opacity()); @@ -779,7 +779,7 @@ LayoutObject& foreign_object_with_opacity = *GetDocument() - .GetElementById("foreignObjectWithOpacity") + .getElementById("foreignObjectWithOpacity") ->GetLayoutObject(); const ObjectPaintProperties* foreign_object_with_opacity_properties = foreign_object_with_opacity.PaintProperties(); @@ -788,7 +788,7 @@ foreign_object_with_opacity_properties->Effect()->Parent()); LayoutObject& span_with_opacity = - *GetDocument().GetElementById("spanWithOpacity")->GetLayoutObject(); + *GetDocument().getElementById("spanWithOpacity")->GetLayoutObject(); const ObjectPaintProperties* span_with_opacity_properties = span_with_opacity.PaintProperties(); EXPECT_EQ(0.5f, span_with_opacity_properties->Effect()->Opacity()); @@ -820,7 +820,7 @@ LayoutObject& svg_root_with3d_transform = *GetDocument() - .GetElementById("svgRootWith3dTransform") + .getElementById("svgRootWith3dTransform") ->GetLayoutObject(); const ObjectPaintProperties* svg_root_with3d_transform_properties = svg_root_with3d_transform.PaintProperties(); @@ -838,7 +838,7 @@ svg_root_with3d_transform_properties->PaintOffsetTranslation()->Parent()); LayoutObject& rect_with2d_transform = - *GetDocument().GetElementById("rectWith2dTransform")->GetLayoutObject(); + *GetDocument().getElementById("rectWith2dTransform")->GetLayoutObject(); const ObjectPaintProperties* rect_with2d_transform_properties = rect_with2d_transform.PaintProperties(); TransformationMatrix matrix; @@ -877,7 +877,7 @@ "</svg>"); LayoutObject& svg_with_view_box = - *GetDocument().GetElementById("svgWithViewBox")->GetLayoutObject(); + *GetDocument().getElementById("svgWithViewBox")->GetLayoutObject(); const ObjectPaintProperties* svg_with_view_box_properties = svg_with_view_box.PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate3d(1, 2, 3), @@ -889,7 +889,7 @@ svg_with_view_box_properties->SvgLocalToBorderBoxTransform()->Parent(), svg_with_view_box_properties->Transform()); - LayoutObject& rect = *GetDocument().GetElementById("rect")->GetLayoutObject(); + LayoutObject& rect = *GetDocument().getElementById("rect")->GetLayoutObject(); const ObjectPaintProperties* rect_properties = rect.PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate(100, 100), rect_properties->Transform()->Matrix()); @@ -910,7 +910,7 @@ "</style>" "<svg id='svg' />"); - LayoutObject& svg = *GetDocument().GetElementById("svg")->GetLayoutObject(); + LayoutObject& svg = *GetDocument().getElementById("svg")->GetLayoutObject(); const ObjectPaintProperties* svg_properties = svg.PaintProperties(); // Ensure that a paint offset transform is not unnecessarily emitted. EXPECT_EQ(nullptr, svg_properties->PaintOffsetTranslation()); @@ -935,7 +935,7 @@ " <rect id='rect' transform='translate(17 19)' />" "</svg>"); - LayoutObject& svg = *GetDocument().GetElementById("svg")->GetLayoutObject(); + LayoutObject& svg = *GetDocument().getElementById("svg")->GetLayoutObject(); const ObjectPaintProperties* svg_properties = svg.PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate(2, 3), svg_properties->PaintOffsetTranslation()->Matrix()); @@ -950,7 +950,7 @@ // Ensure the rect's transform is a child of the local to border box // transform. - LayoutObject& rect = *GetDocument().GetElementById("rect")->GetLayoutObject(); + LayoutObject& rect = *GetDocument().getElementById("rect")->GetLayoutObject(); const ObjectPaintProperties* rect_properties = rect.PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate(17, 19), rect_properties->Transform()->Matrix()); @@ -968,7 +968,7 @@ " </svg>" "</svg>"); - LayoutObject& svg = *GetDocument().GetElementById("svg")->GetLayoutObject(); + LayoutObject& svg = *GetDocument().getElementById("svg")->GetLayoutObject(); const ObjectPaintProperties* svg_properties = svg.PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate(11, 11), svg_properties->Transform()->Matrix()); @@ -976,7 +976,7 @@ svg_properties->SvgLocalToBorderBoxTransform()->Matrix()); LayoutObject& nested_svg = - *GetDocument().GetElementById("nestedSvg")->GetLayoutObject(); + *GetDocument().getElementById("nestedSvg")->GetLayoutObject(); const ObjectPaintProperties* nested_svg_properties = nested_svg.PaintProperties(); EXPECT_EQ(TransformationMatrix().Scale(10), @@ -985,7 +985,7 @@ EXPECT_EQ(svg_properties->SvgLocalToBorderBoxTransform(), nested_svg_properties->Transform()->Parent()); - LayoutObject& rect = *GetDocument().GetElementById("rect")->GetLayoutObject(); + LayoutObject& rect = *GetDocument().getElementById("rect")->GetLayoutObject(); const ObjectPaintProperties* rect_properties = rect.PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate(13, 13), rect_properties->Transform()->Matrix()); @@ -1007,14 +1007,14 @@ "</svg>"); LayoutObject& svg_with_transform = - *GetDocument().GetElementById("svgWithTransform")->GetLayoutObject(); + *GetDocument().getElementById("svgWithTransform")->GetLayoutObject(); const ObjectPaintProperties* svg_with_transform_properties = svg_with_transform.PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate3d(1, 2, 3), svg_with_transform_properties->Transform()->Matrix()); LayoutObject& div_with_transform = - *GetDocument().GetElementById("divWithTransform")->GetLayoutObject(); + *GetDocument().getElementById("divWithTransform")->GetLayoutObject(); const ObjectPaintProperties* div_with_transform_properties = div_with_transform.PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate3d(3, 4, 5), @@ -1039,13 +1039,13 @@ " </g>" "</svg>"); - LayoutObject& svg = *GetDocument().GetElementById("svg")->GetLayoutObject(); + LayoutObject& svg = *GetDocument().getElementById("svg")->GetLayoutObject(); const ObjectPaintProperties* svg_properties = svg.PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate3d(1, 2, 3), svg_properties->Transform()->Matrix()); LayoutObject& container = - *GetDocument().GetElementById("container")->GetLayoutObject(); + *GetDocument().getElementById("container")->GetLayoutObject(); const ObjectPaintProperties* container_properties = container.PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate(20, 30), @@ -1053,7 +1053,7 @@ EXPECT_EQ(svg_properties->Transform(), container_properties->Transform()->Parent()); - Element* fixed = GetDocument().GetElementById("fixed"); + Element* fixed = GetDocument().getElementById("fixed"); // Ensure the fixed position element is rooted at the nearest transform // container. EXPECT_EQ(container_properties->Transform(), @@ -1075,7 +1075,7 @@ " style='width:345px; height:123px' value='some text'/>"); LayoutObject& button = - *GetDocument().GetElementById("button")->GetLayoutObject(); + *GetDocument().getElementById("button")->GetLayoutObject(); const ObjectPaintProperties* button_properties = button.PaintProperties(); // No scroll translation because the document does not scroll (not enough // content). @@ -1108,7 +1108,7 @@ "</style>" "<div id='div'></div>"); - LayoutObject& div = *GetDocument().GetElementById("div")->GetLayoutObject(); + LayoutObject& div = *GetDocument().getElementById("div")->GetLayoutObject(); const ObjectPaintProperties* div_properties = div.PaintProperties(); // No scroll translation because the document does not scroll (not enough // content). @@ -1171,7 +1171,7 @@ frame_view->UpdateAllLifecyclePhases(); LayoutObject* div_with_transform = - GetDocument().GetElementById("divWithTransform")->GetLayoutObject(); + GetDocument().getElementById("divWithTransform")->GetLayoutObject(); const ObjectPaintProperties* div_with_transform_properties = div_with_transform->PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate3d(1, 2, 3), @@ -1181,7 +1181,7 @@ LayoutObject* inner_div_with_transform = ChildDocument() - .GetElementById("innerDivWithTransform") + .getElementById("innerDivWithTransform") ->GetLayoutObject(); const ObjectPaintProperties* inner_div_with_transform_properties = inner_div_with_transform->PaintProperties(); @@ -1250,7 +1250,7 @@ // Transform transform=translation=7.000000,8.000000,9.000000 LayoutObject* inner_div_with_transform = - ChildDocument().GetElementById("transform")->GetLayoutObject(); + ChildDocument().getElementById("transform")->GetLayoutObject(); auto* inner_div_transform = inner_div_with_transform->PaintProperties()->Transform(); EXPECT_EQ(TransformationMatrix().Translate3d(7, 8, 9), @@ -1281,7 +1281,7 @@ div_with_transform_transform->Matrix()); LayoutObject* div_with_transform = - GetDocument().GetElementById("divWithTransform")->GetLayoutObject(); + GetDocument().getElementById("divWithTransform")->GetLayoutObject(); EXPECT_EQ(div_with_transform_transform, div_with_transform->PaintProperties()->Transform()); CHECK_EXACT_VISUAL_RECT(LayoutRect(1, 2, 800, 248), div_with_transform, @@ -1302,11 +1302,11 @@ FrameView* frame_view = GetDocument().View(); LayoutObject* scroller = - GetDocument().GetElementById("scroller")->GetLayoutObject(); + GetDocument().getElementById("scroller")->GetLayoutObject(); const ObjectPaintProperties* scroller_properties = scroller->PaintProperties(); LayoutObject* child = - GetDocument().GetElementById("child")->GetLayoutObject(); + GetDocument().getElementById("child")->GetLayoutObject(); EXPECT_EQ(scroller_properties->OverflowClip(), child->LocalBorderBoxProperties()->Clip()); @@ -1346,10 +1346,10 @@ " <div id='forceScroll' style='height:10000px;'></div>" "</div>"); - auto& scroller = *GetDocument().GetElementById("scroller")->GetLayoutObject(); + auto& scroller = *GetDocument().getElementById("scroller")->GetLayoutObject(); const ObjectPaintProperties* scroller_properties = scroller.PaintProperties(); LayoutObject& child = - *GetDocument().GetElementById("child")->GetLayoutObject(); + *GetDocument().getElementById("child")->GetLayoutObject(); EXPECT_EQ(FrameContentClip(), child.LocalBorderBoxProperties()->Clip()); EXPECT_EQ(FrameScrollTranslation(), @@ -1394,7 +1394,7 @@ "</table>"); LayoutObject& target = - *GetDocument().GetElementById("target")->GetLayoutObject(); + *GetDocument().getElementById("target")->GetLayoutObject(); EXPECT_EQ(LayoutPoint(170, 170), target.PaintOffset()); EXPECT_EQ(FramePreTranslation(), target.LocalBorderBoxProperties()->Transform()); @@ -1429,7 +1429,7 @@ LayoutRect absolute_clip_rect = local_clip_rect; absolute_clip_rect.Move(123, 456); - LayoutObject& clip = *GetDocument().GetElementById("clip")->GetLayoutObject(); + LayoutObject& clip = *GetDocument().getElementById("clip")->GetLayoutObject(); const ObjectPaintProperties* clip_properties = clip.PaintProperties(); EXPECT_EQ(FrameContentClip(), clip_properties->CssClip()->Parent()); EXPECT_EQ(FramePreTranslation(), @@ -1443,7 +1443,7 @@ LayoutUnit::Max()); LayoutObject* fixed = - GetDocument().GetElementById("fixed")->GetLayoutObject(); + GetDocument().getElementById("fixed")->GetLayoutObject(); EXPECT_EQ(clip_properties->CssClip(), fixed->LocalBorderBoxProperties()->Clip()); EXPECT_EQ(FramePreTranslation(), @@ -1484,7 +1484,7 @@ LayoutRect absolute_clip_rect = local_clip_rect; absolute_clip_rect.Move(123, 456); - auto* clip = GetDocument().GetElementById("clip")->GetLayoutObject(); + auto* clip = GetDocument().getElementById("clip")->GetLayoutObject(); const ObjectPaintProperties* clip_properties = clip->PaintProperties(); EXPECT_EQ(FrameContentClip(), clip_properties->CssClip()->Parent()); // No scroll translation because the document does not scroll (not enough @@ -1500,7 +1500,7 @@ // doesn't apply css clip on the object itself. LayoutUnit::Max()); - auto* absolute = GetDocument().GetElementById("absolute")->GetLayoutObject(); + auto* absolute = GetDocument().getElementById("absolute")->GetLayoutObject(); EXPECT_EQ(clip_properties->CssClip(), absolute->LocalBorderBoxProperties()->Clip()); EXPECT_EQ(FramePreTranslation(), @@ -1549,7 +1549,7 @@ absolute_clip_rect.Move(123, 456); LayoutObject& overflow = - *GetDocument().GetElementById("overflow")->GetLayoutObject(); + *GetDocument().getElementById("overflow")->GetLayoutObject(); const ObjectPaintProperties* overflow_properties = overflow.PaintProperties(); EXPECT_EQ(FrameContentClip(), overflow_properties->OverflowClip()->Parent()); // No scroll translation because the document does not scroll (not enough @@ -1560,7 +1560,7 @@ CHECK_EXACT_VISUAL_RECT(LayoutRect(0, 0, 50, 50), &overflow, GetDocument().View()->GetLayoutView()); - LayoutObject* clip = GetDocument().GetElementById("clip")->GetLayoutObject(); + LayoutObject* clip = GetDocument().getElementById("clip")->GetLayoutObject(); const ObjectPaintProperties* clip_properties = clip->PaintProperties(); EXPECT_EQ(overflow_properties->OverflowClip(), clip_properties->CssClip()->Parent()); @@ -1578,7 +1578,7 @@ GetDocument().View()->GetLayoutView()); LayoutObject* fixed = - GetDocument().GetElementById("fixed")->GetLayoutObject(); + GetDocument().getElementById("fixed")->GetLayoutObject(); EXPECT_EQ(clip_properties->CssClipFixedPosition(), fixed->LocalBorderBoxProperties()->Clip()); EXPECT_EQ(FramePreTranslation(), @@ -1635,14 +1635,14 @@ "</div>"); FrameView* frame_view = GetDocument().View(); - LayoutObject* a = GetDocument().GetElementById("a")->GetLayoutObject(); + LayoutObject* a = GetDocument().getElementById("a")->GetLayoutObject(); LayoutPoint a_paint_offset = LayoutPoint(FloatPoint(0.1, 0.3)); EXPECT_EQ(a_paint_offset, a->PaintOffset()); CHECK_EXACT_VISUAL_RECT(LayoutRect(LayoutUnit(0.1), LayoutUnit(0.3), LayoutUnit(70), LayoutUnit(70)), a, frame_view->GetLayoutView()); - LayoutObject* b = GetDocument().GetElementById("b")->GetLayoutObject(); + LayoutObject* b = GetDocument().getElementById("b")->GetLayoutObject(); LayoutPoint b_paint_offset = a_paint_offset + LayoutPoint(FloatPoint(0.5, 11.1)); EXPECT_EQ(b_paint_offset, b->PaintOffset()); @@ -1681,7 +1681,7 @@ "</div>"); FrameView* frame_view = GetDocument().View(); - LayoutObject* b = GetDocument().GetElementById("b")->GetLayoutObject(); + LayoutObject* b = GetDocument().getElementById("b")->GetLayoutObject(); const ObjectPaintProperties* b_properties = b->PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate3d(0, 0, 0), b_properties->Transform()->Matrix()); @@ -1695,7 +1695,7 @@ frame_view->GetLayoutView()); // c's painted should start at subpixelAccumulation + (0.1,0.1) = (0.4,0.4). - LayoutObject* c = GetDocument().GetElementById("c")->GetLayoutObject(); + LayoutObject* c = GetDocument().getElementById("c")->GetLayoutObject(); LayoutPoint c_paint_offset = subpixel_accumulation + LayoutPoint(FloatPoint(0.1, 0.1)); EXPECT_EQ(c_paint_offset, c->PaintOffset()); @@ -1737,7 +1737,7 @@ "</div>"); FrameView* frame_view = GetDocument().View(); - LayoutObject* b = GetDocument().GetElementById("b")->GetLayoutObject(); + LayoutObject* b = GetDocument().getElementById("b")->GetLayoutObject(); const ObjectPaintProperties* b_properties = b->PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate3d(0, 0, 0), b_properties->Transform()->Matrix()); @@ -1753,7 +1753,7 @@ b, frame_view->GetLayoutView()); // c's painting should start at subpixelAccumulation + (0.7,0.7) = (0.4,0.4). - LayoutObject* c = GetDocument().GetElementById("c")->GetLayoutObject(); + LayoutObject* c = GetDocument().getElementById("c")->GetLayoutObject(); LayoutPoint c_paint_offset = subpixel_accumulation + LayoutPoint(FloatPoint(0.7, 0.7)); EXPECT_EQ(c_paint_offset, c->PaintOffset()); @@ -1804,7 +1804,7 @@ "</div>"); FrameView* frame_view = GetDocument().View(); - LayoutObject* b = GetDocument().GetElementById("b")->GetLayoutObject(); + LayoutObject* b = GetDocument().getElementById("b")->GetLayoutObject(); const ObjectPaintProperties* b_properties = b->PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate3d(5, 7, 0), b_properties->Transform()->Matrix()); @@ -1819,7 +1819,7 @@ LayoutUnit(40), LayoutUnit(40)), b, frame_view->GetLayoutView()); - LayoutObject* c = GetDocument().GetElementById("c")->GetLayoutObject(); + LayoutObject* c = GetDocument().getElementById("c")->GetLayoutObject(); const ObjectPaintProperties* c_properties = c->PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate3d(11, 13, 0), c_properties->Transform()->Matrix()); @@ -1835,7 +1835,7 @@ // d should be painted starting at subpixelAccumulation + (0.7,0.7) = // (0.4,0.4). - LayoutObject* d = GetDocument().GetElementById("d")->GetLayoutObject(); + LayoutObject* d = GetDocument().getElementById("d")->GetLayoutObject(); LayoutPoint d_paint_offset = subpixel_accumulation + LayoutPoint(FloatPoint(0.7, 0.7)); EXPECT_EQ(d_paint_offset, d->PaintOffset()); @@ -1885,7 +1885,7 @@ "</div>"); FrameView* frame_view = GetDocument().View(); - LayoutObject* b = GetDocument().GetElementById("b")->GetLayoutObject(); + LayoutObject* b = GetDocument().getElementById("b")->GetLayoutObject(); const ObjectPaintProperties* b_properties = b->PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate(0, 0), b_properties->Transform()->Matrix()); @@ -1901,7 +1901,7 @@ b, frame_view->GetLayoutView()); LayoutObject* fixed = - GetDocument().GetElementById("fixed")->GetLayoutObject(); + GetDocument().getElementById("fixed")->GetLayoutObject(); // The residual subpixel adjustment should still be (-0.3,0). EXPECT_EQ(subpixel_accumulation, fixed->PaintOffset()); CHECK_EXACT_VISUAL_RECT(LayoutRect(LayoutUnit(0.7), LayoutUnit(0), @@ -1909,7 +1909,7 @@ fixed, frame_view->GetLayoutView()); // d should be painted starting at subpixelAccumulation + (0.7,0) = (0.4,0). - LayoutObject* d = GetDocument().GetElementById("d")->GetLayoutObject(); + LayoutObject* d = GetDocument().getElementById("d")->GetLayoutObject(); LayoutPoint d_paint_offset = subpixel_accumulation + LayoutPoint(FloatPoint(0.7, 0)); EXPECT_EQ(d_paint_offset, d->PaintOffset()); @@ -1935,7 +1935,7 @@ "</svg>"); LayoutObject& svg_with_transform = - *GetDocument().GetElementById("svg")->GetLayoutObject(); + *GetDocument().getElementById("svg")->GetLayoutObject(); const ObjectPaintProperties* svg_with_transform_properties = svg_with_transform.PaintProperties(); EXPECT_EQ(TransformationMatrix(), @@ -1945,7 +1945,7 @@ nullptr); LayoutObject& rect_with_transform = - *GetDocument().GetElementById("rect")->GetLayoutObject(); + *GetDocument().getElementById("rect")->GetLayoutObject(); const ObjectPaintProperties* rect_with_transform_properties = rect_with_transform.PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate(1, 1), @@ -2008,9 +2008,9 @@ "</div>"); FrameView* frame_view = GetDocument().View(); - LayoutObject* a = GetDocument().GetElementById("a")->GetLayoutObject(); + LayoutObject* a = GetDocument().getElementById("a")->GetLayoutObject(); const ObjectPaintProperties* a_properties = a->PaintProperties(); - LayoutObject* b = GetDocument().GetElementById("b")->GetLayoutObject(); + LayoutObject* b = GetDocument().getElementById("b")->GetLayoutObject(); const ObjectPaintProperties* b_properties = b->PaintProperties(); ASSERT_TRUE(a_properties->Transform() && b_properties->Transform()); EXPECT_NE(a_properties->Transform(), b_properties->Transform()); @@ -2045,9 +2045,9 @@ "</div>"); FrameView* frame_view = GetDocument().View(); - LayoutObject* a = GetDocument().GetElementById("a")->GetLayoutObject(); + LayoutObject* a = GetDocument().getElementById("a")->GetLayoutObject(); const ObjectPaintProperties* a_properties = a->PaintProperties(); - LayoutObject* b = GetDocument().GetElementById("b")->GetLayoutObject(); + LayoutObject* b = GetDocument().getElementById("b")->GetLayoutObject(); const ObjectPaintProperties* b_properties = b->PaintProperties(); ASSERT_FALSE(a->StyleRef().Preserves3D()); @@ -2077,9 +2077,9 @@ "</div>"); FrameView* frame_view = GetDocument().View(); - LayoutObject* a = GetDocument().GetElementById("a")->GetLayoutObject(); + LayoutObject* a = GetDocument().getElementById("a")->GetLayoutObject(); const ObjectPaintProperties* a_properties = a->PaintProperties(); - LayoutObject* b = GetDocument().GetElementById("b")->GetLayoutObject(); + LayoutObject* b = GetDocument().getElementById("b")->GetLayoutObject(); const ObjectPaintProperties* b_properties = b->PaintProperties(); ASSERT_FALSE(a->StyleRef().Preserves3D()); ASSERT_TRUE(a_properties->Transform() && b_properties->Transform()); @@ -2142,8 +2142,8 @@ "</div>"); FrameView* frame_view = GetDocument().View(); - LayoutObject* a = GetDocument().GetElementById("a")->GetLayoutObject(); - LayoutObject* b = GetDocument().GetElementById("b")->GetLayoutObject(); + LayoutObject* a = GetDocument().getElementById("a")->GetLayoutObject(); + LayoutObject* b = GetDocument().getElementById("b")->GetLayoutObject(); const auto* a_transform = a->PaintProperties()->Transform(); ASSERT_TRUE(a_transform); const auto* b_transform = b->PaintProperties()->Transform(); @@ -2180,8 +2180,8 @@ "</div>"); FrameView* frame_view = GetDocument().View(); - LayoutObject* a = GetDocument().GetElementById("a")->GetLayoutObject(); - LayoutObject* b = GetDocument().GetElementById("b")->GetLayoutObject(); + LayoutObject* a = GetDocument().getElementById("a")->GetLayoutObject(); + LayoutObject* b = GetDocument().getElementById("b")->GetLayoutObject(); const auto* a_transform = a->PaintProperties()->Transform(); ASSERT_TRUE(a_transform); const auto* b_transform = b->PaintProperties()->Transform(); @@ -2209,8 +2209,8 @@ "</div>"); FrameView* frame_view = GetDocument().View(); - LayoutObject* a = GetDocument().GetElementById("a")->GetLayoutObject(); - LayoutObject* b = GetDocument().GetElementById("b")->GetLayoutObject(); + LayoutObject* a = GetDocument().getElementById("a")->GetLayoutObject(); + LayoutObject* b = GetDocument().getElementById("b")->GetLayoutObject(); const ObjectPaintProperties* a_properties = a->PaintProperties(); const ObjectPaintProperties* b_properties = b->PaintProperties(); const TransformPaintPropertyNode* a_perspective = a_properties->Perspective(); @@ -2238,8 +2238,8 @@ "</div>"); FrameView* frame_view = GetDocument().View(); - LayoutObject* a = GetDocument().GetElementById("a")->GetLayoutObject(); - LayoutObject* b = GetDocument().GetElementById("b")->GetLayoutObject(); + LayoutObject* a = GetDocument().getElementById("a")->GetLayoutObject(); + LayoutObject* b = GetDocument().getElementById("b")->GetLayoutObject(); const ObjectPaintProperties* a_properties = a->PaintProperties(); const ObjectPaintProperties* b_properties = b->PaintProperties(); const TransformPaintPropertyNode* a_perspective = a_properties->Perspective(); @@ -2267,7 +2267,7 @@ "</div>"); FrameView* frame_view = GetDocument().View(); - Element* a = GetDocument().GetElementById("a"); + Element* a = GetDocument().getElementById("a"); const ObjectPaintProperties* a_properties = a->GetLayoutObject()->PaintProperties(); const TransformPaintPropertyNode* a_transform_node = @@ -2275,7 +2275,7 @@ EXPECT_EQ(TransformationMatrix().Translate(33, 44), a_transform_node->Matrix()); - Element* b = GetDocument().GetElementById("b"); + Element* b = GetDocument().getElementById("b"); const ObjectPaintProperties* b_properties = b->GetLayoutObject()->PaintProperties(); const TransformPaintPropertyNode* b_transform_node = @@ -2283,7 +2283,7 @@ EXPECT_EQ(TransformationMatrix().Translate(55, 66), b_transform_node->Matrix()); - Element* c = GetDocument().GetElementById("c"); + Element* c = GetDocument().getElementById("c"); const ObjectPaintProperties* c_properties = c->GetLayoutObject()->PaintProperties(); const TransformPaintPropertyNode* c_transform_node = @@ -2386,10 +2386,10 @@ "</div>"); LayoutBoxModelObject* clipper = ToLayoutBoxModelObject( - GetDocument().GetElementById("clipper")->GetLayoutObject()); + GetDocument().getElementById("clipper")->GetLayoutObject()); const ObjectPaintProperties* clip_properties = clipper->PaintProperties(); LayoutObject* child = - GetDocument().GetElementById("child")->GetLayoutObject(); + GetDocument().getElementById("child")->GetLayoutObject(); // No scroll translation because the document does not scroll (not enough // content). @@ -2422,10 +2422,10 @@ "</div>"); LayoutBoxModelObject* clipper = ToLayoutBoxModelObject( - GetDocument().GetElementById("clipper")->GetLayoutObject()); + GetDocument().getElementById("clipper")->GetLayoutObject()); const ObjectPaintProperties* clip_properties = clipper->PaintProperties(); LayoutObject* child = - GetDocument().GetElementById("child")->GetLayoutObject(); + GetDocument().getElementById("child")->GetLayoutObject(); // No scroll translation because the document does not scroll (not enough // content). @@ -2461,14 +2461,14 @@ "</div>" "<div id='forceScroll' style='height: 4000px;'></div>"); - Element* clipper_element = GetDocument().GetElementById("clipper"); + Element* clipper_element = GetDocument().getElementById("clipper"); clipper_element->scrollTo(1, 2); LayoutBoxModelObject* clipper = ToLayoutBoxModelObject(clipper_element->GetLayoutObject()); const ObjectPaintProperties* clip_properties = clipper->PaintProperties(); LayoutObject* child = - GetDocument().GetElementById("child")->GetLayoutObject(); + GetDocument().getElementById("child")->GetLayoutObject(); EXPECT_EQ(FrameScrollTranslation(), clipper->LocalBorderBoxProperties()->Transform()); @@ -2515,7 +2515,7 @@ "</div>"); LayoutObject& rounded_box = - *GetDocument().GetElementById("roundedBox")->GetLayoutObject(); + *GetDocument().getElementById("roundedBox")->GetLayoutObject(); const ObjectPaintProperties* rounded_box_properties = rounded_box.PaintProperties(); EXPECT_EQ( @@ -2546,10 +2546,10 @@ "</div>"); LayoutBoxModelObject* clipper = ToLayoutBoxModelObject( - GetDocument().GetElementById("clipper")->GetLayoutObject()); + GetDocument().getElementById("clipper")->GetLayoutObject()); const ObjectPaintProperties* clip_properties = clipper->PaintProperties(); LayoutObject* child = - GetDocument().GetElementById("child")->GetLayoutObject(); + GetDocument().getElementById("child")->GetLayoutObject(); // No scroll translation because the document does not scroll (not enough // content). @@ -2588,7 +2588,7 @@ "</svg>"); LayoutObject& svg_with_view_box = - *GetDocument().GetElementById("svgWithViewBox")->GetLayoutObject(); + *GetDocument().getElementById("svgWithViewBox")->GetLayoutObject(); EXPECT_EQ(FramePreTranslation(), svg_with_view_box.LocalBorderBoxProperties()->Transform()); @@ -2616,7 +2616,7 @@ " <div class='forceScroll'></div>" "</div>"); - Element* overflow_hidden = GetDocument().GetElementById("overflowHidden"); + Element* overflow_hidden = GetDocument().getElementById("overflowHidden"); overflow_hidden->setScrollTop(37); GetDocument().View()->UpdateAllLifecyclePhases(); @@ -2669,9 +2669,9 @@ " <div class='forceScroll'></div>" "</div>"); - Element* overflow_a = GetDocument().GetElementById("overflowA"); + Element* overflow_a = GetDocument().getElementById("overflowA"); overflow_a->setScrollTop(37); - Element* overflow_b = GetDocument().GetElementById("overflowB"); + Element* overflow_b = GetDocument().getElementById("overflowB"); overflow_b->setScrollTop(41); GetDocument().View()->UpdateAllLifecyclePhases(); @@ -2751,11 +2751,11 @@ "</div>" "<div class='forceScroll'></div>"); - Element* overflow = GetDocument().GetElementById("overflow"); + Element* overflow = GetDocument().getElementById("overflow"); overflow->setScrollTop(37); - Element* abspos_overflow = GetDocument().GetElementById("absposOverflow"); + Element* abspos_overflow = GetDocument().getElementById("absposOverflow"); abspos_overflow->setScrollTop(41); - Element* fixed_overflow = GetDocument().GetElementById("fixedOverflow"); + Element* fixed_overflow = GetDocument().getElementById("fixedOverflow"); fixed_overflow->setScrollTop(43); GetDocument().View()->UpdateAllLifecyclePhases(); @@ -2838,9 +2838,9 @@ " <div class='forceScroll'></div>" "</div>"); - Element* overflow_a = GetDocument().GetElementById("overflowA"); + Element* overflow_a = GetDocument().getElementById("overflowA"); overflow_a->setScrollTop(37); - Element* overflow_b = GetDocument().GetElementById("overflowB"); + Element* overflow_b = GetDocument().getElementById("overflowB"); overflow_b->setScrollTop(41); GetDocument().View()->UpdateAllLifecyclePhases(); @@ -2923,7 +2923,7 @@ " <div class='backgroundAttachmentFixed'></div>" "</div>" "<div class='forceScroll'></div>"); - Element* overflow = GetDocument().GetElementById("overflow"); + Element* overflow = GetDocument().getElementById("overflow"); EXPECT_TRUE(FrameScroll()->HasBackgroundAttachmentFixedDescendants()); // No scroll node is needed. EXPECT_EQ(overflow->GetLayoutObject()->PaintProperties()->ScrollTranslation(), @@ -3085,14 +3085,14 @@ "<div id='willChange'></div>"); auto* transform = - GetDocument().GetElementById("transform")->GetLayoutObject(); + GetDocument().getElementById("transform")->GetLayoutObject(); EXPECT_EQ(TransformationMatrix().Translate3d(100, 200, 0), transform->PaintProperties()->Transform()->Matrix()); EXPECT_EQ(FloatPoint3D(300, 75, 0), transform->PaintProperties()->Transform()->Origin()); auto* will_change = - GetDocument().GetElementById("willChange")->GetLayoutObject(); + GetDocument().getElementById("willChange")->GetLayoutObject(); EXPECT_EQ(TransformationMatrix().Translate3d(0, 0, 0), will_change->PaintProperties()->Transform()->Matrix()); EXPECT_EQ(FloatPoint3D(0, 0, 0), @@ -3123,14 +3123,14 @@ "<div id='willChange'></div>"); auto* motion_path = - GetDocument().GetElementById("motionPath")->GetLayoutObject(); + GetDocument().getElementById("motionPath")->GetLayoutObject(); EXPECT_EQ(TransformationMatrix().Translate3d(50, 150, 0), motion_path->PaintProperties()->Transform()->Matrix()); EXPECT_EQ(FloatPoint3D(50, 50, 0), motion_path->PaintProperties()->Transform()->Origin()); auto* will_change = - GetDocument().GetElementById("willChange")->GetLayoutObject(); + GetDocument().getElementById("willChange")->GetLayoutObject(); EXPECT_EQ(TransformationMatrix().Translate3d(0, 0, 0), will_change->PaintProperties()->Transform()->Matrix()); EXPECT_EQ(FloatPoint3D(0, 0, 0), @@ -3239,7 +3239,7 @@ "</div>"); LayoutBoxModelObject* clipper = ToLayoutBoxModelObject( - GetDocument().GetElementById("clipper")->GetLayoutObject()); + GetDocument().getElementById("clipper")->GetLayoutObject()); const ObjectPaintProperties* clip_properties = clipper->PaintProperties(); EXPECT_EQ(LayoutPoint(FloatPoint(31.5, 20)), clipper->PaintOffset()); @@ -3258,7 +3258,7 @@ const ClipPaintPropertyNode* output_clip = properties->MaskClip(); const auto* target = - GetDocument().GetElementById("target")->GetLayoutObject(); + GetDocument().getElementById("target")->GetLayoutObject(); EXPECT_EQ(output_clip, target->LocalBorderBoxProperties()->Clip()); EXPECT_EQ(FrameContentClip(), output_clip->Parent()); EXPECT_EQ(FloatRoundedRect(8, 8, 300, 200), output_clip->ClipRect()); @@ -3292,7 +3292,7 @@ const ClipPaintPropertyNode* mask_clip = properties->MaskClip(); const ClipPaintPropertyNode* overflow_clip2 = properties->OverflowClip(); const auto* target = - GetDocument().GetElementById("target")->GetLayoutObject(); + GetDocument().getElementById("target")->GetLayoutObject(); const TransformPaintPropertyNode* scroll_translation = target->LocalBorderBoxProperties()->Transform(); @@ -3319,7 +3319,7 @@ EXPECT_EQ(mask_clip, properties->Mask()->OutputClip()); const auto* absolute = - GetDocument().GetElementById("absolute")->GetLayoutObject(); + GetDocument().getElementById("absolute")->GetLayoutObject(); EXPECT_EQ(FramePreTranslation(), absolute->LocalBorderBoxProperties()->Transform()); EXPECT_EQ(mask_clip, absolute->LocalBorderBoxProperties()->Clip()); @@ -3344,7 +3344,7 @@ const ObjectPaintProperties* properties = PaintPropertiesForElement("target"); const ClipPaintPropertyNode* output_clip = properties->MaskClip(); const auto* target = - GetDocument().GetElementById("target")->GetLayoutObject(); + GetDocument().getElementById("target")->GetLayoutObject(); EXPECT_EQ(output_clip, target->LocalBorderBoxProperties()->Clip()); EXPECT_EQ(FrameContentClip(), output_clip->Parent()); @@ -3360,7 +3360,7 @@ EXPECT_EQ(output_clip, properties->Mask()->OutputClip()); const auto* overflowing = - GetDocument().GetElementById("overflowing")->GetLayoutObject(); + GetDocument().getElementById("overflowing")->GetLayoutObject(); EXPECT_EQ(output_clip, overflowing->LocalBorderBoxProperties()->Clip()); EXPECT_EQ(properties->Effect(), overflowing->LocalBorderBoxProperties()->Effect()); @@ -3384,7 +3384,7 @@ const ClipPaintPropertyNode* mask_clip = properties->MaskClip(); EXPECT_EQ(FloatRoundedRect(8, 8, 100, 100), mask_clip->ClipRect()); - Element* mask = GetDocument().GetElementById("mask"); + Element* mask = GetDocument().getElementById("mask"); mask->setAttribute(HTMLNames::styleAttr, "height: 200px"); GetDocument().View()->UpdateAllLifecyclePhases(); @@ -3469,7 +3469,7 @@ "</svg>"); LayoutObject& svg_root = - *GetDocument().GetElementById("svgroot")->GetLayoutObject(); + *GetDocument().getElementById("svgroot")->GetLayoutObject(); const ObjectPaintProperties* svg_root_properties = svg_root.PaintProperties(); EXPECT_TRUE(svg_root_properties->Effect()); EXPECT_EQ(EffectPaintPropertyNode::Root(),
diff --git a/third_party/WebKit/Source/core/paint/PaintPropertyTreePrinterTest.cpp b/third_party/WebKit/Source/core/paint/PaintPropertyTreePrinterTest.cpp index bd2eda8..9b13621 100644 --- a/third_party/WebKit/Source/core/paint/PaintPropertyTreePrinterTest.cpp +++ b/third_party/WebKit/Source/core/paint/PaintPropertyTreePrinterTest.cpp
@@ -83,7 +83,7 @@ "<div id='transform' style='transform: translate3d(10px, 10px, " "0px);'></div>"); LayoutObject* transformed_object = - GetDocument().GetElementById("transform")->GetLayoutObject(); + GetDocument().getElementById("transform")->GetLayoutObject(); const auto* transformed_object_properties = transformed_object->PaintProperties(); String transform_path_as_string = @@ -100,7 +100,7 @@ "<div id='clip' style='position: absolute; clip: rect(10px, 80px, 70px, " "40px);'></div>"); LayoutObject* clipped_object = - GetDocument().GetElementById("clip")->GetLayoutObject(); + GetDocument().getElementById("clip")->GetLayoutObject(); const auto* clipped_object_properties = clipped_object->PaintProperties(); String clip_path_as_string = clipped_object_properties->CssClip()->ToTreeString(); @@ -113,7 +113,7 @@ TEST_P(PaintPropertyTreePrinterTest, SimpleEffectTreePath) { SetBodyInnerHTML("<div id='effect' style='opacity: 0.9;'></div>"); LayoutObject* effect_object = - GetDocument().GetElementById("effect")->GetLayoutObject(); + GetDocument().getElementById("effect")->GetLayoutObject(); const auto* effect_object_properties = effect_object->PaintProperties(); String effect_path_as_string = effect_object_properties->Effect()->ToTreeString(); @@ -128,7 +128,7 @@ " <div id='forceScroll' style='height: 4000px;'></div>" "</div>"); LayoutObject* scroll_object = - GetDocument().GetElementById("scroll")->GetLayoutObject(); + GetDocument().getElementById("scroll")->GetLayoutObject(); const auto* scroll_object_properties = scroll_object->PaintProperties(); String scroll_path_as_string = scroll_object_properties->ScrollTranslation() ->ScrollNode()
diff --git a/third_party/WebKit/Source/core/paint/PaintPropertyTreeUpdateTests.cpp b/third_party/WebKit/Source/core/paint/PaintPropertyTreeUpdateTests.cpp index 8e6553f..ec994cc 100644 --- a/third_party/WebKit/Source/core/paint/PaintPropertyTreeUpdateTests.cpp +++ b/third_party/WebKit/Source/core/paint/PaintPropertyTreeUpdateTests.cpp
@@ -31,7 +31,7 @@ " <div class='forceScroll'></div>" "</div>" "<div class='forceScroll'></div>"); - Element* overflow_a = GetDocument().GetElementById("overflowA"); + Element* overflow_a = GetDocument().getElementById("overflowA"); EXPECT_FALSE(FrameScroll()->ThreadedScrollingDisabled()); EXPECT_FALSE(overflow_a->GetLayoutObject() ->PaintProperties() @@ -84,8 +84,8 @@ " <div class='forceScroll'></div>" "</div>" "<div class='forceScroll'></div>"); - Element* overflow_a = GetDocument().GetElementById("overflowA"); - Element* overflow_b = GetDocument().GetElementById("overflowB"); + Element* overflow_a = GetDocument().getElementById("overflowA"); + Element* overflow_b = GetDocument().getElementById("overflowB"); EXPECT_TRUE(FrameScroll()->HasBackgroundAttachmentFixedDescendants()); EXPECT_TRUE(overflow_a->GetLayoutObject() @@ -152,7 +152,7 @@ EXPECT_TRUE(FrameScroll(child)->HasBackgroundAttachmentFixedDescendants()); // Removing a main thread scrolling reason should update the entire tree. - auto* fixed_background = GetDocument().GetElementById("fixedBackground"); + auto* fixed_background = GetDocument().getElementById("fixedBackground"); fixed_background->removeAttribute(HTMLNames::classAttr); GetDocument().View()->UpdateAllLifecyclePhases(); EXPECT_FALSE(FrameScroll(parent)->HasBackgroundAttachmentFixedDescendants()); @@ -188,7 +188,7 @@ EXPECT_TRUE(FrameScroll(child)->HasBackgroundAttachmentFixedDescendants()); // Removing a main thread scrolling reason should update the entire tree. - auto* fixed_background = ChildDocument().GetElementById("fixedBackground"); + auto* fixed_background = ChildDocument().getElementById("fixedBackground"); fixed_background->removeAttribute(HTMLNames::classAttr); GetDocument().View()->UpdateAllLifecyclePhases(); EXPECT_FALSE(FrameScroll(parent)->HasBackgroundAttachmentFixedDescendants()); @@ -232,8 +232,8 @@ " <div class='forceScroll'></div>" "</div>" "<div class='forceScroll'></div>"); - Element* overflow_a = GetDocument().GetElementById("overflowA"); - Element* overflow_b = GetDocument().GetElementById("overflowB"); + Element* overflow_a = GetDocument().getElementById("overflowA"); + Element* overflow_b = GetDocument().getElementById("overflowB"); // This should be false. We are not as strict about main thread scrolling // reasons as we could be. @@ -289,10 +289,10 @@ frame_view->UpdateAllLifecyclePhases(); LayoutObject* div_with_transform = - GetDocument().GetElementById("divWithTransform")->GetLayoutObject(); + GetDocument().getElementById("divWithTransform")->GetLayoutObject(); LayoutObject* child_layout_view = ChildDocument().GetLayoutView(); LayoutObject* inner_div_with_transform = - ChildDocument().GetElementById("transform")->GetLayoutObject(); + ChildDocument().getElementById("transform")->GetLayoutObject(); // Initially, no objects should need a descendant update. EXPECT_FALSE( @@ -361,7 +361,7 @@ " style='transform: translate3d(4px, 5px, 6px);'/>"); // Move the child frame offscreen so it becomes available for throttling. - auto* iframe = toHTMLIFrameElement(GetDocument().GetElementById("iframe")); + auto* iframe = toHTMLIFrameElement(GetDocument().getElementById("iframe")); iframe->setAttribute(HTMLNames::styleAttr, "transform: translateY(5555px)"); GetDocument().View()->UpdateAllLifecyclePhases(); // Ensure intersection observer notifications get delivered. @@ -370,10 +370,10 @@ EXPECT_TRUE(ChildDocument().View()->IsHiddenForThrottling()); auto* transform = - GetDocument().GetElementById("transform")->GetLayoutObject(); + GetDocument().getElementById("transform")->GetLayoutObject(); auto* iframe_layout_view = ChildDocument().GetLayoutView(); auto* iframe_transform = - ChildDocument().GetElementById("iframeTransform")->GetLayoutObject(); + ChildDocument().getElementById("iframeTransform")->GetLayoutObject(); // Invalidate properties in the iframe and ensure ancestors are marked. iframe_transform->SetNeedsPaintPropertyUpdate(); @@ -433,7 +433,7 @@ " #div { overflow:hidden; height:0px; }" "</style>" "<div id='div'></div>"); - auto* div = GetDocument().GetElementById("div"); + auto* div = GetDocument().getElementById("div"); div->setAttribute(HTMLNames::styleAttr, "display:inline-block; width:7px;"); GetDocument().View()->UpdateAllLifecyclePhases(); auto* clip_properties = @@ -494,7 +494,7 @@ "</style>" "<div id='div' style='contain:paint;'></div>"); GetDocument().View()->UpdateAllLifecyclePhases(); - auto* div = GetDocument().GetElementById("div"); + auto* div = GetDocument().getElementById("div"); auto* properties = div->GetLayoutObject()->PaintProperties()->OverflowClip(); EXPECT_EQ(FloatRect(0, 0, 7, 6), properties->ClipRect().Rect()); @@ -507,7 +507,7 @@ // A basic sanity check for over-invalidation of paint properties. TEST_P(PaintPropertyTreeUpdateTest, NoPaintPropertyUpdateOnBackgroundChange) { SetBodyInnerHTML("<div id='div' style='background-color: blue'>DIV</div>"); - auto* div = GetDocument().GetElementById("div"); + auto* div = GetDocument().getElementById("div"); GetDocument().View()->UpdateAllLifecyclePhases(); div->setAttribute(HTMLNames::styleAttr, "background-color: green"); @@ -533,7 +533,7 @@ FrameView* child_frame_view = ChildDocument().View(); EXPECT_NE(nullptr, FrameScroll(child_frame_view)); - auto* iframe_container = GetDocument().GetElementById("iframeContainer"); + auto* iframe_container = GetDocument().getElementById("iframeContainer"); iframe_container->setAttribute(HTMLNames::styleAttr, "visibility: hidden;"); frame_view->UpdateAllLifecyclePhases(); @@ -544,7 +544,7 @@ TEST_P(PaintPropertyTreeUpdateTest, TransformNodeWithAnimationLosesNodeWhenAnimationRemoved) { LoadTestData("transform-animation.html"); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); const ObjectPaintProperties* properties = target->GetLayoutObject()->PaintProperties(); EXPECT_TRUE(properties->Transform()->HasDirectCompositingReasons()); @@ -559,7 +559,7 @@ TEST_P(PaintPropertyTreeUpdateTest, EffectNodeWithAnimationLosesNodeWhenAnimationRemoved) { LoadTestData("opacity-animation.html"); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); const ObjectPaintProperties* properties = target->GetLayoutObject()->PaintProperties(); EXPECT_TRUE(properties->Effect()->HasDirectCompositingReasons()); @@ -574,7 +574,7 @@ TransformNodeLosesCompositorElementIdWhenAnimationRemoved) { LoadTestData("transform-animation.html"); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); target->setAttribute(HTMLNames::styleAttr, "transform: translateX(2em)"); GetDocument().View()->UpdateAllLifecyclePhases(); @@ -594,7 +594,7 @@ EffectNodeLosesCompositorElementIdWhenAnimationRemoved) { LoadTestData("opacity-animation.html"); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); target->setAttribute(HTMLNames::styleAttr, "opacity: 0.2"); GetDocument().View()->UpdateAllLifecyclePhases(); @@ -625,13 +625,13 @@ "</div>"); auto* perspective = - GetDocument().GetElementById("perspective")->GetLayoutObject(); + GetDocument().getElementById("perspective")->GetLayoutObject(); EXPECT_EQ(TransformationMatrix().ApplyPerspective(100), perspective->PaintProperties()->Perspective()->Matrix()); EXPECT_EQ(FloatPoint3D(50, 0, 0), perspective->PaintProperties()->Perspective()->Origin()); - auto* contents = GetDocument().GetElementById("contents"); + auto* contents = GetDocument().getElementById("contents"); contents->setAttribute(HTMLNames::styleAttr, "height: 200px;"); GetDocument().View()->UpdateAllLifecyclePhases(); EXPECT_EQ(TransformationMatrix().ApplyPerspective(100), @@ -652,7 +652,7 @@ "</style>" "<div id='transform'></div>"); - auto* transform = GetDocument().GetElementById("transform"); + auto* transform = GetDocument().getElementById("transform"); auto* transform_object = transform->GetLayoutObject(); EXPECT_EQ(TransformationMatrix().Translate3d(50, 100, 0), transform_object->PaintProperties()->Transform()->Matrix()); @@ -681,7 +681,7 @@ " <div id='clip'></div>" "</div>"); - auto* outer = GetDocument().GetElementById("outer"); + auto* outer = GetDocument().getElementById("outer"); auto* clip = GetLayoutObjectByElementId("clip"); EXPECT_EQ(FloatRect(45, 50, 105, 100), clip->PaintProperties()->CssClip()->ClipRect().Rect()); @@ -705,7 +705,7 @@ EXPECT_EQ(IntSize(100, 100), scroll_node->Clip()); EXPECT_EQ(IntSize(200, 200), scroll_node->Bounds()); - GetDocument().GetElementById("content")->setAttribute( + GetDocument().getElementById("content")->setAttribute( HTMLNames::styleAttr, "width: 200px; height: 300px"); GetDocument().View()->UpdateAllLifecyclePhases(); EXPECT_EQ(scroll_node, @@ -745,7 +745,7 @@ auto* transform = child->PaintProperties()->Transform(); EXPECT_TRUE(transform->FlattensInheritedTransform()); - GetDocument().GetElementById("parent")->setAttribute( + GetDocument().getElementById("parent")->setAttribute( HTMLNames::styleAttr, "transform-style: preserve-3d"); GetDocument().View()->UpdateAllLifecyclePhases(); EXPECT_EQ(transform, child->PaintProperties()->Transform());
diff --git a/third_party/WebKit/Source/core/paint/PrePaintTreeWalkTest.cpp b/third_party/WebKit/Source/core/paint/PrePaintTreeWalkTest.cpp index 923daad..7a6d42c 100644 --- a/third_party/WebKit/Source/core/paint/PrePaintTreeWalkTest.cpp +++ b/third_party/WebKit/Source/core/paint/PrePaintTreeWalkTest.cpp
@@ -94,7 +94,7 @@ "</style>" "<div id='transformed'></div>"); - auto* transformed_element = GetDocument().GetElementById("transformed"); + auto* transformed_element = GetDocument().getElementById("transformed"); const auto* transformed_properties = transformed_element->GetLayoutObject()->PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate(100, 100), @@ -135,7 +135,7 @@ "</style>" "<div id='transformed' class='transformA'></div>"); - auto* transformed_element = GetDocument().GetElementById("transformed"); + auto* transformed_element = GetDocument().getElementById("transformed"); const auto* transformed_properties = transformed_element->GetLayoutObject()->PaintProperties(); EXPECT_EQ(TransformationMatrix().Translate(100, 100), @@ -161,7 +161,7 @@ "</style>" "<div id='transparent' class='opacityA'></div>"); - auto* transparent_element = GetDocument().GetElementById("transparent"); + auto* transparent_element = GetDocument().getElementById("transparent"); const auto* transparent_properties = transparent_element->GetLayoutObject()->PaintProperties(); EXPECT_EQ(0.9f, transparent_properties->Effect()->Opacity()); @@ -186,8 +186,8 @@ " </div>" "</div>"); - auto* parent = GetDocument().GetElementById("parent"); - auto* child = GetDocument().GetElementById("child"); + auto* parent = GetDocument().getElementById("parent"); + auto* child = GetDocument().getElementById("child"); auto* child_paint_layer = ToLayoutBoxModelObject(child->GetLayoutObject())->Layer(); EXPECT_FALSE(child_paint_layer->NeedsRepaint()); @@ -211,8 +211,8 @@ " </div>" "</div>"); - auto* parent = GetDocument().GetElementById("parent"); - auto* child = GetDocument().GetElementById("child"); + auto* parent = GetDocument().getElementById("parent"); + auto* child = GetDocument().getElementById("child"); auto* child_paint_layer = ToLayoutBoxModelObject(child->GetLayoutObject())->Layer(); EXPECT_FALSE(child_paint_layer->NeedsRepaint()); @@ -237,8 +237,8 @@ " </div>" "</div>"); - auto* parent = GetDocument().GetElementById("parent"); - auto* child = GetDocument().GetElementById("child"); + auto* parent = GetDocument().getElementById("parent"); + auto* child = GetDocument().getElementById("child"); auto* child_paint_layer = ToLayoutBoxModelObject(child->GetLayoutObject())->Layer(); EXPECT_FALSE(child_paint_layer->NeedsRepaint()); @@ -265,8 +265,8 @@ " </div>" "</div>"); - auto* parent = GetDocument().GetElementById("parent"); - auto* child = GetDocument().GetElementById("child"); + auto* parent = GetDocument().getElementById("parent"); + auto* child = GetDocument().getElementById("child"); auto* child_paint_layer = ToLayoutBoxModelObject(child->GetLayoutObject())->Layer(); EXPECT_FALSE(child_paint_layer->NeedsRepaint()); @@ -325,7 +325,7 @@ auto* grandchild = GetLayoutObjectByElementId("grandchild"); - GetDocument().GetElementById("parent")->removeAttribute("style"); + GetDocument().getElementById("parent")->removeAttribute("style"); GetDocument().View()->UpdateAllLifecyclePhases(); // In SPv2 mode, VisualRects are in the space of the containing transform @@ -349,7 +349,7 @@ "</style>" "<div id='target'></div>"); - auto* target = GetDocument().GetElementById("target"); + auto* target = GetDocument().getElementById("target"); auto* target_object = ToLayoutBoxModelObject(target->GetLayoutObject()); target->setAttribute(HTMLNames::styleAttr, "border-radius: 5px"); GetDocument().View()->UpdateAllLifecyclePhasesExceptPaint();
diff --git a/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainterTest.cpp b/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainterTest.cpp index 26fd426..b2ad3742e 100644 --- a/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainterTest.cpp +++ b/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainterTest.cpp
@@ -31,7 +31,7 @@ // the painted text. LayoutSVGText* target_svg_text = ToLayoutSVGText(GetDocument() - .GetElementById(AtomicString(element_name)) + .getElementById(AtomicString(element_name)) ->GetLayoutObject()); LayoutSVGInlineText* target_inline_text = target_svg_text->DescendantTextNodes()[0];
diff --git a/third_party/WebKit/Source/core/paint/ThemePainter.cpp b/third_party/WebKit/Source/core/paint/ThemePainter.cpp index f4a6cca..0ce9679 100644 --- a/third_party/WebKit/Source/core/paint/ThemePainter.cpp +++ b/third_party/WebKit/Source/core/paint/ThemePainter.cpp
@@ -273,7 +273,7 @@ IntSize thumb_size; LayoutObject* thumb_layout_object = input->UserAgentShadowRoot() - ->GetElementById(ShadowElementNames::SliderThumb()) + ->getElementById(ShadowElementNames::SliderThumb()) ->GetLayoutObject(); if (thumb_layout_object) { const ComputedStyle& thumb_style = thumb_layout_object->StyleRef(); @@ -291,7 +291,7 @@ IntRect track_bounds; LayoutObject* track_layout_object = input->UserAgentShadowRoot() - ->GetElementById(ShadowElementNames::SliderTrack()) + ->getElementById(ShadowElementNames::SliderTrack()) ->GetLayoutObject(); // We can ignoring transforms because transform is handled by the graphics // context.
diff --git a/third_party/WebKit/Source/core/style/ShadowList.h b/third_party/WebKit/Source/core/style/ShadowList.h index 0cd099a8..e4d59dbc 100644 --- a/third_party/WebKit/Source/core/style/ShadowList.h +++ b/third_party/WebKit/Source/core/style/ShadowList.h
@@ -77,7 +77,7 @@ ShadowList(ShadowDataVector& shadows) { // If we have no shadows, we use a null ShadowList DCHECK(!shadows.IsEmpty()); - shadows_.Swap(shadows); + shadows_.swap(shadows); shadows_.ShrinkToFit(); } ShadowDataVector shadows_;
diff --git a/third_party/WebKit/Source/core/svg/SVGAElement.cpp b/third_party/WebKit/Source/core/svg/SVGAElement.cpp index a7dd2e2..4b29c6b 100644 --- a/third_party/WebKit/Source/core/svg/SVGAElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGAElement.cpp
@@ -117,7 +117,7 @@ if (url[0] == '#') { Element* target_element = - GetTreeScope().GetElementById(AtomicString(url.Substring(1))); + GetTreeScope().getElementById(AtomicString(url.Substring(1))); if (target_element && IsSVGSMILElement(*target_element)) { ToSVGSMILElement(target_element)->BeginByLinkActivation(); event->SetDefaultHandled();
diff --git a/third_party/WebKit/Source/core/svg/SVGElementProxy.cpp b/third_party/WebKit/Source/core/svg/SVGElementProxy.cpp index 1b6e995..4448e3e 100644 --- a/third_party/WebKit/Source/core/svg/SVGElementProxy.cpp +++ b/third_party/WebKit/Source/core/svg/SVGElementProxy.cpp
@@ -155,7 +155,7 @@ TreeScope* lookup_scope = TreeScopeForLookup(tree_scope); if (!lookup_scope) return nullptr; - if (Element* target_element = lookup_scope->GetElementById(id_)) { + if (Element* target_element = lookup_scope->getElementById(id_)) { SVGElementProxySet* proxy_set = target_element->IsSVGElement() ? ToSVGElement(target_element)->ElementProxySet()
diff --git a/third_party/WebKit/Source/core/svg/SVGTreeScopeResources.cpp b/third_party/WebKit/Source/core/svg/SVGTreeScopeResources.cpp index 06b598f..6fe3bd1 100644 --- a/third_party/WebKit/Source/core/svg/SVGTreeScopeResources.cpp +++ b/third_party/WebKit/Source/core/svg/SVGTreeScopeResources.cpp
@@ -20,7 +20,7 @@ static LayoutSVGResourceContainer* LookupResource(TreeScope& tree_scope, const AtomicString& id) { - Element* element = tree_scope.GetElementById(id); + Element* element = tree_scope.getElementById(id); if (!element) return nullptr; LayoutObject* layout_object = element->GetLayoutObject();
diff --git a/third_party/WebKit/Source/core/svg/SVGURIReference.cpp b/third_party/WebKit/Source/core/svg/SVGURIReference.cpp index 78d9fd6..aabd134 100644 --- a/third_party/WebKit/Source/core/svg/SVGURIReference.cpp +++ b/third_party/WebKit/Source/core/svg/SVGURIReference.cpp
@@ -113,7 +113,7 @@ return nullptr; if (fragment_identifier) *fragment_identifier = id; - return tree_scope.GetElementById(id); + return tree_scope.getElementById(id); } Element* SVGURIReference::ObserveTarget(Member<IdTargetObserver>& observer, @@ -140,7 +140,7 @@ return nullptr; observer = new SVGElementReferenceObserver(tree_scope, id, std::move(closure)); - return tree_scope.GetElementById(id); + return tree_scope.getElementById(id); } void SVGURIReference::UnobserveTarget(Member<IdTargetObserver>& observer) {
diff --git a/third_party/WebKit/Source/core/svg/SVGUseElement.cpp b/third_party/WebKit/Source/core/svg/SVGUseElement.cpp index 18138e1..06e4483 100644 --- a/third_party/WebKit/Source/core/svg/SVGUseElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGUseElement.cpp
@@ -309,7 +309,7 @@ } if (!ResourceIsValid()) return nullptr; - return resource_->GetDocument()->GetElementById(element_identifier_); + return resource_->GetDocument()->getElementById(element_identifier_); } void SVGUseElement::BuildPendingResource() {
diff --git a/third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp b/third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp index 7e5e7c5..45f0012 100644 --- a/third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp +++ b/third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp
@@ -105,7 +105,7 @@ DCHECK_NE(it, scheduled_animations_.end()); AnimationsLinkedHashSet* scheduled = it->value.Get(); DCHECK(scheduled); - AnimationsLinkedHashSet::iterator it_animation = scheduled->Find(animation); + AnimationsLinkedHashSet::iterator it_animation = scheduled->find(animation); DCHECK(it_animation != scheduled->end()); scheduled->erase(it_animation);
diff --git a/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp b/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp index 8d45636..33ca6fd5 100644 --- a/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp +++ b/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp
@@ -152,7 +152,7 @@ void SVGSMILElement::Condition::ConnectSyncBase(SVGSMILElement& timed_element) { DCHECK(!base_id_.IsEmpty()); DCHECK_EQ(type_, kSyncbase); - Element* element = timed_element.GetTreeScope().GetElementById(base_id_); + Element* element = timed_element.GetTreeScope().getElementById(base_id_); if (!element || !IsSVGSMILElement(*element)) { base_element_ = nullptr; return;
diff --git a/third_party/WebKit/Source/core/testing/NullExecutionContext.cpp b/third_party/WebKit/Source/core/testing/NullExecutionContext.cpp index edd4f3f9..84249c6 100644 --- a/third_party/WebKit/Source/core/testing/NullExecutionContext.cpp +++ b/third_party/WebKit/Source/core/testing/NullExecutionContext.cpp
@@ -48,7 +48,7 @@ void NullExecutionContext::SetUpSecurityContext() { ContentSecurityPolicy* policy = ContentSecurityPolicy::Create(); - SecurityContext::SetSecurityOrigin(SecurityOrigin::Create(dummy_url_)); + SecurityContext::SetSecurityOrigin(SecurityOrigin::Create(url_)); policy->BindToExecutionContext(this); SecurityContext::SetContentSecurityPolicy(policy); }
diff --git a/third_party/WebKit/Source/core/testing/NullExecutionContext.h b/third_party/WebKit/Source/core/testing/NullExecutionContext.h index e59db9a..544f7c5 100644 --- a/third_party/WebKit/Source/core/testing/NullExecutionContext.h +++ b/third_party/WebKit/Source/core/testing/NullExecutionContext.h
@@ -25,6 +25,8 @@ public: NullExecutionContext(); + void SetURL(const KURL& url) { url_ = url; } + void DisableEval(const String&) override {} String UserAgent() const override { return String(); } @@ -54,6 +56,9 @@ void SetUpSecurityContext(); + using SecurityContext::GetSecurityOrigin; + using SecurityContext::GetContentSecurityPolicy; + DEFINE_INLINE_TRACE() { visitor->Trace(queue_); SecurityContext::Trace(visitor); @@ -61,15 +66,15 @@ } protected: - const KURL& VirtualURL() const override { return dummy_url_; } - KURL VirtualCompleteURL(const String&) const override { return dummy_url_; } + const KURL& VirtualURL() const override { return url_; } + KURL VirtualCompleteURL(const String&) const override { return url_; } private: bool tasks_need_suspension_; bool is_secure_context_; Member<EventQueue> queue_; - KURL dummy_url_; + KURL url_; }; } // namespace blink
diff --git a/third_party/WebKit/Source/core/timing/PerformanceObserver.cpp b/third_party/WebKit/Source/core/timing/PerformanceObserver.cpp index 1db78d24..57e44d0 100644 --- a/third_party/WebKit/Source/core/timing/PerformanceObserver.cpp +++ b/third_party/WebKit/Source/core/timing/PerformanceObserver.cpp
@@ -87,7 +87,7 @@ return; PerformanceEntryVector performance_entries; - performance_entries.Swap(performance_entries_); + performance_entries.swap(performance_entries_); PerformanceObserverEntryList* entry_list = new PerformanceObserverEntryList(performance_entries); callback_->call(this, entry_list, this);
diff --git a/third_party/WebKit/Source/core/workers/MainThreadWorklet.cpp b/third_party/WebKit/Source/core/workers/MainThreadWorklet.cpp index 1c7e06f..b3ffe3b 100644 --- a/third_party/WebKit/Source/core/workers/MainThreadWorklet.cpp +++ b/third_party/WebKit/Source/core/workers/MainThreadWorklet.cpp
@@ -46,9 +46,6 @@ kSyntaxError, "'" + url + "' is not a valid URL.")); } - if (!IsInitialized()) - Initialize(); - int32_t request_id = GetNextRequestId(); ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state); ScriptPromise promise = resolver->Promise(); @@ -74,6 +71,7 @@ void MainThreadWorklet::ContextDestroyed(ExecutionContext* execution_context) { DCHECK(IsMainThread()); resolver_map_.clear(); + GetWorkletGlobalScopeProxy()->TerminateWorkletGlobalScope(); Worklet::ContextDestroyed(execution_context); }
diff --git a/third_party/WebKit/Source/core/workers/ThreadedWorklet.cpp b/third_party/WebKit/Source/core/workers/ThreadedWorklet.cpp index ff5d4db..21b26cfe 100644 --- a/third_party/WebKit/Source/core/workers/ThreadedWorklet.cpp +++ b/third_party/WebKit/Source/core/workers/ThreadedWorklet.cpp
@@ -67,6 +67,8 @@ for (const auto& script_loader : loader_to_resolver_map_.Keys()) script_loader->Cancel(); loader_to_resolver_map_.clear(); + if (IsInitialized()) + GetWorkletGlobalScopeProxy()->TerminateWorkletGlobalScope(); Worklet::ContextDestroyed(execution_context); }
diff --git a/third_party/WebKit/Source/core/workers/ThreadedWorklet.h b/third_party/WebKit/Source/core/workers/ThreadedWorklet.h index bb418d1b..4c4d92d 100644 --- a/third_party/WebKit/Source/core/workers/ThreadedWorklet.h +++ b/third_party/WebKit/Source/core/workers/ThreadedWorklet.h
@@ -29,6 +29,10 @@ public: virtual ~ThreadedWorklet() = default; + // Called when addModule() is called for the first time. + virtual void Initialize() = 0; + virtual bool IsInitialized() const = 0; + // Worklet ScriptPromise addModule(ScriptState*, const String& url) final;
diff --git a/third_party/WebKit/Source/core/workers/Worklet.cpp b/third_party/WebKit/Source/core/workers/Worklet.cpp index 1e6c274..dfa704f 100644 --- a/third_party/WebKit/Source/core/workers/Worklet.cpp +++ b/third_party/WebKit/Source/core/workers/Worklet.cpp
@@ -18,8 +18,6 @@ void Worklet::ContextDestroyed(ExecutionContext*) { DCHECK(IsMainThread()); - if (IsInitialized()) - GetWorkletGlobalScopeProxy()->TerminateWorkletGlobalScope(); frame_ = nullptr; }
diff --git a/third_party/WebKit/Source/core/workers/Worklet.h b/third_party/WebKit/Source/core/workers/Worklet.h index 07122bda..9d00d52 100644 --- a/third_party/WebKit/Source/core/workers/Worklet.h +++ b/third_party/WebKit/Source/core/workers/Worklet.h
@@ -30,9 +30,6 @@ public: virtual ~Worklet() = default; - virtual void Initialize() {} - virtual bool IsInitialized() const { return true; } - // Worklet.idl // addModule() imports ES6 module scripts. virtual ScriptPromise addModule(ScriptState*, const String& url) = 0;
diff --git a/third_party/WebKit/Source/core/xml/DocumentXMLTreeViewer.cpp b/third_party/WebKit/Source/core/xml/DocumentXMLTreeViewer.cpp index 9b203591..d9c7140 100644 --- a/third_party/WebKit/Source/core/xml/DocumentXMLTreeViewer.cpp +++ b/third_party/WebKit/Source/core/xml/DocumentXMLTreeViewer.cpp
@@ -26,7 +26,7 @@ document.GetFrame()->GetScriptController().ExecuteScriptInIsolatedWorld( DOMWrapperWorld::kDocumentXMLTreeViewerWorldId, sources, nullptr); - Element* element = document.GetElementById("xml-viewer-style"); + Element* element = document.getElementById("xml-viewer-style"); if (element) { element->setTextContent(css_string); }
diff --git a/third_party/WebKit/Source/core/xml/XPathFunctions.cpp b/third_party/WebKit/Source/core/xml/XPathFunctions.cpp index 8a2d2b8..019e2d14 100644 --- a/third_party/WebKit/Source/core/xml/XPathFunctions.cpp +++ b/third_party/WebKit/Source/core/xml/XPathFunctions.cpp
@@ -362,7 +362,7 @@ // If there are several nodes with the same id, id() should return the first // one. In WebKit, getElementById behaves so, too, although its behavior in // this case is formally undefined. - Node* node = context_scope.GetElementById( + Node* node = context_scope.getElementById( AtomicString(id_list.Substring(start_pos, end_pos - start_pos))); if (node && result_set.insert(node).is_new_entry) result->Append(node);
diff --git a/third_party/WebKit/Source/core/xml/XPathNodeSet.cpp b/third_party/WebKit/Source/core/xml/XPathNodeSet.cpp index b649af2..9f04d12 100644 --- a/third_party/WebKit/Source/core/xml/XPathNodeSet.cpp +++ b/third_party/WebKit/Source/core/xml/XPathNodeSet.cpp
@@ -95,7 +95,7 @@ // document order. Find it and move it to the beginning. for (unsigned i = from; i < to; ++i) { if (common_ancestor == parent_matrix[i][0]) { - parent_matrix[i].Swap(parent_matrix[from]); + parent_matrix[i].swap(parent_matrix[from]); if (from + 2 < to) SortBlock(from + 1, to, parent_matrix, may_contain_attribute_nodes); return; @@ -114,7 +114,7 @@ for (unsigned i = sorted_end; i < to; ++i) { Node* n = parent_matrix[i][0]; if (n->IsAttributeNode() && ToAttr(n)->ownerElement() == common_ancestor) - parent_matrix[i].Swap(parent_matrix[sorted_end++]); + parent_matrix[i].swap(parent_matrix[sorted_end++]); } if (sorted_end != from) { if (to - sorted_end > 1) @@ -139,7 +139,7 @@ if (parent_nodes.Contains(n)) { for (unsigned i = group_end; i < to; ++i) { if (ParentWithDepth(common_ancestor_depth + 1, parent_matrix[i]) == n) - parent_matrix[i].Swap(parent_matrix[group_end++]); + parent_matrix[i].swap(parent_matrix[group_end++]); } if (group_end - previous_group_end > 1) @@ -196,7 +196,7 @@ for (unsigned i = 0; i < node_count; ++i) sorted_nodes.push_back(parent_matrix[i][0]); - const_cast<HeapVector<Member<Node>>&>(nodes_).Swap(sorted_nodes); + const_cast<HeapVector<Member<Node>>&>(nodes_).swap(sorted_nodes); } static Node* FindRootNode(Node* node) { @@ -244,7 +244,7 @@ } DCHECK_EQ(sorted_nodes.size(), node_count); - const_cast<HeapVector<Member<Node>>&>(nodes_).Swap(sorted_nodes); + const_cast<HeapVector<Member<Node>>&>(nodes_).swap(sorted_nodes); } void NodeSet::Reverse() {
diff --git a/third_party/WebKit/Source/core/xml/XPathNodeSet.h b/third_party/WebKit/Source/core/xml/XPathNodeSet.h index be9d412..719565b 100644 --- a/third_party/WebKit/Source/core/xml/XPathNodeSet.h +++ b/third_party/WebKit/Source/core/xml/XPathNodeSet.h
@@ -56,7 +56,7 @@ void Swap(NodeSet& other) { std::swap(is_sorted_, other.is_sorted_); std::swap(subtrees_are_disjoint_, other.subtrees_are_disjoint_); - nodes_.Swap(other.nodes_); + nodes_.swap(other.nodes_); } // NodeSet itself does not verify that nodes in it are unique.
diff --git a/third_party/WebKit/Source/core/xml/XPathPath.cpp b/third_party/WebKit/Source/core/xml/XPathPath.cpp index 4a4332f..c2bc0aa6 100644 --- a/third_party/WebKit/Source/core/xml/XPathPath.cpp +++ b/third_party/WebKit/Source/core/xml/XPathPath.cpp
@@ -38,7 +38,7 @@ Filter::Filter(Expression* expr, HeapVector<Member<Predicate>>& predicates) : expr_(expr) { - predicates_.Swap(predicates); + predicates_.swap(predicates); SetIsContextNodeSensitive(expr_->IsContextNodeSensitive()); SetIsContextPositionSensitive(expr_->IsContextPositionSensitive()); SetIsContextSizeSensitive(expr_->IsContextSizeSensitive());
diff --git a/third_party/WebKit/Source/core/xml/XPathStep.cpp b/third_party/WebKit/Source/core/xml/XPathStep.cpp index 68a1d1d..2bbe46d9 100644 --- a/third_party/WebKit/Source/core/xml/XPathStep.cpp +++ b/third_party/WebKit/Source/core/xml/XPathStep.cpp
@@ -45,7 +45,7 @@ const NodeTest& node_test, HeapVector<Member<Predicate>>& predicates) : axis_(axis), node_test_(new NodeTest(node_test)) { - predicates_.Swap(predicates); + predicates_.swap(predicates); } Step::~Step() {}
diff --git a/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp b/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp index 7674934..721f0d7 100644 --- a/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp +++ b/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp
@@ -2437,7 +2437,7 @@ return; HTMLInputElement& input = toHTMLInputElement(*node); - Element* spin_button_element = input.UserAgentShadowRoot()->GetElementById( + Element* spin_button_element = input.UserAgentShadowRoot()->getElementById( ShadowElementNames::SpinButton()); if (!spin_button_element || !spin_button_element->IsSpinButtonElement()) return;
diff --git a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp index 72eb037..876164bc 100644 --- a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp +++ b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
@@ -130,7 +130,7 @@ Node* node = obj.GetNode(); if (!node || !node->IsElementNode()) return; - Element* target = ToElement(node)->GetTreeScope().GetElementById(value); + Element* target = ToElement(node)->GetTreeScope().getElementById(value); if (!target) return; AXObject* ax_target = obj.AxObjectCache().GetOrCreate(target); @@ -167,7 +167,7 @@ HeapVector<Member<AXObject>> objects; TreeScope& scope = node->GetTreeScope(); for (const auto& id : ids) { - if (Element* id_element = scope.GetElementById(AtomicString(id))) { + if (Element* id_element = scope.getElementById(AtomicString(id))) { AXObject* ax_id_element = obj.AxObjectCache().GetOrCreate(id_element); if (ax_id_element && !ax_id_element->AccessibilityIsIgnored()) objects.push_back(ax_id_element); @@ -254,7 +254,7 @@ Element* element = ToElement(GetNode()); Element* descendant = - element->GetTreeScope().GetElementById(active_descendant_attr); + element->GetTreeScope().getElementById(active_descendant_attr); if (!descendant) return nullptr;
diff --git a/third_party/WebKit/Source/modules/accessibility/AXObject.cpp b/third_party/WebKit/Source/modules/accessibility/AXObject.cpp index c775e18..8d63c1de 100644 --- a/third_party/WebKit/Source/modules/accessibility/AXObject.cpp +++ b/third_party/WebKit/Source/modules/accessibility/AXObject.cpp
@@ -959,7 +959,7 @@ TreeScope& scope = GetNode()->GetTreeScope(); for (const auto& id : ids) { - if (Element* id_element = scope.GetElementById(AtomicString(id))) + if (Element* id_element = scope.getElementById(AtomicString(id))) elements.push_back(id_element); } }
diff --git a/third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.cpp b/third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.cpp index 9d73c06..4f14f3e 100644 --- a/third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.cpp +++ b/third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.cpp
@@ -737,7 +737,7 @@ TreeScope& scope = owner->GetNode()->GetTreeScope(); Vector<AXID> new_child_axi_ds; for (const String& id_name : id_vector) { - Element* element = scope.GetElementById(AtomicString(id_name)); + Element* element = scope.getElementById(AtomicString(id_name)); if (!element) continue;
diff --git a/third_party/WebKit/Source/modules/accessibility/AXSlider.cpp b/third_party/WebKit/Source/modules/accessibility/AXSlider.cpp index 0178bec..3469367 100644 --- a/third_party/WebKit/Source/modules/accessibility/AXSlider.cpp +++ b/third_party/WebKit/Source/modules/accessibility/AXSlider.cpp
@@ -143,7 +143,7 @@ Element* thumb_element = ToElement(slider_layout_object->GetNode()) ->UserAgentShadowRoot() - ->GetElementById(ShadowElementNames::SliderThumb()); + ->getElementById(ShadowElementNames::SliderThumb()); DCHECK(thumb_element); return thumb_element->GetLayoutObject(); }
diff --git a/third_party/WebKit/Source/modules/canvas/HTMLCanvasElementModuleTest.cpp b/third_party/WebKit/Source/modules/canvas/HTMLCanvasElementModuleTest.cpp index ad9972d..50ab0381 100644 --- a/third_party/WebKit/Source/modules/canvas/HTMLCanvasElementModuleTest.cpp +++ b/third_party/WebKit/Source/modules/canvas/HTMLCanvasElementModuleTest.cpp
@@ -27,7 +27,7 @@ document->documentElement()->setInnerHTML( "<body><canvas id='c'></canvas></body>"); document->View()->UpdateAllLifecyclePhases(); - canvas_element_ = toHTMLCanvasElement(document->GetElementById("c")); + canvas_element_ = toHTMLCanvasElement(document->getElementById("c")); } HTMLCanvasElement& CanvasElement() const { return *canvas_element_; }
diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DAPITest.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DAPITest.cpp index 9dc49bf5..012aef4 100644 --- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DAPITest.cpp +++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DAPITest.cpp
@@ -72,7 +72,7 @@ document_->documentElement()->setInnerHTML( "<body><canvas id='c'></canvas></body>"); document_->View()->UpdateAllLifecyclePhases(); - canvas_element_ = toHTMLCanvasElement(document_->GetElementById("c")); + canvas_element_ = toHTMLCanvasElement(document_->getElementById("c")); } TEST_F(CanvasRenderingContext2DAPITest, SetShadowColor_Clamping) { @@ -301,7 +301,7 @@ "<button id='button'></button></canvas>"); document.GetSettings()->SetAccessibilityEnabled(true); HTMLCanvasElement* canvas = - toHTMLCanvasElement(document.GetElementById("canvas")); + toHTMLCanvasElement(document.getElementById("canvas")); String canvas_type("2d"); CanvasContextCreationAttributes attributes; @@ -315,9 +315,9 @@ TEST_F(CanvasRenderingContext2DAPITest, AccessibilityRectTestForAddHitRegion) { ResetCanvasForAccessibilityRectTest(GetDocument()); - Element* button_element = GetDocument().GetElementById("button"); + Element* button_element = GetDocument().getElementById("button"); HTMLCanvasElement* canvas = - toHTMLCanvasElement(GetDocument().GetElementById("canvas")); + toHTMLCanvasElement(GetDocument().getElementById("canvas")); CanvasRenderingContext2D* context = static_cast<CanvasRenderingContext2D*>(canvas->RenderingContext()); @@ -344,9 +344,9 @@ AccessibilityRectTestForDrawFocusIfNeeded) { ResetCanvasForAccessibilityRectTest(GetDocument()); - Element* button_element = GetDocument().GetElementById("button"); + Element* button_element = GetDocument().getElementById("button"); HTMLCanvasElement* canvas = - toHTMLCanvasElement(GetDocument().GetElementById("canvas")); + toHTMLCanvasElement(GetDocument().getElementById("canvas")); CanvasRenderingContext2D* context = static_cast<CanvasRenderingContext2D*>(canvas->RenderingContext());
diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp index 2f1c1f4..cfc096c7 100644 --- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp +++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp
@@ -214,7 +214,7 @@ document_->documentElement()->setInnerHTML( "<body><canvas id='c'></canvas></body>"); document_->View()->UpdateAllLifecyclePhases(); - canvas_element_ = toHTMLCanvasElement(document_->GetElementById("c")); + canvas_element_ = toHTMLCanvasElement(document_->getElementById("c")); full_image_data_ = ImageData::Create(IntSize(10, 10)); partial_image_data_ = ImageData::Create(IntSize(2, 2));
diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DUsageTrackingTest.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DUsageTrackingTest.cpp index 289f892..f31d9c0 100644 --- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DUsageTrackingTest.cpp +++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DUsageTrackingTest.cpp
@@ -150,7 +150,7 @@ document_->documentElement()->setInnerHTML( "<body><canvas id='c'></canvas></body>"); document_->View()->UpdateAllLifecyclePhases(); - canvas_element_ = toHTMLCanvasElement(document_->GetElementById("c")); + canvas_element_ = toHTMLCanvasElement(document_->getElementById("c")); full_image_data_ = ImageData::Create(IntSize(10, 10)); global_memory_cache_ = ReplaceMemoryCacheForTesting(MemoryCache::Create());
diff --git a/third_party/WebKit/Source/modules/credentialmanager/BUILD.gn b/third_party/WebKit/Source/modules/credentialmanager/BUILD.gn index 783f1576..c0a59eb 100644 --- a/third_party/WebKit/Source/modules/credentialmanager/BUILD.gn +++ b/third_party/WebKit/Source/modules/credentialmanager/BUILD.gn
@@ -10,6 +10,8 @@ "Credential.h", "CredentialManagerClient.cpp", "CredentialManagerClient.h", + "CredentialUserData.cpp", + "CredentialUserData.h", "CredentialsContainer.cpp", "CredentialsContainer.h", "FederatedCredential.cpp", @@ -18,7 +20,5 @@ "NavigatorCredentials.h", "PasswordCredential.cpp", "PasswordCredential.h", - "SiteBoundCredential.cpp", - "SiteBoundCredential.h", ] }
diff --git a/third_party/WebKit/Source/modules/credentialmanager/SiteBoundCredential.cpp b/third_party/WebKit/Source/modules/credentialmanager/CredentialUserData.cpp similarity index 63% rename from third_party/WebKit/Source/modules/credentialmanager/SiteBoundCredential.cpp rename to third_party/WebKit/Source/modules/credentialmanager/CredentialUserData.cpp index 5438842..19f3e2e 100644 --- a/third_party/WebKit/Source/modules/credentialmanager/SiteBoundCredential.cpp +++ b/third_party/WebKit/Source/modules/credentialmanager/CredentialUserData.cpp
@@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "modules/credentialmanager/SiteBoundCredential.h" +#include "modules/credentialmanager/CredentialUserData.h" namespace blink { -SiteBoundCredential::SiteBoundCredential( - PlatformCredential* platform_credential) +CredentialUserData::CredentialUserData(PlatformCredential* platform_credential) : Credential(platform_credential) {} } // namespace blink
diff --git a/third_party/WebKit/Source/modules/credentialmanager/SiteBoundCredential.h b/third_party/WebKit/Source/modules/credentialmanager/CredentialUserData.h similarity index 71% rename from third_party/WebKit/Source/modules/credentialmanager/SiteBoundCredential.h rename to third_party/WebKit/Source/modules/credentialmanager/CredentialUserData.h index fe052b8..2d25705 100644 --- a/third_party/WebKit/Source/modules/credentialmanager/SiteBoundCredential.h +++ b/third_party/WebKit/Source/modules/credentialmanager/CredentialUserData.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SiteBoundCredential_h -#define SiteBoundCredential_h +#ifndef CredentialUserData_h +#define CredentialUserData_h #include "bindings/core/v8/ScriptWrappable.h" #include "modules/ModulesExport.h" @@ -12,18 +12,18 @@ namespace blink { -class MODULES_EXPORT SiteBoundCredential : public Credential { +class MODULES_EXPORT CredentialUserData : public Credential { DEFINE_WRAPPERTYPEINFO(); public: - // SiteBoundCredential.idl + // CredentialUserData.idl const String& name() const { return platform_credential_->GetName(); } const KURL& iconURL() const { return platform_credential_->GetIconURL(); } protected: - SiteBoundCredential(PlatformCredential*); + CredentialUserData(PlatformCredential*); }; } // namespace blink -#endif // SiteBoundCredential_h +#endif // CredentialUserData_h
diff --git a/third_party/WebKit/Source/modules/credentialmanager/SiteBoundCredential.idl b/third_party/WebKit/Source/modules/credentialmanager/CredentialUserData.idl similarity index 65% rename from third_party/WebKit/Source/modules/credentialmanager/SiteBoundCredential.idl rename to third_party/WebKit/Source/modules/credentialmanager/CredentialUserData.idl index f716407..f79b0ca 100644 --- a/third_party/WebKit/Source/modules/credentialmanager/SiteBoundCredential.idl +++ b/third_party/WebKit/Source/modules/credentialmanager/CredentialUserData.idl
@@ -2,12 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// https://w3c.github.io/webappsec-credential-management/#siteboundcredential +// https://w3c.github.io/webappsec-credential-management/#credentialuserdata [ RuntimeEnabled=CredentialManager, - Exposed=Window -] interface SiteBoundCredential : Credential { + NoInterfaceObject, + SecureContext, +] interface CredentialUserData { readonly attribute USVString name; readonly attribute USVString iconURL; };
diff --git a/third_party/WebKit/Source/modules/credentialmanager/FederatedCredential.cpp b/third_party/WebKit/Source/modules/credentialmanager/FederatedCredential.cpp index 80f82da..e72270f 100644 --- a/third_party/WebKit/Source/modules/credentialmanager/FederatedCredential.cpp +++ b/third_party/WebKit/Source/modules/credentialmanager/FederatedCredential.cpp
@@ -39,13 +39,13 @@ FederatedCredential::FederatedCredential( WebFederatedCredential* web_federated_credential) - : SiteBoundCredential(web_federated_credential->GetPlatformCredential()) {} + : CredentialUserData(web_federated_credential->GetPlatformCredential()) {} FederatedCredential::FederatedCredential(const String& id, const KURL& provider, const String& name, const KURL& icon) - : SiteBoundCredential( + : CredentialUserData( PlatformFederatedCredential::Create(id, SecurityOrigin::Create(provider), name,
diff --git a/third_party/WebKit/Source/modules/credentialmanager/FederatedCredential.h b/third_party/WebKit/Source/modules/credentialmanager/FederatedCredential.h index 48fa809..68394a3a 100644 --- a/third_party/WebKit/Source/modules/credentialmanager/FederatedCredential.h +++ b/third_party/WebKit/Source/modules/credentialmanager/FederatedCredential.h
@@ -8,7 +8,7 @@ #include "bindings/core/v8/ScriptWrappable.h" #include "bindings/core/v8/SerializedScriptValue.h" #include "modules/ModulesExport.h" -#include "modules/credentialmanager/SiteBoundCredential.h" +#include "modules/credentialmanager/CredentialUserData.h" #include "platform/heap/Handle.h" #include "platform/weborigin/KURL.h" @@ -17,7 +17,7 @@ class FederatedCredentialData; class WebFederatedCredential; -class MODULES_EXPORT FederatedCredential final : public SiteBoundCredential { +class MODULES_EXPORT FederatedCredential final : public CredentialUserData { DEFINE_WRAPPERTYPEINFO(); public:
diff --git a/third_party/WebKit/Source/modules/credentialmanager/FederatedCredential.idl b/third_party/WebKit/Source/modules/credentialmanager/FederatedCredential.idl index e2bcc5e..cd56a56 100644 --- a/third_party/WebKit/Source/modules/credentialmanager/FederatedCredential.idl +++ b/third_party/WebKit/Source/modules/credentialmanager/FederatedCredential.idl
@@ -9,9 +9,10 @@ RaisesException=Constructor, Constructor(FederatedCredentialData data), Exposed=Window -] interface FederatedCredential : SiteBoundCredential { +] interface FederatedCredential : Credential { readonly attribute USVString provider; // TODO(mkwst): We don't really support this yet; it always returns ''. readonly attribute DOMString? protocol; }; +FederatedCredential implements CredentialUserData;
diff --git a/third_party/WebKit/Source/modules/credentialmanager/PasswordCredential.cpp b/third_party/WebKit/Source/modules/credentialmanager/PasswordCredential.cpp index fcef227..55dbf25 100644 --- a/third_party/WebKit/Source/modules/credentialmanager/PasswordCredential.cpp +++ b/third_party/WebKit/Source/modules/credentialmanager/PasswordCredential.cpp
@@ -119,7 +119,7 @@ PasswordCredential::PasswordCredential( WebPasswordCredential* web_password_credential) - : SiteBoundCredential(web_password_credential->GetPlatformCredential()), + : CredentialUserData(web_password_credential->GetPlatformCredential()), id_name_("username"), password_name_("password") {} @@ -127,7 +127,7 @@ const String& password, const String& name, const KURL& icon) - : SiteBoundCredential( + : CredentialUserData( PlatformPasswordCredential::Create(id, password, name, icon)), id_name_("username"), password_name_("password") {} @@ -183,7 +183,7 @@ } DEFINE_TRACE(PasswordCredential) { - SiteBoundCredential::Trace(visitor); + CredentialUserData::Trace(visitor); visitor->Trace(additional_data_); }
diff --git a/third_party/WebKit/Source/modules/credentialmanager/PasswordCredential.h b/third_party/WebKit/Source/modules/credentialmanager/PasswordCredential.h index d791357..8646668d 100644 --- a/third_party/WebKit/Source/modules/credentialmanager/PasswordCredential.h +++ b/third_party/WebKit/Source/modules/credentialmanager/PasswordCredential.h
@@ -9,7 +9,7 @@ #include "bindings/core/v8/SerializedScriptValue.h" #include "bindings/modules/v8/FormDataOrURLSearchParams.h" #include "modules/ModulesExport.h" -#include "modules/credentialmanager/SiteBoundCredential.h" +#include "modules/credentialmanager/CredentialUserData.h" #include "platform/heap/Handle.h" #include "platform/network/EncodedFormData.h" #include "platform/weborigin/KURL.h" @@ -22,7 +22,7 @@ using CredentialPostBodyType = FormDataOrURLSearchParams; -class MODULES_EXPORT PasswordCredential final : public SiteBoundCredential { +class MODULES_EXPORT PasswordCredential final : public CredentialUserData { DEFINE_WRAPPERTYPEINFO(); public:
diff --git a/third_party/WebKit/Source/modules/credentialmanager/PasswordCredential.idl b/third_party/WebKit/Source/modules/credentialmanager/PasswordCredential.idl index f552210..822bb01 100644 --- a/third_party/WebKit/Source/modules/credentialmanager/PasswordCredential.idl +++ b/third_party/WebKit/Source/modules/credentialmanager/PasswordCredential.idl
@@ -12,8 +12,9 @@ Constructor(PasswordCredentialData data), Constructor(HTMLFormElement form), Exposed=Window, -] interface PasswordCredential : SiteBoundCredential { +] interface PasswordCredential : Credential { attribute USVString idName; attribute USVString passwordName; attribute CredentialBodyType? additionalData; }; +PasswordCredential implements CredentialUserData;
diff --git a/third_party/WebKit/Source/modules/credentialmanager/PasswordCredentialTest.cpp b/third_party/WebKit/Source/modules/credentialmanager/PasswordCredentialTest.cpp index 0212cf0c..e77c62d 100644 --- a/third_party/WebKit/Source/modules/credentialmanager/PasswordCredentialTest.cpp +++ b/third_party/WebKit/Source/modules/credentialmanager/PasswordCredentialTest.cpp
@@ -38,7 +38,7 @@ GetDocument().documentElement()->setInnerHTML(b.ToString()); GetDocument().View()->UpdateAllLifecyclePhases(); HTMLFormElement* form = - toHTMLFormElement(GetDocument().GetElementById("theForm")); + toHTMLFormElement(GetDocument().getElementById("theForm")); EXPECT_NE(nullptr, form); return form; }
diff --git a/third_party/WebKit/Source/modules/csspaint/CSSPaintDefinition.cpp b/third_party/WebKit/Source/modules/csspaint/CSSPaintDefinition.cpp index 5f88c30..4bbff95 100644 --- a/third_party/WebKit/Source/modules/csspaint/CSSPaintDefinition.cpp +++ b/third_party/WebKit/Source/modules/csspaint/CSSPaintDefinition.cpp
@@ -59,9 +59,9 @@ paint_(script_state->GetIsolate(), paint), did_call_constructor_(false), has_alpha_(has_alpha) { - native_invalidation_properties_.Swap(native_invalidation_properties); - custom_invalidation_properties_.Swap(custom_invalidation_properties); - input_argument_types_.Swap(input_argument_types); + native_invalidation_properties_.swap(native_invalidation_properties); + custom_invalidation_properties_.swap(custom_invalidation_properties); + input_argument_types_.swap(input_argument_types); } CSSPaintDefinition::~CSSPaintDefinition() {}
diff --git a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp index 7036d519..f5d5c6d8 100644 --- a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp +++ b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp
@@ -1034,7 +1034,7 @@ session_.reset(); is_closed_ = true; action_timer_.Stop(); - pending_actions_.Clear(); + pending_actions_.clear(); async_event_queue_->Close(); }
diff --git a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp index 80b1a5d..fe358c1 100644 --- a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp +++ b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp
@@ -302,7 +302,7 @@ void MediaKeys::ContextDestroyed(ExecutionContext*) { timer_.Stop(); - pending_actions_.Clear(); + pending_actions_.clear(); // We don't need the CDM anymore. Only destroyed after all related // ContextLifecycleObservers have been stopped.
diff --git a/third_party/WebKit/Source/modules/fetch/BytesConsumer.cpp b/third_party/WebKit/Source/modules/fetch/BytesConsumer.cpp index 936f557..7bf2ce96 100644 --- a/third_party/WebKit/Source/modules/fetch/BytesConsumer.cpp +++ b/third_party/WebKit/Source/modules/fetch/BytesConsumer.cpp
@@ -228,7 +228,7 @@ bool IsEmpty() const { return chunks_.IsEmpty(); } void ClearChunks() { - chunks_.Clear(); + chunks_.clear(); offset_ = 0; }
diff --git a/third_party/WebKit/Source/modules/fetch/BytesConsumerTestUtil.cpp b/third_party/WebKit/Source/modules/fetch/BytesConsumerTestUtil.cpp index a8eb2fb..b26042c 100644 --- a/third_party/WebKit/Source/modules/fetch/BytesConsumerTestUtil.cpp +++ b/third_party/WebKit/Source/modules/fetch/BytesConsumerTestUtil.cpp
@@ -137,14 +137,14 @@ } void BytesConsumerTestUtil::ReplayingBytesConsumer::Close() { - commands_.Clear(); + commands_.clear(); offset_ = 0; state_ = InternalState::kClosed; ++notification_token_; } void BytesConsumerTestUtil::ReplayingBytesConsumer::GetError(const Error& e) { - commands_.Clear(); + commands_.clear(); offset_ = 0; error_ = e; state_ = InternalState::kErrored;
diff --git a/third_party/WebKit/Source/modules/filesystem/DirectoryReader.cpp b/third_party/WebKit/Source/modules/filesystem/DirectoryReader.cpp index e46b840..838cb9e 100644 --- a/third_party/WebKit/Source/modules/filesystem/DirectoryReader.cpp +++ b/third_party/WebKit/Source/modules/filesystem/DirectoryReader.cpp
@@ -123,7 +123,7 @@ if (entries_callback_) { EntriesCallback* entries_callback = entries_callback_.Release(); EntryHeapVector entries; - entries.Swap(entries_); + entries.swap(entries_); entries_callback->handleEvent(entries); } }
diff --git a/third_party/WebKit/Source/modules/filesystem/DirectoryReaderSync.cpp b/third_party/WebKit/Source/modules/filesystem/DirectoryReaderSync.cpp index cbbca5a..ee2bb13 100644 --- a/third_party/WebKit/Source/modules/filesystem/DirectoryReaderSync.cpp +++ b/third_party/WebKit/Source/modules/filesystem/DirectoryReaderSync.cpp
@@ -105,7 +105,7 @@ } EntrySyncHeapVector result; - result.Swap(entries_); + result.swap(entries_); return result; }
diff --git a/third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp b/third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp index 1e60f2a..655ac05c 100644 --- a/third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp +++ b/third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp
@@ -234,7 +234,7 @@ void EntriesCallbacks::DidReadDirectoryEntries(bool has_more) { directory_reader_->SetHasMoreEntries(has_more); EntryHeapVector entries; - entries.Swap(entries_); + entries.swap(entries_); // FIXME: delay the callback iff shouldScheduleCallback() is true. if (success_callback_) success_callback_->handleEvent(entries);
diff --git a/third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.cpp b/third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.cpp index 023b2d42..e079b4f 100644 --- a/third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.cpp +++ b/third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.cpp
@@ -234,7 +234,7 @@ void NavigatorGamepad::DidRemoveGamepadEventListeners() { has_event_listener_ = false; dispatch_one_event_runner_->Stop(); - pending_events_.Clear(); + pending_events_.clear(); } void NavigatorGamepad::PageVisibilityChanged() {
diff --git a/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp b/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp index 6034f7d..ccca232 100644 --- a/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp +++ b/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp
@@ -391,7 +391,7 @@ } else non_cached.push_back(notifier); } - notifiers.Swap(non_cached); + notifiers.swap(non_cached); } void Geolocation::CopyToSet(const GeoNotifierVector& src,
diff --git a/third_party/WebKit/Source/modules/media_controls/elements/MediaControlTimelineElement.cpp b/third_party/WebKit/Source/modules/media_controls/elements/MediaControlTimelineElement.cpp index c4618a7..27f4862 100644 --- a/third_party/WebKit/Source/modules/media_controls/elements/MediaControlTimelineElement.cpp +++ b/third_party/WebKit/Source/modules/media_controls/elements/MediaControlTimelineElement.cpp
@@ -82,7 +82,7 @@ Platform::Current()->RecordAction( UserMetricsAction("Media.Controls.ScrubbingBegin")); static_cast<MediaControlsImpl&>(GetMediaControls()).BeginScrubbing(); - Element* thumb = UserAgentShadowRoot()->GetElementById( + Element* thumb = UserAgentShadowRoot()->getElementById( ShadowElementNames::SliderThumb()); bool started_from_thumb = thumb && thumb == event->target()->ToNode(); metrics_.StartGesture(started_from_thumb);
diff --git a/third_party/WebKit/Source/modules/mediarecorder/MediaRecorder.cpp b/third_party/WebKit/Source/modules/mediarecorder/MediaRecorder.cpp index 4c31d50..a507b3c6 100644 --- a/third_party/WebKit/Source/modules/mediarecorder/MediaRecorder.cpp +++ b/third_party/WebKit/Source/modules/mediarecorder/MediaRecorder.cpp
@@ -380,7 +380,7 @@ void MediaRecorder::DispatchScheduledEvent() { HeapVector<Member<Event>> events; - events.Swap(scheduled_events_); + events.swap(scheduled_events_); for (const auto& event : events) DispatchEvent(event);
diff --git a/third_party/WebKit/Source/modules/mediasession/MediaMetadata.cpp b/third_party/WebKit/Source/modules/mediasession/MediaMetadata.cpp index 3bdc93d..6756221 100644 --- a/third_party/WebKit/Source/modules/mediasession/MediaMetadata.cpp +++ b/third_party/WebKit/Source/modules/mediasession/MediaMetadata.cpp
@@ -118,7 +118,7 @@ } DCHECK(!exception_state.HadException()); - artwork_.Swap(processed_artwork); + artwork_.swap(processed_artwork); } DEFINE_TRACE(MediaMetadata) {
diff --git a/third_party/WebKit/Source/modules/mediastream/MediaDevices.cpp b/third_party/WebKit/Source/modules/mediastream/MediaDevices.cpp index e6f8231c..fa69c82 100644 --- a/third_party/WebKit/Source/modules/mediastream/MediaDevices.cpp +++ b/third_party/WebKit/Source/modules/mediastream/MediaDevices.cpp
@@ -206,7 +206,7 @@ void MediaDevices::DispatchScheduledEvent() { HeapVector<Member<Event>> events; - events.Swap(scheduled_events_); + events.swap(scheduled_events_); for (const auto& event : events) DispatchEvent(event);
diff --git a/third_party/WebKit/Source/modules/mediastream/MediaStream.cpp b/third_party/WebKit/Source/modules/mediastream/MediaStream.cpp index cbe9a36..d0b03d4 100644 --- a/third_party/WebKit/Source/modules/mediastream/MediaStream.cpp +++ b/third_party/WebKit/Source/modules/mediastream/MediaStream.cpp
@@ -410,7 +410,7 @@ return; HeapVector<Member<Event>> events; - events.Swap(scheduled_events_); + events.swap(scheduled_events_); HeapVector<Member<Event>>::iterator it = events.begin(); for (; it != events.end(); ++it)
diff --git a/third_party/WebKit/Source/modules/modules_idl_files.gni b/third_party/WebKit/Source/modules/modules_idl_files.gni index 21ae131..77ce63b7 100644 --- a/third_party/WebKit/Source/modules/modules_idl_files.gni +++ b/third_party/WebKit/Source/modules/modules_idl_files.gni
@@ -73,10 +73,10 @@ "compositorworker/CompositorWorker.idl", "compositorworker/CompositorWorkerGlobalScope.idl", "credentialmanager/Credential.idl", + "credentialmanager/CredentialUserData.idl", "credentialmanager/CredentialsContainer.idl", "credentialmanager/FederatedCredential.idl", "credentialmanager/PasswordCredential.idl", - "credentialmanager/SiteBoundCredential.idl", "crypto/Crypto.idl", "crypto/CryptoKey.idl", "crypto/SubtleCrypto.idl",
diff --git a/third_party/WebKit/Source/modules/payments/PaymentInstruments.cpp b/third_party/WebKit/Source/modules/payments/PaymentInstruments.cpp index 133ea8580..ea22365 100644 --- a/third_party/WebKit/Source/modules/payments/PaymentInstruments.cpp +++ b/third_party/WebKit/Source/modules/payments/PaymentInstruments.cpp
@@ -53,9 +53,22 @@ : manager_(manager) {} ScriptPromise PaymentInstruments::deleteInstrument( + ScriptState* script_state, const String& instrument_key) { - NOTIMPLEMENTED(); - return ScriptPromise(); + if (!manager_.is_bound()) { + return ScriptPromise::RejectWithDOMException( + script_state, + DOMException::Create(kInvalidStateError, kPaymentManagerUnavailable)); + } + + ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state); + ScriptPromise promise = resolver->Promise(); + + manager_->DeletePaymentInstrument( + instrument_key, ConvertToBaseCallback(WTF::Bind( + &PaymentInstruments::onDeletePaymentInstrument, + WrapPersistent(this), WrapPersistent(resolver)))); + return promise; } ScriptPromise PaymentInstruments::get(ScriptState* script_state, @@ -130,6 +143,14 @@ DEFINE_TRACE(PaymentInstruments) {} +void PaymentInstruments::onDeletePaymentInstrument( + ScriptPromiseResolver* resolver, + payments::mojom::blink::PaymentHandlerStatus status) { + DCHECK(resolver); + resolver->Resolve(status == + payments::mojom::blink::PaymentHandlerStatus::SUCCESS); +} + void PaymentInstruments::onGetPaymentInstrument( ScriptPromiseResolver* resolver, payments::mojom::blink::PaymentInstrumentPtr stored_instrument,
diff --git a/third_party/WebKit/Source/modules/payments/PaymentInstruments.h b/third_party/WebKit/Source/modules/payments/PaymentInstruments.h index 3f837e0..b633097 100644 --- a/third_party/WebKit/Source/modules/payments/PaymentInstruments.h +++ b/third_party/WebKit/Source/modules/payments/PaymentInstruments.h
@@ -29,7 +29,7 @@ public: explicit PaymentInstruments(const payments::mojom::blink::PaymentManagerPtr&); - ScriptPromise deleteInstrument(const String& instrument_key); + ScriptPromise deleteInstrument(ScriptState*, const String& instrument_key); ScriptPromise get(ScriptState*, const String& instrument_key); ScriptPromise keys(); ScriptPromise has(const String& instrument_key); @@ -41,11 +41,13 @@ DECLARE_TRACE(); private: - void onSetPaymentInstrument(ScriptPromiseResolver*, - payments::mojom::blink::PaymentHandlerStatus); + void onDeletePaymentInstrument(ScriptPromiseResolver*, + payments::mojom::blink::PaymentHandlerStatus); void onGetPaymentInstrument(ScriptPromiseResolver*, payments::mojom::blink::PaymentInstrumentPtr, payments::mojom::blink::PaymentHandlerStatus); + void onSetPaymentInstrument(ScriptPromiseResolver*, + payments::mojom::blink::PaymentHandlerStatus); const payments::mojom::blink::PaymentManagerPtr& manager_; };
diff --git a/third_party/WebKit/Source/modules/payments/PaymentInstruments.idl b/third_party/WebKit/Source/modules/payments/PaymentInstruments.idl index a6c5fd8..9939b68 100644 --- a/third_party/WebKit/Source/modules/payments/PaymentInstruments.idl +++ b/third_party/WebKit/Source/modules/payments/PaymentInstruments.idl
@@ -8,7 +8,7 @@ RuntimeEnabled=PaymentApp, Exposed=ServiceWorker ] interface PaymentInstruments { - [ImplementedAs=deleteInstrument] Promise<boolean> delete(DOMString instrumentKey); + [CallWith=ScriptState, ImplementedAs=deleteInstrument] Promise<boolean> delete(DOMString instrumentKey); [CallWith=ScriptState] Promise<PaymentInstrument> get(DOMString instrumentKey); Promise<sequence<DOMString>> keys(); Promise<boolean> has(DOMString instrumentKey);
diff --git a/third_party/WebKit/Source/modules/peerconnection/RTCDTMFSender.cpp b/third_party/WebKit/Source/modules/peerconnection/RTCDTMFSender.cpp index 10b66f6..f72d5a01 100644 --- a/third_party/WebKit/Source/modules/peerconnection/RTCDTMFSender.cpp +++ b/third_party/WebKit/Source/modules/peerconnection/RTCDTMFSender.cpp
@@ -178,7 +178,7 @@ return; HeapVector<Member<Event>> events; - events.Swap(scheduled_events_); + events.swap(scheduled_events_); HeapVector<Member<Event>>::iterator it = events.begin(); for (; it != events.end(); ++it)
diff --git a/third_party/WebKit/Source/modules/peerconnection/RTCDataChannel.cpp b/third_party/WebKit/Source/modules/peerconnection/RTCDataChannel.cpp index 59de81cc..29bf791 100644 --- a/third_party/WebKit/Source/modules/peerconnection/RTCDataChannel.cpp +++ b/third_party/WebKit/Source/modules/peerconnection/RTCDataChannel.cpp
@@ -366,7 +366,7 @@ void RTCDataChannel::ScheduledEventTimerFired(TimerBase*) { HeapVector<Member<Event>> events; - events.Swap(scheduled_events_); + events.swap(scheduled_events_); HeapVector<Member<Event>>::iterator it = events.begin(); for (; it != events.end(); ++it)
diff --git a/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp b/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp index 753b236e..e97e12ef 100644 --- a/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp +++ b/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp
@@ -1512,7 +1512,7 @@ return; HeapVector<Member<EventWrapper>> events; - events.Swap(scheduled_events_); + events.swap(scheduled_events_); HeapVector<Member<EventWrapper>>::iterator it = events.begin(); for (; it != events.end(); ++it) {
diff --git a/third_party/WebKit/Source/modules/presentation/PresentationConnection.cpp b/third_party/WebKit/Source/modules/presentation/PresentationConnection.cpp index 90d0d36..eab4646 100644 --- a/third_party/WebKit/Source/modules/presentation/PresentationConnection.cpp +++ b/third_party/WebKit/Source/modules/presentation/PresentationConnection.cpp
@@ -521,7 +521,7 @@ blob_loader_->Cancel(); blob_loader_.Clear(); } - messages_.Clear(); + messages_.clear(); } } // namespace blink
diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerMessageEvent.idl b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerMessageEvent.idl deleted file mode 100644 index e542c42f..0000000 --- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerMessageEvent.idl +++ /dev/null
@@ -1,20 +0,0 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// https://w3c.github.io/ServiceWorker/#serviceworkermessage-event-interface - -[ - // TODO(bashi): Stop using CustomConstructor once we solve reference - // circulation between Blink and V8. http://crbug.com/501866 - // Constructor should be: - // Constructor(DOMString type, optional ServiceWorkerMessageEventInit eventInitDict), - CustomConstructor, - Exposed=(Window, Worker), -] interface ServiceWorkerMessageEvent : Event { - [Custom=Getter] readonly attribute any data; - readonly attribute DOMString origin; - readonly attribute DOMString lastEventId; - readonly attribute (ServiceWorker or MessagePort)? source; - readonly attribute FrozenArray<MessagePort>? ports; -};
diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerMessageEventInit.idl b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerMessageEventInit.idl deleted file mode 100644 index 494b1011..0000000 --- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerMessageEventInit.idl +++ /dev/null
@@ -1,13 +0,0 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// https://w3c.github.io/ServiceWorker/#serviceworkermessage-event-init-dictionary - -dictionary ServiceWorkerMessageEventInit : EventInit { - any data; - DOMString origin; - DOMString lastEventId; - (ServiceWorker or MessagePort)? source; - sequence<MessagePort> ports; -};
diff --git a/third_party/WebKit/Source/modules/speech/SpeechSynthesis.cpp b/third_party/WebKit/Source/modules/speech/SpeechSynthesis.cpp index 9f6c6fa..b587a1e 100644 --- a/third_party/WebKit/Source/modules/speech/SpeechSynthesis.cpp +++ b/third_party/WebKit/Source/modules/speech/SpeechSynthesis.cpp
@@ -107,7 +107,7 @@ // Remove all the items from the utterance queue. The platform // may still have references to some of these utterances and may // fire events on them asynchronously. - utterance_queue_.Clear(); + utterance_queue_.clear(); platform_speech_synthesizer_->Cancel(); }
diff --git a/third_party/WebKit/Source/modules/speech/testing/PlatformSpeechSynthesizerMock.cpp b/third_party/WebKit/Source/modules/speech/testing/PlatformSpeechSynthesizerMock.cpp index f3e85e2b..e30b1a67 100644 --- a/third_party/WebKit/Source/modules/speech/testing/PlatformSpeechSynthesizerMock.cpp +++ b/third_party/WebKit/Source/modules/speech/testing/PlatformSpeechSynthesizerMock.cpp
@@ -117,7 +117,7 @@ return; // Per spec, removes all queued utterances. - queued_utterances_.Clear(); + queued_utterances_.clear(); speaking_finished_timer_.Stop(); speaking_error_occurred_timer_.StartOneShot(.1, BLINK_FROM_HERE);
diff --git a/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.cpp b/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.cpp index e2ed4f86..2deee26 100644 --- a/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.cpp +++ b/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.cpp
@@ -415,7 +415,7 @@ ->IsDatabaseThread()); MutexLocker locker(statement_mutex_); - statement_queue_.Clear(); + statement_queue_.clear(); if (sqlite_transaction_) { // In the event we got here because of an interruption or error (i.e. if
diff --git a/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp b/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp index 854bd3d..315fec9 100644 --- a/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp +++ b/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp
@@ -122,7 +122,7 @@ state_ = kStopped; resume_timer_.Stop(); - events_.Clear(); + events_.clear(); } void DOMWebSocket::EventQueue::DispatchQueuedEvents() { @@ -713,7 +713,7 @@ case kBinaryTypeBlob: { size_t size = binary_data->size(); RefPtr<RawData> raw_data = RawData::Create(); - binary_data->Swap(*raw_data->MutableData()); + binary_data->swap(*raw_data->MutableData()); std::unique_ptr<BlobData> blob_data = BlobData::Create(); blob_data->AppendData(raw_data.Release(), 0, BlobDataItem::kToEndOfFile); Blob* blob =
diff --git a/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.cpp b/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.cpp index 8a0ab717..3550e41 100644 --- a/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.cpp +++ b/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.cpp
@@ -615,7 +615,7 @@ } else { std::unique_ptr<Vector<char>> binary_data = WTF::WrapUnique(new Vector<char>); - binary_data->Swap(receiving_message_data_); + binary_data->swap(receiving_message_data_); client_->DidReceiveBinaryMessage(std::move(binary_data)); } }
diff --git a/third_party/WebKit/Source/platform/BUILD.gn b/third_party/WebKit/Source/platform/BUILD.gn index cb0e0eb..cd21dd728 100644 --- a/third_party/WebKit/Source/platform/BUILD.gn +++ b/third_party/WebKit/Source/platform/BUILD.gn
@@ -257,7 +257,6 @@ "FileMetadata.cpp", "FileMetadata.h", "FileSystemType.h", - "FrameViewBase.cpp", "FrameViewBase.h", "Histogram.cpp", "Histogram.h",
diff --git a/third_party/WebKit/Source/platform/FrameViewBase.cpp b/third_party/WebKit/Source/platform/FrameViewBase.cpp deleted file mode 100644 index a2a8f80f..0000000 --- a/third_party/WebKit/Source/platform/FrameViewBase.cpp +++ /dev/null
@@ -1,101 +0,0 @@ -/* - * Copyright (C) 2004, 2005, 2006, 2010 Apple Inc. All rights reserved. - * Copyright (C) 2013 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "platform/FrameViewBase.h" - -#include "platform/wtf/Assertions.h" - -namespace blink { - -FrameViewBase::FrameViewBase() - : parent_(nullptr), self_visible_(false), parent_visible_(false) {} - -FrameViewBase::~FrameViewBase() {} - -DEFINE_TRACE(FrameViewBase) { - visitor->Trace(parent_); -} - -void FrameViewBase::SetParent(FrameViewBase* frame_view_base) { - DCHECK(!frame_view_base || !parent_); - if (!frame_view_base || !frame_view_base->IsVisible()) - SetParentVisible(false); - parent_ = frame_view_base; - if (frame_view_base && frame_view_base->IsVisible()) - SetParentVisible(true); -} - -FrameViewBase* FrameViewBase::Root() const { - const FrameViewBase* top = this; - while (top->Parent()) - top = top->Parent(); - if (top->IsFrameView()) - return const_cast<FrameViewBase*>(static_cast<const FrameViewBase*>(top)); - return 0; -} - -IntRect FrameViewBase::ConvertFromRootFrame( - const IntRect& rect_in_root_frame) const { - if (const FrameViewBase* parent_frame_view_base = Parent()) { - IntRect parent_rect = - parent_frame_view_base->ConvertFromRootFrame(rect_in_root_frame); - return ConvertFromContainingFrameViewBase(parent_rect); - } - return rect_in_root_frame; -} - -IntPoint FrameViewBase::ConvertFromRootFrame( - const IntPoint& point_in_root_frame) const { - if (const FrameViewBase* parent_frame_view_base = Parent()) { - IntPoint parent_point = - parent_frame_view_base->ConvertFromRootFrame(point_in_root_frame); - return ConvertFromContainingFrameViewBase(parent_point); - } - return point_in_root_frame; -} - -FloatPoint FrameViewBase::ConvertFromRootFrame( - const FloatPoint& point_in_root_frame) const { - // FrameViewBase / windows are required to be IntPoint aligned, but we may - // need to convert FloatPoint values within them (eg. for event co-ordinates). - IntPoint floored_point = FlooredIntPoint(point_in_root_frame); - FloatPoint parent_point = ConvertFromRootFrame(floored_point); - FloatSize window_fraction = point_in_root_frame - floored_point; - // Use linear interpolation handle any fractional value (eg. for iframes - // subject to a transform beyond just a simple translation). - // FIXME: Add FloatPoint variants of all co-ordinate space conversion APIs. - if (!window_fraction.IsEmpty()) { - const int kFactor = 1000; - IntPoint parent_line_end = ConvertFromRootFrame( - floored_point + RoundedIntSize(window_fraction.ScaledBy(kFactor))); - FloatSize parent_fraction = - (parent_line_end - parent_point).ScaledBy(1.0f / kFactor); - parent_point.Move(parent_fraction); - } - return parent_point; -} - -} // namespace blink
diff --git a/third_party/WebKit/Source/platform/FrameViewBase.h b/third_party/WebKit/Source/platform/FrameViewBase.h index c403350c..ab3d186 100644 --- a/third_party/WebKit/Source/platform/FrameViewBase.h +++ b/third_party/WebKit/Source/platform/FrameViewBase.h
@@ -32,70 +32,73 @@ #include "platform/geometry/FloatPoint.h" #include "platform/geometry/IntRect.h" #include "platform/heap/Handle.h" -#include "platform/wtf/Forward.h" namespace blink { -class Event; - -// The FrameViewBase class serves as a base class for FrameView, Scrollbar, and -// PluginView. -// -// FrameViewBases are connected in a hierarchy, with the restriction that -// plugins and scrollbars are always leaves of the tree. Only FrameView can have -// children (and therefore the FrameViewBase class has no concept of children). -class PLATFORM_EXPORT FrameViewBase - : public GarbageCollectedFinalized<FrameViewBase> { +// The FrameViewBase class is the parent of Scrollbar. +// TODO(joelhockey): Move core/paint/ScrollbarManager to platform/scroll +// and use it to replace this class. +class PLATFORM_EXPORT FrameViewBase : public GarbageCollectedMixin { public: - FrameViewBase(); - virtual ~FrameViewBase(); + FrameViewBase(){}; + virtual ~FrameViewBase(){}; - int X() const { return FrameRect().X(); } - int Y() const { return FrameRect().Y(); } - int Width() const { return FrameRect().Width(); } - int Height() const { return FrameRect().Height(); } - IntSize Size() const { return FrameRect().Size(); } - IntPoint Location() const { return FrameRect().Location(); } - - virtual void SetFrameRect(const IntRect& frame_rect) { - frame_rect_ = frame_rect; - } - const IntRect& FrameRect() const { return frame_rect_; } - - void Resize(int w, int h) { SetFrameRect(IntRect(X(), Y(), w, h)); } - void Resize(const IntSize& s) { SetFrameRect(IntRect(Location(), s)); } - - bool IsSelfVisible() const { - return self_visible_; - } // Whether or not we have been explicitly marked as visible or not. - bool IsParentVisible() const { - return parent_visible_; - } // Whether or not our parent is visible. - bool IsVisible() const { - return self_visible_ && parent_visible_; - } // Whether or not we are actually visible. - virtual void SetParentVisible(bool visible) { parent_visible_ = visible; } - void SetSelfVisible(bool v) { self_visible_ = v; } + virtual IntPoint Location() const = 0; virtual bool IsFrameView() const { return false; } virtual bool IsRemoteFrameView() const { return false; } - virtual bool IsPluginView() const { return false; } - virtual bool IsPluginContainer() const { return false; } - virtual bool IsScrollbar() const { return false; } - virtual void SetParent(FrameViewBase*); - FrameViewBase* Parent() const { return parent_; } - FrameViewBase* Root() const; + virtual void SetParent(FrameViewBase*) = 0; + virtual FrameViewBase* Parent() const = 0; - virtual void HandleEvent(Event*) {} + // TODO(joelhockey): Remove this from FrameViewBase once FrameView children + // use FrameOrPlugin rather than FrameViewBase. This method does not apply to + // scrollbars. + virtual void SetParentVisible(bool visible) {} // ConvertFromRootFrame must be in FrameViewBase rather than FrameView // to be visible to Scrollbar::ConvertFromRootFrame and // RemoteFrameView::UpdateRemoteViewportIntersection. The related // ConvertFromContainingFrameViewBase must be declared locally to be visible. - IntRect ConvertFromRootFrame(const IntRect&) const; - IntPoint ConvertFromRootFrame(const IntPoint&) const; - FloatPoint ConvertFromRootFrame(const FloatPoint&) const; + IntRect ConvertFromRootFrame(const IntRect& rect_in_root_frame) const { + if (const FrameViewBase* parent_frame_view_base = Parent()) { + IntRect parent_rect = + parent_frame_view_base->ConvertFromRootFrame(rect_in_root_frame); + return ConvertFromContainingFrameViewBase(parent_rect); + } + return rect_in_root_frame; + } + + IntPoint ConvertFromRootFrame(const IntPoint& point_in_root_frame) const { + if (const FrameViewBase* parent_frame_view_base = Parent()) { + IntPoint parent_point = + parent_frame_view_base->ConvertFromRootFrame(point_in_root_frame); + return ConvertFromContainingFrameViewBase(parent_point); + } + return point_in_root_frame; + } + + FloatPoint ConvertFromRootFrame(const FloatPoint& point_in_root_frame) const { + // FrameViewBase / windows are required to be IntPoint aligned, but we may + // need to convert FloatPoint values within them (eg. for event + // co-ordinates). + IntPoint floored_point = FlooredIntPoint(point_in_root_frame); + FloatPoint parent_point = ConvertFromRootFrame(floored_point); + FloatSize window_fraction = point_in_root_frame - floored_point; + // Use linear interpolation handle any fractional value (eg. for iframes + // subject to a transform beyond just a simple translation). + // FIXME: Add FloatPoint variants of all co-ordinate space conversion APIs. + if (!window_fraction.IsEmpty()) { + const int kFactor = 1000; + IntPoint parent_line_end = ConvertFromRootFrame( + floored_point + RoundedIntSize(window_fraction.ScaledBy(kFactor))); + FloatSize parent_fraction = + (parent_line_end - parent_point).ScaledBy(1.0f / kFactor); + parent_point.Move(parent_fraction); + } + return parent_point; + } + // TODO(joelhockey): Change all these to pure virtual functions // Once RemoteFrameView no longer inherits from FrameViewBase. virtual IntRect ConvertFromContainingFrameViewBase( @@ -109,21 +112,9 @@ return parent_point; } - virtual void FrameRectsChanged() {} + virtual void FrameRectsChanged() { NOTREACHED(); } - virtual void GeometryMayHaveChanged() {} - - // Notifies this frameviewbase that it will no longer be receiving events. - virtual void EventListenersRemoved() {} - - DECLARE_VIRTUAL_TRACE(); virtual void Dispose() {} - - private: - Member<FrameViewBase> parent_; - IntRect frame_rect_; - bool self_visible_; - bool parent_visible_; }; } // namespace blink
diff --git a/third_party/WebKit/Source/platform/SharedBuffer.cpp b/third_party/WebKit/Source/platform/SharedBuffer.cpp index 14ef841d..ab64898 100644 --- a/third_party/WebKit/Source/platform/SharedBuffer.cpp +++ b/third_party/WebKit/Source/platform/SharedBuffer.cpp
@@ -67,7 +67,7 @@ PassRefPtr<SharedBuffer> SharedBuffer::AdoptVector(Vector<char>& vector) { RefPtr<SharedBuffer> buffer = Create(); - buffer->buffer_.Swap(vector); + buffer->buffer_.swap(vector); buffer->size_ = buffer->buffer_.size(); return buffer.Release(); }
diff --git a/third_party/WebKit/Source/platform/fonts/ScriptRunIterator.cpp b/third_party/WebKit/Source/platform/fonts/ScriptRunIterator.cpp index 1e1a6f2..3478935 100644 --- a/third_party/WebKit/Source/platform/fonts/ScriptRunIterator.cpp +++ b/third_party/WebKit/Source/platform/fonts/ScriptRunIterator.cpp
@@ -326,7 +326,7 @@ *pos = ahead_pos_ - (ahead_character_ >= 0x10000 ? 2 : 1); *ch = ahead_character_; - next_set_.Swap(ahead_set_); + next_set_.swap(ahead_set_); if (ahead_pos_ == length_) { // No more data to fetch, but last character still needs to be // processed. Advance m_aheadPos so that next time we will know
diff --git a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp index 7a7a055..a4d09f3 100644 --- a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp +++ b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp
@@ -595,7 +595,7 @@ fallback_chars_hint)) { // Give up shaping since we cannot retrieve a font fallback // font without a hintlist. - range_data->holes_queue.Clear(); + range_data->holes_queue.clear(); break; }
diff --git a/third_party/WebKit/Source/platform/geometry/Region.cpp b/third_party/WebKit/Source/platform/geometry/Region.cpp index 1204ce0..05df6cf 100644 --- a/third_party/WebKit/Source/platform/geometry/Region.cpp +++ b/third_party/WebKit/Source/platform/geometry/Region.cpp
@@ -378,8 +378,8 @@ } void Region::Shape::Swap(Shape& other) { - segments_.Swap(other.segments_); - spans_.Swap(other.spans_); + segments_.swap(other.segments_); + spans_.swap(other.spans_); } enum {
diff --git a/third_party/WebKit/Source/platform/graphics/ContiguousContainer.cpp b/third_party/WebKit/Source/platform/graphics/ContiguousContainer.cpp index 688f54b..6472286 100644 --- a/third_party/WebKit/Source/platform/graphics/ContiguousContainer.cpp +++ b/third_party/WebKit/Source/platform/graphics/ContiguousContainer.cpp
@@ -152,8 +152,8 @@ } void ContiguousContainerBase::Swap(ContiguousContainerBase& other) { - elements_.Swap(other.elements_); - buffers_.Swap(other.buffers_); + elements_.swap(other.elements_); + buffers_.swap(other.buffers_); std::swap(end_index_, other.end_index_); std::swap(max_object_size_, other.max_object_size_); }
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayerDebugInfo.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsLayerDebugInfo.cpp index cccc616..4b3ef59 100644 --- a/third_party/WebKit/Source/platform/graphics/GraphicsLayerDebugInfo.cpp +++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayerDebugInfo.cpp
@@ -104,7 +104,7 @@ void GraphicsLayerDebugInfo::ClearAnnotatedInvalidateRects() { previous_invalidations_.clear(); - previous_invalidations_.Swap(invalidations_); + previous_invalidations_.swap(invalidations_); } void GraphicsLayerDebugInfo::AppendMainThreadScrollingReasons(
diff --git a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp index 83cf5e45..4f4e0b6e 100644 --- a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp +++ b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp
@@ -645,7 +645,7 @@ extra_data_for_testing_->content_layers.push_back(layer); } content_layer_clients_.clear(); - content_layer_clients_.Swap(new_content_layer_clients); + content_layer_clients_.swap(new_content_layer_clients); // Mark the property trees as having been rebuilt. layer_tree_host->property_trees()->sequence_number =
diff --git a/third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp b/third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp index 4b66b554..c9ede28 100644 --- a/third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp +++ b/third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp
@@ -204,7 +204,7 @@ return; is_hidden_ = hidden; if (is_hidden_) - recycled_color_buffer_queue_.Clear(); + recycled_color_buffer_queue_.clear(); } void DrawingBuffer::SetFilterQuality(SkFilterQuality filter_quality) { @@ -800,7 +800,7 @@ destruction_in_progress_ = true; ClearPlatformLayer(); - recycled_color_buffer_queue_.Clear(); + recycled_color_buffer_queue_.clear(); if (multisample_fbo_) gl_->DeleteFramebuffers(1, &multisample_fbo_); @@ -952,7 +952,7 @@ size_ = adjusted_size; // Free all mailboxes, because they are now of the wrong size. Only the // first call in this loop has any effect. - recycled_color_buffer_queue_.Clear(); + recycled_color_buffer_queue_.clear(); recycled_bitmaps_.clear(); if (adjusted_size.IsEmpty())
diff --git a/third_party/WebKit/Source/platform/graphics/gpu/SharedContextRateLimiter.cpp b/third_party/WebKit/Source/platform/graphics/gpu/SharedContextRateLimiter.cpp index 74974605..1ec5e51 100644 --- a/third_party/WebKit/Source/platform/graphics/gpu/SharedContextRateLimiter.cpp +++ b/third_party/WebKit/Source/platform/graphics/gpu/SharedContextRateLimiter.cpp
@@ -76,7 +76,7 @@ queries_.pop_front(); } } else { - queries_.Clear(); + queries_.clear(); } }
diff --git a/third_party/WebKit/Source/platform/graphics/paint/ClipDisplayItem.h b/third_party/WebKit/Source/platform/graphics/paint/ClipDisplayItem.h index 7cd25283..e2ac95b 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/ClipDisplayItem.h +++ b/third_party/WebKit/Source/platform/graphics/paint/ClipDisplayItem.h
@@ -29,7 +29,7 @@ const IntRect& clip_rect, Vector<FloatRoundedRect>& rounded_rect_clips) : ClipDisplayItem(client, type, clip_rect) { - rounded_rect_clips_.Swap(rounded_rect_clips); + rounded_rect_clips_.swap(rounded_rect_clips); } void Replay(GraphicsContext&) const override;
diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintChunker.cpp b/third_party/WebKit/Source/platform/graphics/paint/PaintChunker.cpp index 43f5760a..72f2cae 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/PaintChunker.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/PaintChunker.cpp
@@ -103,7 +103,7 @@ Vector<PaintChunk> PaintChunker::ReleasePaintChunks() { Vector<PaintChunk> chunks; - chunks.Swap(chunks_); + chunks.swap(chunks_); chunk_behavior_.clear(); current_chunk_id_ = WTF::kNullopt; current_properties_ = PaintChunkProperties();
diff --git a/third_party/WebKit/Source/platform/heap/HeapTest.cpp b/third_party/WebKit/Source/platform/heap/HeapTest.cpp index 8eaca73..622daf1 100644 --- a/third_party/WebKit/Source/platform/heap/HeapTest.cpp +++ b/third_party/WebKit/Source/platform/heap/HeapTest.cpp
@@ -2430,7 +2430,7 @@ vector1.push_back(one); vector2.push_back(two); - vector1.Swap(vector2); + vector1.swap(vector2); ConservativelyCollectGarbage(); EXPECT_TRUE(vector1.Contains(two)); EXPECT_TRUE(vector2.Contains(one)); @@ -2445,7 +2445,7 @@ vector2.push_back(four); vector2.push_back(five); vector2.push_back(six); - vector1.Swap(vector2); + vector1.swap(vector2); ConservativelyCollectGarbage(); EXPECT_TRUE(vector1.Contains(three)); EXPECT_TRUE(vector1.Contains(four)); @@ -2660,19 +2660,19 @@ EXPECT_EQ(3u, deque_uw2->size()); MemberVector& cvec = container->vector; - cvec.Swap(*vector.Get()); - vector2->Swap(cvec); - vector->Swap(cvec); + cvec.swap(*vector.Get()); + vector2->swap(cvec); + vector->swap(cvec); VectorWU& cvec_wu = container->vector_wu; - cvec_wu.Swap(*vector_wu.Get()); - vector_wu2->Swap(cvec_wu); - vector_wu->Swap(cvec_wu); + cvec_wu.swap(*vector_wu.Get()); + vector_wu2->swap(cvec_wu); + vector_wu->swap(cvec_wu); VectorUW& cvec_uw = container->vector_uw; - cvec_uw.Swap(*vector_uw.Get()); - vector_uw2->Swap(cvec_uw); - vector_uw->Swap(cvec_uw); + cvec_uw.swap(*vector_uw.Get()); + vector_uw2->swap(cvec_uw); + vector_uw->swap(cvec_uw); MemberDeque& c_deque = container->deque; c_deque.Swap(*deque.Get()); @@ -2859,7 +2859,7 @@ vector1.push_back(one); vector2.push_back(two); - vector1.Swap(vector2); + vector1.swap(vector2); ConservativelyCollectGarbage(); EXPECT_TRUE(vector1.Contains(two)); EXPECT_TRUE(vector2.Contains(one)); @@ -2874,7 +2874,7 @@ vector2.push_back(four); vector2.push_back(five); vector2.push_back(six); - vector1.Swap(vector2); + vector1.swap(vector2); ConservativelyCollectGarbage(); EXPECT_TRUE(vector1.Contains(three)); EXPECT_TRUE(vector1.Contains(four)); @@ -2925,7 +2925,7 @@ vector1.push_back(one); vector2.push_back(two); - vector1.Swap(vector2); + vector1.swap(vector2); ConservativelyCollectGarbage(); EXPECT_TRUE(vector1.Contains(two)); EXPECT_TRUE(vector2.Contains(one)); @@ -2940,7 +2940,7 @@ vector2.push_back(four); vector2.push_back(five); vector2.push_back(six); - vector1.Swap(vector2); + vector1.swap(vector2); ConservativelyCollectGarbage(); EXPECT_TRUE(vector1.Contains(three)); EXPECT_TRUE(vector1.Contains(four)); @@ -4049,7 +4049,7 @@ p_deque.push_back(two); Vec* vec = new Vec(); - vec->Swap(p_vec); + vec->swap(p_vec); p_vec.push_back(two); p_vec.push_back(three);
diff --git a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp index 79efbd9c..0554a74b 100644 --- a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp +++ b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
@@ -669,7 +669,7 @@ void ResourceFetcher::ResourceTimingReportTimerFired(TimerBase* timer) { DCHECK_EQ(timer, &resource_timing_report_timer_); Vector<RefPtr<ResourceTimingInfo>> timing_reports; - timing_reports.Swap(scheduled_resource_timing_reports_); + timing_reports.swap(scheduled_resource_timing_reports_); for (const auto& timing_info : timing_reports) Context().AddResourceTiming(*timing_info); }
diff --git a/third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.cc b/third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.cc index c154552..e010806 100644 --- a/third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.cc +++ b/third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.cc
@@ -188,7 +188,7 @@ any_thread().observer = nullptr; main_thread_only().observer = nullptr; main_thread_only().delayed_incoming_queue = std::priority_queue<Task>(); - immediate_incoming_queue().Clear(); + immediate_incoming_queue().clear(); main_thread_only().immediate_work_queue.reset(); main_thread_only().delayed_work_queue.reset(); }
diff --git a/third_party/WebKit/Source/platform/text/SegmentedString.cpp b/third_party/WebKit/Source/platform/text/SegmentedString.cpp index cd2507a..ce5297d 100644 --- a/third_party/WebKit/Source/platform/text/SegmentedString.cpp +++ b/third_party/WebKit/Source/platform/text/SegmentedString.cpp
@@ -48,7 +48,7 @@ number_of_characters_consumed_prior_to_current_string_ = 0; number_of_characters_consumed_prior_to_current_line_ = 0; current_line_ = 0; - substrings_.Clear(); + substrings_.clear(); closed_ = false; empty_ = true; fast_path_flags_ = kNoFastPath;
diff --git a/third_party/WebKit/Source/platform/wtf/Deque.h b/third_party/WebKit/Source/platform/wtf/Deque.h index d6e3fbc..337a045 100644 --- a/third_party/WebKit/Source/platform/wtf/Deque.h +++ b/third_party/WebKit/Source/platform/wtf/Deque.h
@@ -140,7 +140,7 @@ template <typename... Args> void emplace_front(Args&&...); - void Clear(); + void clear(); template <typename VisitorDispatcher> void Trace(VisitorDispatcher); @@ -412,7 +412,7 @@ } template <typename T, size_t inlineCapacity, typename Allocator> -inline void Deque<T, inlineCapacity, Allocator>::Clear() { +inline void Deque<T, inlineCapacity, Allocator>::clear() { DestroyAll(); start_ = 0; end_ = 0;
diff --git a/third_party/WebKit/Source/platform/wtf/DequeTest.cpp b/third_party/WebKit/Source/platform/wtf/DequeTest.cpp index 451c132..b63cd592 100644 --- a/third_party/WebKit/Source/platform/wtf/DequeTest.cpp +++ b/third_party/WebKit/Source/platform/wtf/DequeTest.cpp
@@ -233,7 +233,7 @@ EXPECT_EQ(count, copy_deque.size()); EXPECT_EQ(0u, deque.size()); - copy_deque.Clear(); + copy_deque.clear(); EXPECT_EQ(count, static_cast<size_t>(destruct_number)); } @@ -402,8 +402,8 @@ for (unsigned j = i; j < 12; j++) { if (!InterestingNumber(j)) continue; - deque.Clear(); - deque2.Clear(); + deque.clear(); + deque2.clear(); EXPECT_EQ(0u, LivenessCounter::live_); for (unsigned k = 0; k < j; k++) deque.push_back(&counter); @@ -473,8 +473,8 @@ for (unsigned size2 = 0; size2 < 12; size2++) { if (!InterestingNumber(size2)) continue; - deque.Clear(); - deque2.Clear(); + deque.clear(); + deque2.clear(); for (unsigned i = 0; i < pad; i++) deque.push_back(103); for (unsigned i = 0; i < pad2; i++) @@ -534,7 +534,7 @@ ASSERT_EQ(1u, deque.size()); EXPECT_EQ(24, *deque[0]); - deque.Clear(); + deque.clear(); } class CountCopy final {
diff --git a/third_party/WebKit/Source/platform/wtf/HashCountedSet.h b/third_party/WebKit/Source/platform/wtf/HashCountedSet.h index 47b2e8c..bd9fc91d 100644 --- a/third_party/WebKit/Source/platform/wtf/HashCountedSet.h +++ b/third_party/WebKit/Source/platform/wtf/HashCountedSet.h
@@ -66,7 +66,7 @@ void swap(HashCountedSet& other) { impl_.swap(other.impl_); } unsigned size() const { return impl_.size(); } - unsigned capacity() const { return impl_.capacity(); } + unsigned Capacity() const { return impl_.capacity(); } bool IsEmpty() const { return impl_.IsEmpty(); } // Iterators iterate over pairs of values (called key) and counts (called
diff --git a/third_party/WebKit/Source/platform/wtf/HashMap.h b/third_party/WebKit/Source/platform/wtf/HashMap.h index 378e2a8b..7e04b1d 100644 --- a/third_party/WebKit/Source/platform/wtf/HashMap.h +++ b/third_party/WebKit/Source/platform/wtf/HashMap.h
@@ -182,7 +182,7 @@ template <typename HashTranslator, typename IncomingKeyType, typename IncomingMappedType> - AddResult insert(IncomingKeyType&&, IncomingMappedType&&); + AddResult Insert(IncomingKeyType&&, IncomingMappedType&&); static bool IsValidKey(KeyPeekInType); @@ -561,7 +561,7 @@ template <typename HashTranslator, typename IncomingKeyType, typename IncomingMappedType> -auto HashMap<T, U, V, W, X, Y>::insert(IncomingKeyType&& key, +auto HashMap<T, U, V, W, X, Y>::Insert(IncomingKeyType&& key, IncomingMappedType&& mapped) -> AddResult { return impl_.template AddPassingHashCode<
diff --git a/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h b/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h index 8fdcad30..eedd9f2 100644 --- a/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h +++ b/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h
@@ -243,8 +243,8 @@ const Value& back() const; void pop_back(); - iterator Find(ValuePeekInType); - const_iterator Find(ValuePeekInType) const; + iterator find(ValuePeekInType); + const_iterator find(ValuePeekInType) const; bool Contains(ValuePeekInType) const; // An alternate version of find() that finds the object by hashing and @@ -735,7 +735,7 @@ template <typename T, typename U, typename V, typename W> inline typename LinkedHashSet<T, U, V, W>::iterator -LinkedHashSet<T, U, V, W>::Find(ValuePeekInType value) { +LinkedHashSet<T, U, V, W>::find(ValuePeekInType value) { LinkedHashSet::Node* node = impl_.template Lookup<LinkedHashSet::NodeHashFunctions, ValuePeekInType>( value); @@ -746,7 +746,7 @@ template <typename T, typename U, typename V, typename W> inline typename LinkedHashSet<T, U, V, W>::const_iterator -LinkedHashSet<T, U, V, W>::Find(ValuePeekInType value) const { +LinkedHashSet<T, U, V, W>::find(ValuePeekInType value) const { const LinkedHashSet::Node* node = impl_.template Lookup<LinkedHashSet::NodeHashFunctions, ValuePeekInType>( value); @@ -861,7 +861,7 @@ typename LinkedHashSet<T, U, V, W>::AddResult LinkedHashSet<T, U, V, W>::InsertBefore(ValuePeekInType before_value, IncomingValueType&& new_value) { - return InsertBefore(Find(before_value), + return InsertBefore(find(before_value), std::forward<IncomingValueType>(new_value)); } @@ -874,7 +874,7 @@ template <typename T, typename U, typename V, typename W> inline void LinkedHashSet<T, U, V, W>::erase(ValuePeekInType value) { - erase(Find(value)); + erase(find(value)); } inline void SwapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) {
diff --git a/third_party/WebKit/Source/platform/wtf/ListHashSet.h b/third_party/WebKit/Source/platform/wtf/ListHashSet.h index e99da9e..7ee4ad2 100644 --- a/third_party/WebKit/Source/platform/wtf/ListHashSet.h +++ b/third_party/WebKit/Source/platform/wtf/ListHashSet.h
@@ -173,8 +173,8 @@ const ValueType& back() const; void pop_back(); - iterator Find(ValuePeekInType); - const_iterator Find(ValuePeekInType) const; + iterator find(ValuePeekInType); + const_iterator find(ValuePeekInType) const; bool Contains(ValuePeekInType) const; // An alternate version of find() that finds the object by hashing and @@ -214,7 +214,7 @@ template <typename IncomingValueType> AddResult InsertBefore(iterator, IncomingValueType&&); - void erase(ValuePeekInType value) { return erase(Find(value)); } + void erase(ValuePeekInType value) { return erase(find(value)); } void erase(iterator); void clear(); template <typename Collection> @@ -850,7 +850,7 @@ template <typename T, size_t inlineCapacity, typename U, typename V> inline typename ListHashSet<T, inlineCapacity, U, V>::iterator -ListHashSet<T, inlineCapacity, U, V>::Find(ValuePeekInType value) { +ListHashSet<T, inlineCapacity, U, V>::find(ValuePeekInType value) { ImplTypeIterator it = impl_.template Find<BaseTranslator>(value); if (it == impl_.end()) return end(); @@ -859,7 +859,7 @@ template <typename T, size_t inlineCapacity, typename U, typename V> inline typename ListHashSet<T, inlineCapacity, U, V>::const_iterator -ListHashSet<T, inlineCapacity, U, V>::Find(ValuePeekInType value) const { +ListHashSet<T, inlineCapacity, U, V>::find(ValuePeekInType value) const { ImplTypeConstIterator it = impl_.template Find<BaseTranslator>(value); if (it == impl_.end()) return end(); @@ -990,7 +990,7 @@ ValuePeekInType before_value, IncomingValueType&& new_value) { CreateAllocatorIfNeeded(); - return InsertBefore(Find(before_value), + return InsertBefore(find(before_value), std::forward<IncomingValueType>(new_value)); } @@ -1025,7 +1025,7 @@ template <typename T, size_t inlineCapacity, typename U, typename V> auto ListHashSet<T, inlineCapacity, U, V>::Take(ValuePeekInType value) -> ValueType { - return Take(Find(value)); + return Take(find(value)); } template <typename T, size_t inlineCapacity, typename U, typename V>
diff --git a/third_party/WebKit/Source/platform/wtf/ListHashSetTest.cpp b/third_party/WebKit/Source/platform/wtf/ListHashSetTest.cpp index 9f8cb6b..9e42616b 100644 --- a/third_party/WebKit/Source/platform/wtf/ListHashSetTest.cpp +++ b/third_party/WebKit/Source/platform/wtf/ListHashSetTest.cpp
@@ -206,7 +206,7 @@ { const Set& ref = set; - typename Set::const_iterator it = ref.Find(2); + typename Set::const_iterator it = ref.find(2); EXPECT_EQ(2, *it); ++it; EXPECT_EQ(3, *it); @@ -216,7 +216,7 @@ } { Set& ref = set; - typename Set::iterator it = ref.Find(2); + typename Set::iterator it = ref.find(2); EXPECT_EQ(2, *it); ++it; EXPECT_EQ(3, *it); @@ -236,11 +236,11 @@ set.insert(2); set.insert(3); - typename Set::iterator it = set.Find(2); + typename Set::iterator it = set.find(2); EXPECT_EQ(2, *it); set.InsertBefore(it, 1); if (!can_modify_while_iterating) - it = set.Find(2); + it = set.find(2); ++it; EXPECT_EQ(3, *it); EXPECT_EQ(5u, set.size()); @@ -267,7 +267,7 @@ set.InsertBefore(-1, 103); EXPECT_EQ(103, set.front()); if (!can_modify_while_iterating) - it = set.Find(1); + it = set.find(1); ++it; EXPECT_EQ(42, *it); EXPECT_EQ(7u, set.size()); @@ -440,9 +440,9 @@ typename Set::AddResult add_result = set.insert(ptr); EXPECT_TRUE(add_result.is_new_entry); - set.Find(ptr); + set.find(ptr); const Set& const_set(set); - const_set.Find(ptr); + const_set.find(ptr); EXPECT_TRUE(set.Contains(ptr)); typename Set::iterator it = set.AddReturnIterator(ptr); set.AppendOrMoveToLast(ptr); @@ -559,7 +559,7 @@ EXPECT_FALSE(deleted1); EXPECT_EQ(1UL, set.size()); - OwnPtrSet::iterator it1 = set.Find(ptr1); + OwnPtrSet::iterator it1 = set.find(ptr1); EXPECT_NE(set.end(), it1); EXPECT_EQ(ptr1, (*it1).get()); @@ -571,7 +571,7 @@ EXPECT_FALSE(deleted2); EXPECT_EQ(2UL, set.size()); - OwnPtrSet::iterator it2 = set.Find(ptr2); + OwnPtrSet::iterator it2 = set.find(ptr2); EXPECT_NE(set.end(), it2); EXPECT_EQ(ptr2, (*it2).get()); @@ -768,12 +768,12 @@ EXPECT_EQ(1, add_result.stored_value->Value()); EXPECT_EQ(1, add_result.stored_value->Id()); } - auto iter = set.Find(MoveOnly(1)); + auto iter = set.find(MoveOnly(1)); ASSERT_TRUE(iter != set.end()); EXPECT_EQ(1, iter->Value()); EXPECT_EQ(1, iter->Id()); - iter = set.Find(MoveOnly(2)); + iter = set.find(MoveOnly(2)); EXPECT_TRUE(iter == set.end()); // ListHashSet and LinkedHashSet have several flavors of add(). @@ -804,7 +804,7 @@ EXPECT_EQ(5, add_result.stored_value->Id()); } { - iter = set.Find(MoveOnly(5)); + iter = set.find(MoveOnly(5)); ASSERT_TRUE(iter != set.end()); AddResult add_result = set.InsertBefore(iter, MoveOnly(6, 6)); EXPECT_TRUE(add_result.is_new_entry);
diff --git a/third_party/WebKit/Source/platform/wtf/Vector.h b/third_party/WebKit/Source/platform/wtf/Vector.h index 8b0377b..ff17efd3 100644 --- a/third_party/WebKit/Source/platform/wtf/Vector.h +++ b/third_party/WebKit/Source/platform/wtf/Vector.h
@@ -1196,7 +1196,7 @@ void Fill(const T& val) { Fill(val, size()); } // Swap two vectors quickly. - void Swap(Vector& other) { + void swap(Vector& other) { Base::SwapVectorBuffer(other, OffsetRange(), OffsetRange()); } @@ -1405,13 +1405,13 @@ size_ = 0; // It's a little weird to implement a move constructor using swap but this // way we don't have to add a move constructor to VectorBuffer. - Swap(other); + swap(other); } template <typename T, size_t inlineCapacity, typename Allocator> Vector<T, inlineCapacity, Allocator>& Vector<T, inlineCapacity, Allocator>:: operator=(Vector<T, inlineCapacity, Allocator>&& other) { - Swap(other); + swap(other); return *this; }
diff --git a/third_party/WebKit/Source/platform/wtf/VectorTest.cpp b/third_party/WebKit/Source/platform/wtf/VectorTest.cpp index aadaa94..4c1b8c88 100644 --- a/third_party/WebKit/Source/platform/wtf/VectorTest.cpp +++ b/third_party/WebKit/Source/platform/wtf/VectorTest.cpp
@@ -213,7 +213,7 @@ EXPECT_EQ(count, vector.size()); OwnPtrVector copy_vector; - vector.Swap(copy_vector); + vector.swap(copy_vector); EXPECT_EQ(0, destruct_number); EXPECT_EQ(count, copy_vector.size()); EXPECT_EQ(0u, vector.size()); @@ -272,7 +272,7 @@ EXPECT_EQ(static_cast<int>(i + 1), vector[i].Value()); WTF::Vector<MoveOnly> other_vector; - vector.Swap(other_vector); + vector.swap(other_vector); EXPECT_EQ(count, other_vector.size()); EXPECT_EQ(0u, vector.size()); @@ -318,7 +318,7 @@ vector_b.push_back(WrappedInt(2)); EXPECT_EQ(vector_a.size(), vector_b.size()); - vector_a.Swap(vector_b); + vector_a.swap(vector_b); EXPECT_EQ(1u, vector_a.size()); EXPECT_EQ(2, vector_a.at(0).Get()); @@ -328,7 +328,7 @@ vector_a.push_back(WrappedInt(3)); EXPECT_GT(vector_a.size(), vector_b.size()); - vector_a.Swap(vector_b); + vector_a.swap(vector_b); EXPECT_EQ(1u, vector_a.size()); EXPECT_EQ(1, vector_a.at(0).Get()); @@ -337,7 +337,7 @@ EXPECT_EQ(3, vector_b.at(1).Get()); EXPECT_LT(vector_a.size(), vector_b.size()); - vector_a.Swap(vector_b); + vector_a.swap(vector_b); EXPECT_EQ(2u, vector_a.size()); EXPECT_EQ(2, vector_a.at(0).Get()); @@ -347,7 +347,7 @@ vector_a.push_back(WrappedInt(4)); EXPECT_GT(vector_a.size(), kInlineCapacity); - vector_a.Swap(vector_b); + vector_a.swap(vector_b); EXPECT_EQ(1u, vector_a.size()); EXPECT_EQ(1, vector_a.at(0).Get()); @@ -356,7 +356,7 @@ EXPECT_EQ(3, vector_b.at(1).Get()); EXPECT_EQ(4, vector_b.at(2).Get()); - vector_b.Swap(vector_a); + vector_b.swap(vector_a); } #if defined(ANNOTATE_CONTIGUOUS_CONTAINER) @@ -385,7 +385,7 @@ volatile int* int_pointer_c = vector_c.data(); EXPECT_DEATH((void)int_pointer_c[2], "container-overflow"); vector_c.push_back(13); - vector_c.Swap(vector_b); + vector_c.swap(vector_b); volatile int* int_pointer_b2 = vector_b.data(); volatile int* int_pointer_c2 = vector_c.data(); @@ -506,7 +506,7 @@ EXPECT_EQ(i + j, LivenessCounter::live_); EXPECT_EQ(i, vector2.size()); - vector.Swap(vector2); + vector.swap(vector2); EXPECT_EQ(i + j, LivenessCounter::live_); EXPECT_EQ(i, vector.size()); EXPECT_EQ(j, vector2.size()); @@ -515,7 +515,7 @@ unsigned size2 = vector2.size(); for (unsigned k = 0; k < 5; k++) { - vector.Swap(vector2); + vector.swap(vector2); std::swap(size, size2); EXPECT_EQ(i + j, LivenessCounter::live_); EXPECT_EQ(size, vector.size()); @@ -549,7 +549,7 @@ vector2.push_back(i + 42); EXPECT_EQ(size, vector.size()); EXPECT_EQ(size2, vector2.size()); - vector.Swap(vector2); + vector.swap(vector2); for (unsigned i = 0; i < size; i++) EXPECT_EQ(i, vector2[i]); for (unsigned i = 0; i < size2; i++)
diff --git a/third_party/WebKit/Source/platform/wtf/text/StringBuilder.cpp b/third_party/WebKit/Source/platform/wtf/text/StringBuilder.cpp index d5d3efb..992e7d7 100644 --- a/third_party/WebKit/Source/platform/wtf/text/StringBuilder.cpp +++ b/third_party/WebKit/Source/platform/wtf/text/StringBuilder.cpp
@@ -144,7 +144,7 @@ Buffer8 buffer8; unsigned length = length_; if (buffer8_) { - buffer8_->Swap(buffer8); + buffer8_->swap(buffer8); delete buffer8_; } buffer16_ = new Buffer16;
diff --git a/third_party/WebKit/Source/web/ExternalPopupMenuTest.cpp b/third_party/WebKit/Source/web/ExternalPopupMenuTest.cpp index ca43dee9..730c101d 100644 --- a/third_party/WebKit/Source/web/ExternalPopupMenuTest.cpp +++ b/third_party/WebKit/Source/web/ExternalPopupMenuTest.cpp
@@ -146,7 +146,7 @@ WebView()->UpdateAllLifecyclePhases(); HTMLSelectElement* select = toHTMLSelectElement( - MainFrame()->GetFrame()->GetDocument()->GetElementById("select")); + MainFrame()->GetFrame()->GetDocument()->getElementById("select")); LayoutMenuList* menu_list = ToLayoutMenuList(select->GetLayoutObject()); ASSERT_TRUE(menu_list); @@ -175,7 +175,7 @@ LoadFrame("select.html"); HTMLSelectElement* select = toHTMLSelectElement( - MainFrame()->GetFrame()->GetDocument()->GetElementById("select")); + MainFrame()->GetFrame()->GetDocument()->getElementById("select")); LayoutMenuList* menu_list = ToLayoutMenuList(select->GetLayoutObject()); ASSERT_TRUE(menu_list); @@ -195,7 +195,7 @@ LoadFrame("select.html"); HTMLSelectElement* select = toHTMLSelectElement( - MainFrame()->GetFrame()->GetDocument()->GetElementById("select")); + MainFrame()->GetFrame()->GetDocument()->getElementById("select")); LayoutMenuList* menu_list = ToLayoutMenuList(select->GetLayoutObject()); ASSERT_TRUE(menu_list); @@ -217,7 +217,7 @@ LoadFrame("select.html"); HTMLSelectElement* select = toHTMLSelectElement( - MainFrame()->GetFrame()->GetDocument()->GetElementById("select")); + MainFrame()->GetFrame()->GetDocument()->getElementById("select")); LayoutMenuList* menu_list = ToLayoutMenuList(select->GetLayoutObject()); ASSERT_TRUE(menu_list);
diff --git a/third_party/WebKit/Source/web/TextFinder.cpp b/third_party/WebKit/Source/web/TextFinder.cpp index 428fbca..3229024 100644 --- a/third_party/WebKit/Source/web/TextFinder.cpp +++ b/third_party/WebKit/Source/web/TextFinder.cpp
@@ -555,7 +555,7 @@ filtered_matches.push_back(match); } - find_matches_cache_.Swap(filtered_matches); + find_matches_cache_.swap(filtered_matches); } // Invalidate the rects in child frames. Will be updated later during
diff --git a/third_party/WebKit/Source/web/WebDocument.cpp b/third_party/WebKit/Source/web/WebDocument.cpp index bef735d..4928988 100644 --- a/third_party/WebKit/Source/web/WebDocument.cpp +++ b/third_party/WebKit/Source/web/WebDocument.cpp
@@ -175,7 +175,7 @@ } WebElement WebDocument::GetElementById(const WebString& id) const { - return WebElement(ConstUnwrap<Document>()->GetElementById(id)); + return WebElement(ConstUnwrap<Document>()->getElementById(id)); } WebElement WebDocument::FocusedElement() const {
diff --git a/third_party/WebKit/Source/web/WebElementTest.cpp b/third_party/WebKit/Source/web/WebElementTest.cpp index bf4bf2c..71df77ea 100644 --- a/third_party/WebKit/Source/web/WebElementTest.cpp +++ b/third_party/WebKit/Source/web/WebElementTest.cpp
@@ -77,7 +77,7 @@ } WebElement WebElementTest::TestElement() { - Element* element = GetDocument().GetElementById("testElement"); + Element* element = GetDocument().getElementById("testElement"); DCHECK(element); return WebElement(element); } @@ -114,7 +114,7 @@ InsertHTML(kEmptyBlock); ShadowRoot* root = GetDocument() - .GetElementById("testElement") + .getElementById("testElement") ->CreateShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION); root->setInnerHTML("<div>Hello World</div>"); EXPECT_TRUE(TestElement().HasNonEmptyLayoutSize());
diff --git a/third_party/WebKit/Source/web/WebInputEventConversion.cpp b/third_party/WebKit/Source/web/WebInputEventConversion.cpp index b3007436..ea80580 100644 --- a/third_party/WebKit/Source/web/WebInputEventConversion.cpp +++ b/third_party/WebKit/Source/web/WebInputEventConversion.cpp
@@ -51,7 +51,7 @@ float FrameScale(const FrameView* frame_view) { float scale = 1; if (frame_view) { - FrameView* root_view = ToFrameView(frame_view->Root()); + FrameView* root_view = frame_view->Root(); if (root_view) scale = root_view->InputEventsScaleFactor(); } @@ -64,7 +64,7 @@ IntPoint visual_viewport; FloatSize overscroll_offset; if (frame_view) { - FrameView* root_view = ToFrameView(frame_view->Root()); + FrameView* root_view = frame_view->Root(); if (root_view) { scale = root_view->InputEventsScaleFactor(); offset = FloatSize(root_view->InputEventsOffsetForEmulation());
diff --git a/third_party/WebKit/Source/web/tests/AnimationSimTest.cpp b/third_party/WebKit/Source/web/tests/AnimationSimTest.cpp index 7806501..062539c 100644 --- a/third_party/WebKit/Source/web/tests/AnimationSimTest.cpp +++ b/third_party/WebKit/Source/web/tests/AnimationSimTest.cpp
@@ -39,7 +39,7 @@ LoadURL("https://example.com/"); main_resource.Complete("<div id=\"target\"></div>"); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); // CSS.registerProperty({ // name: '--x',
diff --git a/third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp b/third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp index f738387..c839bbbe 100644 --- a/third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp +++ b/third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp
@@ -159,11 +159,11 @@ Document* document = GetFrame()->GetDocument(); - Element* tall_element = document->GetElementById("tall"); + Element* tall_element = document->getElementById("tall"); WebLayer* tall_layer = WebLayerFromElement(tall_element); EXPECT_TRUE(!tall_layer); - Element* proxied_element = document->GetElementById("proxied-transform"); + Element* proxied_element = document->getElementById("proxied-transform"); WebLayer* proxied_layer = WebLayerFromElement(proxied_element); EXPECT_TRUE(proxied_layer->CompositorMutableProperties() & CompositorMutableProperty::kTransform); @@ -173,7 +173,7 @@ CompositorMutableProperty::kOpacity)); EXPECT_TRUE(proxied_layer->GetElementId()); - Element* scroll_element = document->GetElementById("proxied-scroller"); + Element* scroll_element = document->getElementById("proxied-scroller"); WebLayer* scroll_layer = ScrollingWebLayerFromElement(scroll_element); EXPECT_TRUE(scroll_layer->CompositorMutableProperties() & (CompositorMutableProperty::kScrollLeft | @@ -204,11 +204,11 @@ Document* document = GetFrame()->GetDocument(); - Element* tall_element = document->GetElementById("tall"); + Element* tall_element = document->getElementById("tall"); WebLayer* tall_layer = WebLayerFromElement(tall_element); EXPECT_TRUE(!tall_layer); - Element* proxied_element = document->GetElementById("proxied"); + Element* proxied_element = document->getElementById("proxied"); WebLayer* proxied_layer = WebLayerFromElement(proxied_element); EXPECT_TRUE(!proxied_layer); @@ -216,7 +216,7 @@ // element has a corresponding compositor proxy. Element ids (which are also // used by animations) do not have this implication, so we do not check for // them here. - Element* scroll_element = document->GetElementById("proxied-scroller"); + Element* scroll_element = document->getElementById("proxied-scroller"); WebLayer* scroll_layer = ScrollingWebLayerFromElement(scroll_element); EXPECT_FALSE(!!scroll_layer->CompositorMutableProperties()); @@ -235,15 +235,15 @@ Document* document = GetFrame()->GetDocument(); - Element* tall_element = document->GetElementById("tall"); + Element* tall_element = document->getElementById("tall"); WebLayer* tall_layer = WebLayerFromElement(tall_element); EXPECT_TRUE(!tall_layer); - Element* proxied_element = document->GetElementById("proxied"); + Element* proxied_element = document->getElementById("proxied"); WebLayer* proxied_layer = WebLayerFromElement(proxied_element); EXPECT_TRUE(!proxied_layer); - Element* scroll_element = document->GetElementById("proxied-scroller"); + Element* scroll_element = document->getElementById("proxied-scroller"); WebLayer* scroll_layer = ScrollingWebLayerFromElement(scroll_element); EXPECT_FALSE(!!scroll_layer->CompositorMutableProperties()); @@ -260,7 +260,7 @@ { ForceFullCompositingUpdate(); - Element* proxied_element = document->GetElementById("proxied-transform"); + Element* proxied_element = document->getElementById("proxied-transform"); WebLayer* proxied_layer = WebLayerFromElement(proxied_element); EXPECT_TRUE(proxied_layer->CompositorMutableProperties() & CompositorMutableProperty::kTransform); @@ -288,7 +288,7 @@ css_value); } { - Element* proxied_element = document->GetElementById("proxied-opacity"); + Element* proxied_element = document->getElementById("proxied-opacity"); WebLayer* proxied_layer = WebLayerFromElement(proxied_element); EXPECT_TRUE(proxied_layer->CompositorMutableProperties() & CompositorMutableProperty::kOpacity); @@ -321,7 +321,7 @@ ForceFullCompositingUpdate(); Element* proxied_element = - document->GetElementById("proxied-transform-and-opacity"); + document->getElementById("proxied-transform-and-opacity"); WebLayer* proxied_layer = WebLayerFromElement(proxied_element); EXPECT_TRUE(proxied_layer->CompositorMutableProperties() & CompositorMutableProperty::kTransform);
diff --git a/third_party/WebKit/Source/web/tests/DocumentLoadingRenderingTest.cpp b/third_party/WebKit/Source/web/tests/DocumentLoadingRenderingTest.cpp index a5d7619..ed03f10 100644 --- a/third_party/WebKit/Source/web/tests/DocumentLoadingRenderingTest.cpp +++ b/third_party/WebKit/Source/web/tests/DocumentLoadingRenderingTest.cpp
@@ -216,7 +216,7 @@ Compositor().BeginFrame(); // Replace the stylesheet by changing href. - auto* element = GetDocument().GetElementById("link"); + auto* element = GetDocument().getElementById("link"); EXPECT_NE(nullptr, element); element->setAttribute(hrefAttr, "second.css"); EXPECT_FALSE(Compositor().NeedsBeginFrame()); @@ -260,7 +260,7 @@ // this by doing offsetTop in a setTimeout, or by a parent frame executing // script that touched offsetTop in the child frame. auto* child_frame = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); child_frame->contentDocument() ->UpdateStyleAndLayoutIgnorePendingStylesheets(); @@ -320,7 +320,7 @@ "<body style='background: blue'>"); auto* child_frame = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); // Frame while the child frame still has pending sheets. auto* frame1_callback = new CheckRafCallback(); @@ -410,7 +410,7 @@ EXPECT_FALSE(GetDocument().IsRenderingReady()); // If ignoringPendingStylesheets==true, element should get non-empty rect. - Element* element = GetDocument().GetElementById("test"); + Element* element = GetDocument().getElementById("test"); ClientRect* rect = element->getBoundingClientRect(); EXPECT_TRUE(rect->width() > 0.f); EXPECT_TRUE(rect->height() > 0.f);
diff --git a/third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp b/third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp index 8a831b9..e2a4891e 100644 --- a/third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp +++ b/third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp
@@ -106,7 +106,7 @@ main_resource.Complete("<iframe sandbox id=frame></iframe>"); auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); auto* frame_document = frame_element->contentDocument(); // Initially both frames are visible. @@ -136,11 +136,11 @@ frame_resource.Complete("<iframe id=innerFrame></iframe>"); auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); auto* frame_document = frame_element->contentDocument(); HTMLIFrameElement* inner_frame_element = - toHTMLIFrameElement(frame_document->GetElementById("innerFrame")); + toHTMLIFrameElement(frame_document->getElementById("innerFrame")); auto* inner_frame_document = inner_frame_element->contentDocument(); EXPECT_FALSE(GetDocument().View()->CanThrottleRendering()); @@ -165,11 +165,11 @@ frame_resource.Complete("<iframe id=innerFrame sandbox></iframe>"); auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); auto* frame_document = frame_element->contentDocument(); auto* inner_frame_element = - toHTMLIFrameElement(frame_document->GetElementById("innerFrame")); + toHTMLIFrameElement(frame_document->getElementById("innerFrame")); auto* inner_frame_document = inner_frame_element->contentDocument(); EXPECT_FALSE(GetDocument().View()->CanThrottleRendering()); @@ -195,11 +195,11 @@ "<iframe id=innerFrame width=0 height=0 sandbox></iframe>"); auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); auto* frame_document = frame_element->contentDocument(); auto* inner_frame_element = - toHTMLIFrameElement(frame_document->GetElementById("innerFrame")); + toHTMLIFrameElement(frame_document->getElementById("innerFrame")); auto* inner_frame_document = inner_frame_element->contentDocument(); EXPECT_FALSE(GetDocument().View()->CanThrottleRendering()); @@ -221,7 +221,7 @@ main_resource.Complete("<iframe sandbox id=frame></iframe>"); auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); auto* frame_document = frame_element->contentDocument(); // Enable throttling for the child frame. @@ -254,7 +254,7 @@ main_resource.Complete("<iframe sandbox id=frame></iframe>"); auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); // First make the child hidden to enable throttling. frame_element->setAttribute(styleAttr, "transform: translateY(480px)"); @@ -281,7 +281,7 @@ EXPECT_TRUE(display_items1.Contains(SimCanvas::kRect, "red")); auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); // Move the frame offscreen to throttle it. frame_element->setAttribute(styleAttr, "transform: translateY(480px)"); @@ -319,13 +319,13 @@ frame_resource.Complete("<div id=div></div>"); auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); frame_element->setAttribute(styleAttr, "transform: translateY(480px)"); CompositeFrame(); // Change the size of a div in the throttled frame. - auto* div_element = frame_element->contentDocument()->GetElementById("div"); + auto* div_element = frame_element->contentDocument()->getElementById("div"); div_element->setAttribute(styleAttr, "width: 50px"); // Querying the width of the div should do a synchronous layout update even @@ -344,7 +344,7 @@ // Move the frame offscreen to throttle it. auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); frame_element->setAttribute(styleAttr, "transform: translateY(480px)"); EXPECT_FALSE( frame_element->contentDocument()->View()->CanThrottleRendering()); @@ -385,7 +385,7 @@ // Move the frame offscreen to throttle it. auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); frame_element->setAttribute(styleAttr, "transform: translateY(480px)"); EXPECT_FALSE( frame_element->contentDocument()->View()->CanThrottleRendering()); @@ -418,7 +418,7 @@ // Move the frame offscreen to throttle it. auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); frame_element->setAttribute(styleAttr, "transform: translateY(480px)"); EXPECT_FALSE( frame_element->contentDocument()->View()->CanThrottleRendering()); @@ -455,7 +455,7 @@ frame_resource.Complete(""); auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); CompositeFrame(); @@ -506,7 +506,7 @@ // Move the frame offscreen to throttle it. auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); frame_element->setAttribute(styleAttr, "transform: translateY(480px)"); EXPECT_FALSE( frame_element->contentDocument()->View()->CanThrottleRendering()); @@ -538,7 +538,7 @@ // Move the frame offscreen to throttle it. auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); frame_element->setAttribute(styleAttr, "transform: translateY(480px)"); EXPECT_FALSE( frame_element->contentDocument()->View()->CanThrottleRendering()); @@ -607,7 +607,7 @@ // Move the frame offscreen to throttle it. auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); frame_element->setAttribute(styleAttr, "transform: translateY(480px)"); EXPECT_FALSE( frame_element->contentDocument()->View()->CanThrottleRendering()); @@ -650,7 +650,7 @@ // Move the frame offscreen to throttle it. auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); frame_element->setAttribute(styleAttr, "transform: translateY(480px)"); EXPECT_FALSE( frame_element->contentDocument()->View()->CanThrottleRendering()); @@ -701,7 +701,7 @@ // Move the frame offscreen to throttle it. auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); frame_element->setAttribute(styleAttr, "transform: translateY(480px)"); EXPECT_FALSE( frame_element->contentDocument()->View()->CanThrottleRendering()); @@ -735,7 +735,7 @@ "document.addEventListener('touchstart', function(){}, {passive: false});" "</script>"); auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); frame_element->setAttribute(styleAttr, "transform: translateY(480px)"); CompositeFrame(); // Throttle the frame. CompositeFrame(); // Update touch handler regions. @@ -772,7 +772,7 @@ "function(){});" "</script>"); auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); frame_element->setAttribute(styleAttr, "transform: translateY(480px)"); CompositeFrame(); // Throttle the frame. CompositeFrame(); // Update touch handler regions. @@ -799,7 +799,7 @@ "main <iframe id=frame sandbox=allow-scripts src=iframe.html></iframe>"); frame_resource.Complete(""); auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); frame_element->setAttribute(styleAttr, "transform: translateY(480px)"); CompositeFrame(); EXPECT_TRUE(frame_element->contentDocument()->View()->CanThrottleRendering()); @@ -834,7 +834,7 @@ // Move the frame offscreen to throttle it and make sure it is backed by a // graphics layer. auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); frame_element->setAttribute(styleAttr, "transform: translateY(480px) translateZ(0px)"); EXPECT_FALSE( @@ -866,9 +866,9 @@ // Move both frames offscreen, but don't run the intersection observers yet. auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); auto* child_frame_element = toHTMLIFrameElement( - frame_element->contentDocument()->GetElementById("child-frame")); + frame_element->contentDocument()->getElementById("child-frame")); frame_element->setAttribute(styleAttr, "transform: translateY(480px)"); Compositor().BeginFrame(); EXPECT_FALSE( @@ -937,7 +937,7 @@ EXPECT_TRUE(display_items.Contains(SimCanvas::kRect, "red")); auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); frame_element->setAttribute(styleAttr, "transform: translateY(480px)"); CompositeFrame(); EXPECT_TRUE(frame_element->contentDocument()->View()->CanThrottleRendering()); @@ -983,7 +983,7 @@ // Throttle the first frame. auto* first_frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("first")); + toHTMLIFrameElement(GetDocument().getElementById("first")); first_frame_element->setAttribute(styleAttr, "transform: translateY(480px)"); CompositeFrame(); EXPECT_TRUE( @@ -994,7 +994,7 @@ // should not result in an unexpected lifecycle state even if the first // frame is throttled during the animation frame callback. auto* second_frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("second")); + toHTMLIFrameElement(GetDocument().getElementById("second")); LocalFrame* local_frame = ToLocalFrame(second_frame_element->ContentFrame()); local_frame->GetScriptController().ExecuteScriptInMainWorld( "window.requestAnimationFrame(function() {\n" @@ -1023,7 +1023,7 @@ "</script>"); auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); CompositeFrame(); EXPECT_TRUE(frame_element->contentDocument()->View()->CanThrottleRendering()); @@ -1048,9 +1048,9 @@ CompositeFrame(); auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); auto* frame_document = frame_element->contentDocument(); - auto* inner_div = frame_document->GetElementById("div"); + auto* inner_div = frame_document->getElementById("div"); auto* inner_div_object = inner_div->GetLayoutObject(); EXPECT_FALSE(frame_document->View()->ShouldThrottleRendering()); @@ -1092,7 +1092,7 @@ "<iframe sandbox id=frame></iframe>"); auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); auto* frame_document = frame_element->contentDocument(); // Initially the frame is throttled as it is offscreen. @@ -1120,9 +1120,9 @@ // Move both frames offscreen to make them throttled. auto* frame_element = - toHTMLIFrameElement(GetDocument().GetElementById("frame")); + toHTMLIFrameElement(GetDocument().getElementById("frame")); auto* child_frame_element = toHTMLIFrameElement( - frame_element->contentDocument()->GetElementById("child-frame")); + frame_element->contentDocument()->getElementById("child-frame")); frame_element->setAttribute(styleAttr, "transform: translateY(480px)"); CompositeFrame(); EXPECT_TRUE(frame_element->contentDocument()->View()->CanThrottleRendering());
diff --git a/third_party/WebKit/Source/web/tests/HTMLDocumentParserLoadingTest.cpp b/third_party/WebKit/Source/web/tests/HTMLDocumentParserLoadingTest.cpp index 5420de60..c828493c 100644 --- a/third_party/WebKit/Source/web/tests/HTMLDocumentParserLoadingTest.cpp +++ b/third_party/WebKit/Source/web/tests/HTMLDocumentParserLoadingTest.cpp
@@ -55,10 +55,10 @@ "</body></html>"); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("bodyDiv")); + EXPECT_TRUE(GetDocument().getElementById("bodyDiv")); css_head_resource.Complete(""); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("bodyDiv")); + EXPECT_TRUE(GetDocument().getElementById("bodyDiv")); } TEST_P(HTMLDocumentParserLoadingTest, @@ -79,10 +79,10 @@ "</body></html>"); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("bodyDiv")); + EXPECT_TRUE(GetDocument().getElementById("bodyDiv")); css_head_resource.Complete(""); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("bodyDiv")); + EXPECT_TRUE(GetDocument().getElementById("bodyDiv")); } TEST_P(HTMLDocumentParserLoadingTest, @@ -104,21 +104,21 @@ "</body></html>"); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("before")); - EXPECT_FALSE(GetDocument().GetElementById("after")); + EXPECT_TRUE(GetDocument().getElementById("before")); + EXPECT_FALSE(GetDocument().getElementById("after")); // Completing the head css shouldn't change anything css_head_resource.Complete(""); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("before")); - EXPECT_FALSE(GetDocument().GetElementById("after")); + EXPECT_TRUE(GetDocument().getElementById("before")); + EXPECT_FALSE(GetDocument().getElementById("after")); // Completing the body resource and pumping the tasks should continue parsing // and create the "after" div. css_body_resource.Complete(""); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("before")); - EXPECT_TRUE(GetDocument().GetElementById("after")); + EXPECT_TRUE(GetDocument().getElementById("before")); + EXPECT_TRUE(GetDocument().getElementById("after")); } TEST_P(HTMLDocumentParserLoadingTest, @@ -145,20 +145,20 @@ "<div id=\"after1\"></div>"); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("before")); - EXPECT_FALSE(GetDocument().GetElementById("after1")); - EXPECT_FALSE(GetDocument().GetElementById("after2")); - EXPECT_FALSE(GetDocument().GetElementById("after3")); + EXPECT_TRUE(GetDocument().getElementById("before")); + EXPECT_FALSE(GetDocument().getElementById("after1")); + EXPECT_FALSE(GetDocument().getElementById("after2")); + EXPECT_FALSE(GetDocument().getElementById("after3")); main_resource.Write( "<link rel=stylesheet href=testBody2.css>" "<div id=\"after2\"></div>"); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("before")); - EXPECT_FALSE(GetDocument().GetElementById("after1")); - EXPECT_FALSE(GetDocument().GetElementById("after2")); - EXPECT_FALSE(GetDocument().GetElementById("after3")); + EXPECT_TRUE(GetDocument().getElementById("before")); + EXPECT_FALSE(GetDocument().getElementById("after1")); + EXPECT_FALSE(GetDocument().getElementById("after2")); + EXPECT_FALSE(GetDocument().getElementById("after3")); main_resource.Complete( "<link rel=stylesheet href=testBody3.css>" @@ -166,44 +166,44 @@ "</body></html>"); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("before")); - EXPECT_FALSE(GetDocument().GetElementById("after1")); - EXPECT_FALSE(GetDocument().GetElementById("after2")); - EXPECT_FALSE(GetDocument().GetElementById("after3")); + EXPECT_TRUE(GetDocument().getElementById("before")); + EXPECT_FALSE(GetDocument().getElementById("after1")); + EXPECT_FALSE(GetDocument().getElementById("after2")); + EXPECT_FALSE(GetDocument().getElementById("after3")); // Completing the head css shouldn't change anything css_head_resource.Complete(""); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("before")); - EXPECT_FALSE(GetDocument().GetElementById("after1")); - EXPECT_FALSE(GetDocument().GetElementById("after2")); - EXPECT_FALSE(GetDocument().GetElementById("after3")); + EXPECT_TRUE(GetDocument().getElementById("before")); + EXPECT_FALSE(GetDocument().getElementById("after1")); + EXPECT_FALSE(GetDocument().getElementById("after2")); + EXPECT_FALSE(GetDocument().getElementById("after3")); // Completing the second css shouldn't change anything css_body_resource2.Complete(""); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("before")); - EXPECT_FALSE(GetDocument().GetElementById("after1")); - EXPECT_FALSE(GetDocument().GetElementById("after2")); - EXPECT_FALSE(GetDocument().GetElementById("after3")); + EXPECT_TRUE(GetDocument().getElementById("before")); + EXPECT_FALSE(GetDocument().getElementById("after1")); + EXPECT_FALSE(GetDocument().getElementById("after2")); + EXPECT_FALSE(GetDocument().getElementById("after3")); // Completing the first css should allow the parser to continue past it and // the second css which was already completed and then pause again before the // third css. css_body_resource1.Complete(""); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("before")); - EXPECT_TRUE(GetDocument().GetElementById("after1")); - EXPECT_TRUE(GetDocument().GetElementById("after2")); - EXPECT_FALSE(GetDocument().GetElementById("after3")); + EXPECT_TRUE(GetDocument().getElementById("before")); + EXPECT_TRUE(GetDocument().getElementById("after1")); + EXPECT_TRUE(GetDocument().getElementById("after2")); + EXPECT_FALSE(GetDocument().getElementById("after3")); // Completing the third css should let it continue to the end. css_body_resource3.Complete(""); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("before")); - EXPECT_TRUE(GetDocument().GetElementById("after1")); - EXPECT_TRUE(GetDocument().GetElementById("after2")); - EXPECT_TRUE(GetDocument().GetElementById("after3")); + EXPECT_TRUE(GetDocument().getElementById("before")); + EXPECT_TRUE(GetDocument().getElementById("after1")); + EXPECT_TRUE(GetDocument().getElementById("after2")); + EXPECT_TRUE(GetDocument().getElementById("after3")); } TEST_P(HTMLDocumentParserLoadingTest, @@ -224,8 +224,8 @@ "</body></html>"); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("before")); - EXPECT_TRUE(GetDocument().GetElementById("after")); + EXPECT_TRUE(GetDocument().getElementById("before")); + EXPECT_TRUE(GetDocument().getElementById("after")); // Completing the head css shouldn't change anything css_head_resource.Complete(""); @@ -252,21 +252,21 @@ "</body></html>"); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("before")); - EXPECT_FALSE(GetDocument().GetElementById("after")); + EXPECT_TRUE(GetDocument().getElementById("before")); + EXPECT_FALSE(GetDocument().getElementById("after")); // Completing the head css shouldn't change anything css_head_resource.Complete(""); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("before")); - EXPECT_FALSE(GetDocument().GetElementById("after")); + EXPECT_TRUE(GetDocument().getElementById("before")); + EXPECT_FALSE(GetDocument().getElementById("after")); // Completing the body resource and pumping the tasks should continue parsing // and create the "after" div. css_body_resource.Complete(""); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("before")); - EXPECT_TRUE(GetDocument().GetElementById("after")); + EXPECT_TRUE(GetDocument().getElementById("before")); + EXPECT_TRUE(GetDocument().getElementById("after")); } TEST_P(HTMLDocumentParserLoadingTest, @@ -290,21 +290,21 @@ "</body></html>"); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("before")); - EXPECT_FALSE(GetDocument().GetElementById("after")); + EXPECT_TRUE(GetDocument().getElementById("before")); + EXPECT_FALSE(GetDocument().getElementById("after")); // Completing the head css shouldn't change anything css_head_resource.Complete(""); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("before")); - EXPECT_FALSE(GetDocument().GetElementById("after")); + EXPECT_TRUE(GetDocument().getElementById("before")); + EXPECT_FALSE(GetDocument().getElementById("after")); // Completing the body resource and pumping the tasks should continue parsing // and create the "after" div. css_body_resource.Complete(""); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("before")); - EXPECT_TRUE(GetDocument().GetElementById("after")); + EXPECT_TRUE(GetDocument().getElementById("before")); + EXPECT_TRUE(GetDocument().getElementById("after")); } TEST_P(HTMLDocumentParserLoadingTest, @@ -326,8 +326,8 @@ "</body></html>"); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("before")); - EXPECT_TRUE(GetDocument().GetElementById("after")); + EXPECT_TRUE(GetDocument().getElementById("before")); + EXPECT_TRUE(GetDocument().getElementById("after")); css_head_resource.Complete(""); } @@ -350,8 +350,8 @@ "</body></html>"); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("before")); - EXPECT_TRUE(GetDocument().GetElementById("after")); + EXPECT_TRUE(GetDocument().getElementById("before")); + EXPECT_TRUE(GetDocument().getElementById("after")); css_head_resource.Complete(""); } @@ -381,8 +381,8 @@ "</body></html>"); testing::RunPendingTasks(); - EXPECT_TRUE(GetDocument().GetElementById("before")); - EXPECT_TRUE(GetDocument().GetElementById("after")); + EXPECT_TRUE(GetDocument().getElementById("before")); + EXPECT_TRUE(GetDocument().getElementById("after")); css_async_resource.Complete(""); }
diff --git a/third_party/WebKit/Source/web/tests/IntersectionObserverTest.cpp b/third_party/WebKit/Source/web/tests/IntersectionObserverTest.cpp index 3cce165..980ca5ec 100644 --- a/third_party/WebKit/Source/web/tests/IntersectionObserverTest.cpp +++ b/third_party/WebKit/Source/web/tests/IntersectionObserverTest.cpp
@@ -62,7 +62,7 @@ EXPECT_TRUE(observer->takeRecords(exception_state).IsEmpty()); EXPECT_EQ(observer_callback->CallCount(), 0); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); ASSERT_TRUE(target); observer->observe(target, exception_state); EXPECT_TRUE(Compositor().NeedsBeginFrame()); @@ -85,7 +85,7 @@ observer_init, *observer_callback, exception_state); ASSERT_FALSE(exception_state.HadException()); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); ASSERT_TRUE(target); observer->observe(target, exception_state); @@ -144,7 +144,7 @@ observer_init, *observer_callback, exception_state); ASSERT_FALSE(exception_state.HadException()); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); ASSERT_TRUE(target); observer->observe(target, exception_state);
diff --git a/third_party/WebKit/Source/web/tests/LayoutGeometryMapTest.cpp b/third_party/WebKit/Source/web/tests/LayoutGeometryMapTest.cpp index 18985cf4..2748a1a2 100644 --- a/third_party/WebKit/Source/web/tests/LayoutGeometryMapTest.cpp +++ b/third_party/WebKit/Source/web/tests/LayoutGeometryMapTest.cpp
@@ -72,7 +72,7 @@ return nullptr; LocalFrame* frame = iframe->GetFrame(); Document* doc = frame->GetDocument(); - Element* element = doc->GetElementById(element_id); + Element* element = doc->getElementById(element_id); if (!element) return nullptr; return element->GetLayoutBox(); @@ -85,7 +85,7 @@ return nullptr; LocalFrame* frame = web_view_impl->MainFrameImpl()->GetFrame(); Document* doc = frame->GetDocument(); - return doc->GetElementById(element_id); + return doc->getElementById(element_id); } static LayoutBox* GetLayoutBox(WebView* web_view,
diff --git a/third_party/WebKit/Source/web/tests/LinkElementLoadingTest.cpp b/third_party/WebKit/Source/web/tests/LinkElementLoadingTest.cpp index 23f0968f..cfbba10 100644 --- a/third_party/WebKit/Source/web/tests/LinkElementLoadingTest.cpp +++ b/third_party/WebKit/Source/web/tests/LinkElementLoadingTest.cpp
@@ -28,7 +28,7 @@ // Remove a link element from a document HTMLLinkElement* link = - toHTMLLinkElement(GetDocument().GetElementById("link")); + toHTMLLinkElement(GetDocument().getElementById("link")); EXPECT_NE(nullptr, link); link->remove();
diff --git a/third_party/WebKit/Source/web/tests/LinkSelectionTest.cpp b/third_party/WebKit/Source/web/tests/LinkSelectionTest.cpp index b5bff894..97db449 100644 --- a/third_party/WebKit/Source/web/tests/LinkSelectionTest.cpp +++ b/third_party/WebKit/Source/web/tests/LinkSelectionTest.cpp
@@ -137,7 +137,7 @@ auto* document = main_frame_->GetFrame()->GetDocument(); ASSERT_NE(nullptr, document); - auto* link_to_select = document->GetElementById("link")->firstChild(); + auto* link_to_select = document->getElementById("link")->firstChild(); ASSERT_NE(nullptr, link_to_select); // We get larger range that we actually want to select, because we need a // slightly larger rect to include the last character to the selection. @@ -226,7 +226,7 @@ TEST_F(LinkSelectionTest, SingleClickWithAltStartsDownloadWhenTextSelected) { auto* document = main_frame_->GetFrame()->GetDocument(); - auto* text_to_select = document->GetElementById("page_text")->firstChild(); + auto* text_to_select = document->getElementById("page_text")->firstChild(); ASSERT_NE(nullptr, text_to_select); // Select some page text outside the link element. @@ -276,8 +276,8 @@ auto* document = main_frame_->GetFrame()->GetDocument(); ASSERT_NE(nullptr, document); - auto* empty_div = document->GetElementById("empty_div"); - auto* text_div = document->GetElementById("text_div"); + auto* empty_div = document->getElementById("empty_div"); + auto* text_div = document->getElementById("text_div"); ASSERT_NE(nullptr, empty_div); ASSERT_NE(nullptr, text_div); } @@ -312,7 +312,7 @@ TEST_F(LinkSelectionClickEventsTest, SingleAndDoubleClickWillBeHandled) { auto* document = main_frame_->GetFrame()->GetDocument(); - auto* element = document->GetElementById("empty_div"); + auto* element = document->getElementById("empty_div"); { SCOPED_TRACE("Empty div, single click"); @@ -324,7 +324,7 @@ CheckMouseClicks(*element, true); } - element = document->GetElementById("text_div"); + element = document->getElementById("text_div"); { SCOPED_TRACE("Text div, single click");
diff --git a/third_party/WebKit/Source/web/tests/MediaElementFillingViewportTest.cpp b/third_party/WebKit/Source/web/tests/MediaElementFillingViewportTest.cpp index 17e84fc..ecccaca 100644 --- a/third_party/WebKit/Source/web/tests/MediaElementFillingViewportTest.cpp +++ b/third_party/WebKit/Source/web/tests/MediaElementFillingViewportTest.cpp
@@ -53,7 +53,7 @@ Compositor().BeginFrame(); HTMLMediaElement* element = - ToElement<HTMLMediaElement>(GetDocument().GetElementById("video")); + ToElement<HTMLMediaElement>(GetDocument().getElementById("video")); CheckViewportIntersectionChanged(element); EXPECT_FALSE(IsMostlyFillingViewport(element)); EXPECT_TRUE(ViewportFillDebouncerTimerActive(element)); @@ -73,7 +73,7 @@ Compositor().BeginFrame(); HTMLMediaElement* element = - ToElement<HTMLMediaElement>(GetDocument().GetElementById("video")); + ToElement<HTMLMediaElement>(GetDocument().getElementById("video")); CheckViewportIntersectionChanged(element); EXPECT_FALSE(IsMostlyFillingViewport(element)); EXPECT_FALSE(ViewportFillDebouncerTimerActive(element)); @@ -92,7 +92,7 @@ Compositor().BeginFrame(); HTMLMediaElement* element = - ToElement<HTMLMediaElement>(GetDocument().GetElementById("video")); + ToElement<HTMLMediaElement>(GetDocument().getElementById("video")); CheckViewportIntersectionChanged(element); EXPECT_FALSE(IsMostlyFillingViewport(element)); EXPECT_TRUE(ViewportFillDebouncerTimerActive(element)); @@ -120,7 +120,7 @@ Compositor().BeginFrame(); HTMLMediaElement* element = - ToElement<HTMLMediaElement>(GetDocument().GetElementById("video")); + ToElement<HTMLMediaElement>(GetDocument().getElementById("video")); CheckViewportIntersectionChanged(element); EXPECT_FALSE(IsMostlyFillingViewport(element)); EXPECT_TRUE(ViewportFillDebouncerTimerActive(element)); @@ -139,7 +139,7 @@ Compositor().BeginFrame(); HTMLMediaElement* element = - ToElement<HTMLMediaElement>(GetDocument().GetElementById("video")); + ToElement<HTMLMediaElement>(GetDocument().getElementById("video")); CheckViewportIntersectionChanged(element); EXPECT_FALSE(IsMostlyFillingViewport(element)); EXPECT_TRUE(ViewportFillDebouncerTimerActive(element));
diff --git a/third_party/WebKit/Source/web/tests/NGInlineLayoutTest.cpp b/third_party/WebKit/Source/web/tests/NGInlineLayoutTest.cpp index 616a832..98c19687 100644 --- a/third_party/WebKit/Source/web/tests/NGInlineLayoutTest.cpp +++ b/third_party/WebKit/Source/web/tests/NGInlineLayoutTest.cpp
@@ -43,7 +43,7 @@ Compositor().BeginFrame(); ASSERT_FALSE(Compositor().NeedsBeginFrame()); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); LayoutNGBlockFlow* block_flow = ToLayoutNGBlockFlow(target->GetLayoutObject()); RefPtr<NGConstraintSpace> constraint_space = @@ -68,7 +68,7 @@ Compositor().BeginFrame(); ASSERT_FALSE(Compositor().NeedsBeginFrame()); - Element* target = GetDocument().GetElementById("target"); + Element* target = GetDocument().getElementById("target"); LayoutNGBlockFlow* block_flow = ToLayoutNGBlockFlow(target->GetLayoutObject()); RefPtr<NGConstraintSpace> constraint_space =
diff --git a/third_party/WebKit/Source/web/tests/PrerenderingTest.cpp b/third_party/WebKit/Source/web/tests/PrerenderingTest.cpp index bdd3b44..5b77a31 100644 --- a/third_party/WebKit/Source/web/tests/PrerenderingTest.cpp +++ b/third_party/WebKit/Source/web/tests/PrerenderingTest.cpp
@@ -191,7 +191,7 @@ Element& Console() { Document* document = web_view_helper_.WebView()->MainFrameImpl()->GetFrame()->GetDocument(); - Element* console = document->GetElementById("console"); + Element* console = document->getElementById("console"); DCHECK(isHTMLUListElement(console)); return *console; }
diff --git a/third_party/WebKit/Source/web/tests/ResizeObserverTest.cpp b/third_party/WebKit/Source/web/tests/ResizeObserverTest.cpp index ff068ad6..3b8ad438 100644 --- a/third_party/WebKit/Source/web/tests/ResizeObserverTest.cpp +++ b/third_party/WebKit/Source/web/tests/ResizeObserverTest.cpp
@@ -70,8 +70,8 @@ ResizeObserverCallback* callback = new TestResizeObserverCallback(GetDocument()); ResizeObserver* observer = ResizeObserver::Create(GetDocument(), callback); - Element* dom_target = GetDocument().GetElementById("domTarget"); - Element* svg_target = GetDocument().GetElementById("svgTarget"); + Element* dom_target = GetDocument().getElementById("domTarget"); + Element* svg_target = GetDocument().getElementById("svgTarget"); ResizeObservation* dom_observation = new ResizeObservation(dom_target, observer); ResizeObservation* svg_observation =
diff --git a/third_party/WebKit/Source/web/tests/RootScrollerTest.cpp b/third_party/WebKit/Source/web/tests/RootScrollerTest.cpp index 2dc5893..23264b31 100644 --- a/third_party/WebKit/Source/web/tests/RootScrollerTest.cpp +++ b/third_party/WebKit/Source/web/tests/RootScrollerTest.cpp
@@ -234,7 +234,7 @@ OverscrollTestWebViewClient client; Initialize("root-scroller.html", &client); - Element* container = MainFrame()->GetDocument()->GetElementById("container"); + Element* container = MainFrame()->GetDocument()->getElementById("container"); MainFrame()->GetDocument()->setRootScroller(container); ASSERT_EQ(container, MainFrame()->GetDocument()->rootScroller()); @@ -333,7 +333,7 @@ ASSERT_EQ(nullptr, MainFrame()->GetDocument()->rootScroller()); - Element* container = MainFrame()->GetDocument()->GetElementById("container"); + Element* container = MainFrame()->GetDocument()->getElementById("container"); MainFrame()->GetDocument()->setRootScroller(container); EXPECT_EQ(container, MainFrame()->GetDocument()->rootScroller()); @@ -354,7 +354,7 @@ { // Set to a non-block element. Should be rejected and a console message // logged. - Element* element = MainFrame()->GetDocument()->GetElementById("nonBlock"); + Element* element = MainFrame()->GetDocument()->getElementById("nonBlock"); MainFrame()->GetDocument()->setRootScroller(element); MainFrameView()->UpdateAllLifecyclePhases(); EXPECT_EQ(element, MainFrame()->GetDocument()->rootScroller()); @@ -363,7 +363,7 @@ { // Set to an element with no size. - Element* element = MainFrame()->GetDocument()->GetElementById("empty"); + Element* element = MainFrame()->GetDocument()->getElementById("empty"); MainFrame()->GetDocument()->setRootScroller(element); MainFrameView()->UpdateAllLifecyclePhases(); EXPECT_EQ(element, MainFrame()->GetDocument()->rootScroller()); @@ -376,7 +376,7 @@ TEST_F(RootScrollerTest, TestRootScrollerBecomesInvalid) { Initialize("root-scroller.html"); - Element* container = MainFrame()->GetDocument()->GetElementById("container"); + Element* container = MainFrame()->GetDocument()->getElementById("container"); ASSERT_EQ(nullptr, MainFrame()->GetDocument()->rootScroller()); ASSERT_EQ(MainFrame()->GetDocument(), @@ -431,9 +431,9 @@ { // Trying to set an element from a nested document should fail. HTMLFrameOwnerElement* iframe = ToHTMLFrameOwnerElement( - MainFrame()->GetDocument()->GetElementById("iframe")); + MainFrame()->GetDocument()->getElementById("iframe")); Element* inner_container = - iframe->contentDocument()->GetElementById("container"); + iframe->contentDocument()->getElementById("container"); MainFrame()->GetDocument()->setRootScroller(inner_container); MainFrameView()->UpdateAllLifecyclePhases(); @@ -446,7 +446,7 @@ { // Setting the iframe itself should also work. HTMLFrameOwnerElement* iframe = ToHTMLFrameOwnerElement( - MainFrame()->GetDocument()->GetElementById("iframe")); + MainFrame()->GetDocument()->getElementById("iframe")); MainFrame()->GetDocument()->setRootScroller(iframe); MainFrameView()->UpdateAllLifecyclePhases(); @@ -465,13 +465,13 @@ { HTMLFrameOwnerElement* iframe = ToHTMLFrameOwnerElement( - MainFrame()->GetDocument()->GetElementById("iframe")); + MainFrame()->GetDocument()->getElementById("iframe")); EXPECT_EQ(iframe->contentDocument(), EffectiveRootScroller(iframe->contentDocument())); Element* inner_container = - iframe->contentDocument()->GetElementById("container"); + iframe->contentDocument()->getElementById("container"); iframe->contentDocument()->setRootScroller(inner_container); MainFrameView()->UpdateAllLifecyclePhases(); @@ -493,14 +493,14 @@ // Try to set the root scroller in the main frame to be the iframe // element. HTMLFrameOwnerElement* iframe = ToHTMLFrameOwnerElement( - MainFrame()->GetDocument()->GetElementById("iframe")); + MainFrame()->GetDocument()->getElementById("iframe")); MainFrame()->GetDocument()->setRootScroller(iframe, non_throw); EXPECT_EQ(iframe, MainFrame()->GetDocument()->rootScroller()); EXPECT_EQ(iframe, EffectiveRootScroller(MainFrame()->GetDocument())); - Element* container = iframe->contentDocument()->GetElementById("container"); + Element* container = iframe->contentDocument()->getElementById("container"); iframe->contentDocument()->setRootScroller(container, non_throw); @@ -519,8 +519,8 @@ ASSERT_EQ(nullptr, MainFrame()->GetDocument()->rootScroller()); HTMLFrameOwnerElement* iframe = ToHTMLFrameOwnerElement( - MainFrame()->GetDocument()->GetElementById("iframe")); - Element* container = iframe->contentDocument()->GetElementById("container"); + MainFrame()->GetDocument()->getElementById("iframe")); + Element* container = iframe->contentDocument()->getElementById("container"); const TopDocumentRootScrollerController& main_controller = MainFrame()->GetDocument()->GetPage()->GlobalRootScrollerController(); @@ -623,7 +623,7 @@ // Try to set the the root scroller of the child document to be the // <iframe> element in the parent document. HTMLFrameOwnerElement* iframe = ToHTMLFrameOwnerElement( - MainFrame()->GetDocument()->GetElementById("iframe")); + MainFrame()->GetDocument()->getElementById("iframe")); NonThrowableExceptionState non_throw; Element* body = MainFrame()->GetDocument()->QuerySelector("body", non_throw); @@ -659,7 +659,7 @@ // Set the root scroller in the local main frame to the iframe (which is // remote). { - Element* iframe = MainFrame()->GetDocument()->GetElementById("iframe"); + Element* iframe = MainFrame()->GetDocument()->getElementById("iframe"); NonThrowableExceptionState non_throw; MainFrame()->GetDocument()->setRootScroller(iframe, non_throw); EXPECT_EQ(iframe, MainFrame()->GetDocument()->rootScroller()); @@ -698,7 +698,7 @@ } Document* document = local_frame->GetFrameView()->GetFrame().GetDocument(); - Element* container = document->GetElementById("container"); + Element* container = document->getElementById("container"); // Try scrolling in the iframe. { @@ -748,9 +748,9 @@ { HTMLFrameOwnerElement* iframe = ToHTMLFrameOwnerElement( - MainFrame()->GetDocument()->GetElementById("iframe")); + MainFrame()->GetDocument()->getElementById("iframe")); Element* inner_container = - iframe->contentDocument()->GetElementById("container"); + iframe->contentDocument()->getElementById("container"); MainFrame()->GetDocument()->setRootScroller(iframe); iframe->contentDocument()->setRootScroller(inner_container); @@ -796,7 +796,7 @@ TEST_F(RootScrollerTest, UseVisualViewportScrollbars) { Initialize("root-scroller.html"); - Element* container = MainFrame()->GetDocument()->GetElementById("container"); + Element* container = MainFrame()->GetDocument()->getElementById("container"); NonThrowableExceptionState non_throw; MainFrame()->GetDocument()->setRootScroller(container, non_throw); MainFrameView()->UpdateAllLifecyclePhases(); @@ -817,7 +817,7 @@ TEST_F(RootScrollerTest, UseVisualViewportScrollbarsIframe) { Initialize("root-scroller-iframe.html"); - Element* iframe = MainFrame()->GetDocument()->GetElementById("iframe"); + Element* iframe = MainFrame()->GetDocument()->getElementById("iframe"); LocalFrame* child_frame = ToLocalFrame(ToHTMLFrameOwnerElement(iframe)->ContentFrame()); @@ -867,7 +867,7 @@ GetWebViewImpl()->ResizeWithBrowserControls(IntSize(400, 400), 50, true); MainFrameView()->UpdateAllLifecyclePhases(); - Element* container = MainFrame()->GetDocument()->GetElementById("container"); + Element* container = MainFrame()->GetDocument()->getElementById("container"); MainFrame()->GetDocument()->setRootScroller(container, ASSERT_NO_EXCEPTION); ScrollableArea* container_scroller = @@ -908,7 +908,7 @@ MainFrameView()->UpdateAllLifecyclePhases(); Element* container = - MainFrame()->GetDocument()->GetElementById("container"); + MainFrame()->GetDocument()->getElementById("container"); NonThrowableExceptionState non_throw; MainFrame()->GetDocument()->setRootScroller(container, non_throw); MainFrameView()->UpdateAllLifecyclePhases(); @@ -917,7 +917,7 @@ ToLayoutBox(container->GetLayoutObject())->GetScrollableArea()); } - Element* target = MainFrame()->GetDocument()->GetElementById("target"); + Element* target = MainFrame()->GetDocument()->getElementById("target"); // Zoom in and scroll the viewport so that the target is fully in the // viewport and the visual viewport is fully scrolled within the layout @@ -981,7 +981,7 @@ Document* document = MainFrame()->GetDocument(); HTMLFrameOwnerElement* iframe = ToHTMLFrameOwnerElement( - MainFrame()->GetDocument()->GetElementById("iframe")); + MainFrame()->GetDocument()->getElementById("iframe")); document->setRootScroller(iframe); MainFrameView()->UpdateAllLifecyclePhases();
diff --git a/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp b/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp index c2a1113..bf4d5f94 100644 --- a/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp +++ b/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp
@@ -202,7 +202,7 @@ ForceFullCompositingUpdate(); Document* document = GetFrame()->GetDocument(); - Element* scrollable_element = document->GetElementById("scroller"); + Element* scrollable_element = document->getElementById("scroller"); DCHECK(scrollable_element); scrollable_element->setScrollTop(1.0); @@ -264,7 +264,7 @@ Document* document = GetFrame()->GetDocument(); { - Element* element = document->GetElementById("div-tl"); + Element* element = document->getElementById("div-tl"); ASSERT_TRUE(element); WebLayer* layer = WebLayerFromElement(element); ASSERT_TRUE(layer); @@ -274,7 +274,7 @@ !constraint.is_fixed_to_bottom_edge); } { - Element* element = document->GetElementById("div-tr"); + Element* element = document->getElementById("div-tr"); ASSERT_TRUE(element); WebLayer* layer = WebLayerFromElement(element); ASSERT_TRUE(layer); @@ -284,7 +284,7 @@ !constraint.is_fixed_to_bottom_edge); } { - Element* element = document->GetElementById("div-bl"); + Element* element = document->getElementById("div-bl"); ASSERT_TRUE(element); WebLayer* layer = WebLayerFromElement(element); ASSERT_TRUE(layer); @@ -294,7 +294,7 @@ constraint.is_fixed_to_bottom_edge); } { - Element* element = document->GetElementById("div-br"); + Element* element = document->getElementById("div-br"); ASSERT_TRUE(element); WebLayer* layer = WebLayerFromElement(element); ASSERT_TRUE(layer); @@ -304,7 +304,7 @@ constraint.is_fixed_to_bottom_edge); } { - Element* element = document->GetElementById("span-tl"); + Element* element = document->getElementById("span-tl"); ASSERT_TRUE(element); WebLayer* layer = WebLayerFromElement(element); ASSERT_TRUE(layer); @@ -314,7 +314,7 @@ !constraint.is_fixed_to_bottom_edge); } { - Element* element = document->GetElementById("span-tr"); + Element* element = document->getElementById("span-tr"); ASSERT_TRUE(element); WebLayer* layer = WebLayerFromElement(element); ASSERT_TRUE(layer); @@ -324,7 +324,7 @@ !constraint.is_fixed_to_bottom_edge); } { - Element* element = document->GetElementById("span-bl"); + Element* element = document->getElementById("span-bl"); ASSERT_TRUE(element); WebLayer* layer = WebLayerFromElement(element); ASSERT_TRUE(layer); @@ -334,7 +334,7 @@ constraint.is_fixed_to_bottom_edge); } { - Element* element = document->GetElementById("span-br"); + Element* element = document->getElementById("span-br"); ASSERT_TRUE(element); WebLayer* layer = WebLayerFromElement(element); ASSERT_TRUE(layer); @@ -357,7 +357,7 @@ Document* document = GetFrame()->GetDocument(); { - Element* element = document->GetElementById("div-tl"); + Element* element = document->getElementById("div-tl"); ASSERT_TRUE(element); WebLayer* layer = WebLayerFromElement(element); ASSERT_TRUE(layer); @@ -378,7 +378,7 @@ IntPoint(constraint.parent_relative_sticky_box_offset)); } { - Element* element = document->GetElementById("div-tr"); + Element* element = document->getElementById("div-tr"); ASSERT_TRUE(element); WebLayer* layer = WebLayerFromElement(element); ASSERT_TRUE(layer); @@ -389,7 +389,7 @@ constraint.is_anchored_right && !constraint.is_anchored_bottom); } { - Element* element = document->GetElementById("div-bl"); + Element* element = document->getElementById("div-bl"); ASSERT_TRUE(element); WebLayer* layer = WebLayerFromElement(element); ASSERT_TRUE(layer); @@ -400,7 +400,7 @@ !constraint.is_anchored_right && constraint.is_anchored_bottom); } { - Element* element = document->GetElementById("div-br"); + Element* element = document->getElementById("div-br"); ASSERT_TRUE(element); WebLayer* layer = WebLayerFromElement(element); ASSERT_TRUE(layer); @@ -411,7 +411,7 @@ constraint.is_anchored_right && constraint.is_anchored_bottom); } { - Element* element = document->GetElementById("span-tl"); + Element* element = document->getElementById("span-tl"); ASSERT_TRUE(element); WebLayer* layer = WebLayerFromElement(element); ASSERT_TRUE(layer); @@ -423,7 +423,7 @@ !constraint.is_anchored_bottom); } { - Element* element = document->GetElementById("span-tlbr"); + Element* element = document->getElementById("span-tlbr"); ASSERT_TRUE(element); WebLayer* layer = WebLayerFromElement(element); ASSERT_TRUE(layer); @@ -438,7 +438,7 @@ EXPECT_EQ(1.f, constraint.bottom_offset); } { - Element* element = document->GetElementById("composited-top"); + Element* element = document->getElementById("composited-top"); ASSERT_TRUE(element); WebLayer* layer = WebLayerFromElement(element); ASSERT_TRUE(layer); @@ -552,7 +552,7 @@ // Verify the properties of the accelerated scrolling element starting from // the LayoutObject all the way to the WebLayer. Element* scrollable_element = - GetFrame()->GetDocument()->GetElementById("scrollable"); + GetFrame()->GetDocument()->getElementById("scrollable"); DCHECK(scrollable_element); LayoutObject* layout_object = scrollable_element->GetLayoutObject(); @@ -598,7 +598,7 @@ // Verify the properties of the accelerated scrolling element starting from // the LayoutObject all the way to the WebLayer. Element* overflow_element = - GetFrame()->GetDocument()->GetElementById("unscrollable-y"); + GetFrame()->GetDocument()->getElementById("unscrollable-y"); DCHECK(overflow_element); LayoutObject* layout_object = overflow_element->GetLayoutObject(); @@ -626,7 +626,7 @@ ASSERT_FALSE(web_scroll_layer->UserScrollableVertical()); overflow_element = - GetFrame()->GetDocument()->GetElementById("unscrollable-x"); + GetFrame()->GetDocument()->getElementById("unscrollable-x"); DCHECK(overflow_element); layout_object = overflow_element->GetLayoutObject(); @@ -661,7 +661,7 @@ // Verify the properties of the accelerated scrolling element starting from // the LayoutObject all the way to the WebLayer. Element* scrollable_frame = - GetFrame()->GetDocument()->GetElementById("scrollable"); + GetFrame()->GetDocument()->getElementById("scrollable"); ASSERT_TRUE(scrollable_frame); LayoutObject* layout_object = scrollable_frame->GetLayoutObject(); @@ -713,7 +713,7 @@ // Verify the properties of the accelerated scrolling element starting from // the LayoutObject all the way to the WebLayer. Element* scrollable_frame = - GetFrame()->GetDocument()->GetElementById("scrollable"); + GetFrame()->GetDocument()->getElementById("scrollable"); ASSERT_TRUE(scrollable_frame); LayoutObject* layout_object = scrollable_frame->GetLayoutObject(); @@ -765,7 +765,7 @@ ForceFullCompositingUpdate(); Document* document = GetFrame()->GetDocument(); - Element* scrollable_element = document->GetElementById("scroller"); + Element* scrollable_element = document->getElementById("scroller"); DCHECK(scrollable_element); LayoutObject* layout_object = scrollable_element->GetLayoutObject(); @@ -825,7 +825,7 @@ ASSERT_TRUE(scroll_layer); Document* document = GetFrame()->GetDocument(); - Element* fixed_pos = document->GetElementById("fixed"); + Element* fixed_pos = document->getElementById("fixed"); EXPECT_TRUE(static_cast<LayoutBoxModelObject*>(fixed_pos->GetLayoutObject()) ->Layer() @@ -849,8 +849,8 @@ ForceFullCompositingUpdate(); Document* document = GetFrame()->GetDocument(); - Element* container = document->GetElementById("container"); - Element* content = document->GetElementById("content"); + Element* container = document->getElementById("container"); + Element* content = document->getElementById("content"); DCHECK_EQ(container->getAttribute(HTMLNames::classAttr), "custom_scrollbar"); DCHECK(container); DCHECK(content); @@ -891,7 +891,7 @@ NavigateTo(base_url_ + "iframe-background-attachment-fixed.html"); ForceFullCompositingUpdate(); - Element* iframe = GetFrame()->GetDocument()->GetElementById("iframe"); + Element* iframe = GetFrame()->GetDocument()->getElementById("iframe"); ASSERT_TRUE(iframe); LayoutObject* layout_object = iframe->GetLayoutObject(); @@ -924,7 +924,7 @@ // Remove fixed background-attachment should make the iframe // scroll on cc. auto* iframe_doc = toHTMLIFrameElement(iframe)->contentDocument(); - iframe = iframe_doc->GetElementById("scrollable"); + iframe = iframe_doc->getElementById("scrollable"); ASSERT_TRUE(iframe); iframe->removeAttribute("class"); @@ -945,7 +945,7 @@ // Force main frame to scroll on main thread. All its descendants // should scroll on main thread as well. - Element* element = GetFrame()->GetDocument()->GetElementById("scrollable"); + Element* element = GetFrame()->GetDocument()->getElementById("scrollable"); element->setAttribute( "style", "background-image: url('white-1x1.png'); background-attachment: fixed;", @@ -977,7 +977,7 @@ ForceFullCompositingUpdate(); LOG(ERROR) << GetFrame()->View()->GetMainThreadScrollingReasons(); - Element* element = GetFrame()->GetDocument()->GetElementById("scrollable"); + Element* element = GetFrame()->GetDocument()->getElementById("scrollable"); ASSERT_TRUE(element); LayoutObject* layout_object = element->GetLayoutObject(); @@ -1064,7 +1064,7 @@ GetWebViewImpl()->GetSettings()->SetPreferCompositingToLCDTextEnabled( false); Document* document = GetFrame()->GetDocument(); - Element* container = document->GetElementById("scroller1"); + Element* container = document->getElementById("scroller1"); container->setAttribute("class", target.c_str(), ASSERT_NO_EXCEPTION); ForceFullCompositingUpdate(); @@ -1075,7 +1075,7 @@ EXPECT_TRUE(scrollable_area->GetNonCompositedMainThreadScrollingReasons() & reason); - Element* container2 = document->GetElementById("scroller2"); + Element* container2 = document->getElementById("scroller2"); PaintLayerScrollableArea* scrollable_area2 = ToLayoutBoxModelObject(container2->GetLayoutObject()) ->GetScrollableArea(); @@ -1179,7 +1179,7 @@ EXPECT_FALSE(frame_view->GetMainThreadScrollingReasons() & clip_reason); // Test descendant with ClipPath - element = document->GetElementById("content1"); + element = document->getElementById("content1"); ASSERT_TRUE(element); element->setAttribute(HTMLNames::styleAttr, "clip-path:circle(115px at 20px 20px);");
diff --git a/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp b/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp index 8bc5872..6ffa89ed 100644 --- a/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp +++ b/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
@@ -1101,7 +1101,7 @@ navigateTo(m_baseURL + "pinch-viewport-fixed-pos.html"); LayoutObject* navbar = - frame()->GetDocument()->GetElementById("navbar")->GetLayoutObject(); + frame()->GetDocument()->getElementById("navbar")->GetLayoutObject(); EXPECT_FALSE(navbar->NeedsLayout()); @@ -1227,7 +1227,7 @@ ScrollableArea* layoutViewportScrollableArea = frameView.LayoutViewportScrollableArea(); VisualViewport& visualViewport = frame()->GetPage()->GetVisualViewport(); - Element* inputBox = frame()->GetDocument()->GetElementById("box"); + Element* inputBox = frame()->GetDocument()->getElementById("box"); webViewImpl()->SetPageScaleFactor(2); @@ -1957,7 +1957,7 @@ webViewImpl()->Resize(IntSize(800, 600)); navigateTo(m_baseURL + "window_dimensions.html"); - Element* output = frame()->GetDocument()->GetElementById("output"); + Element* output = frame()->GetDocument()->getElementById("output"); DCHECK(output); EXPECT_EQ(std::string("1600x1200"), std::string(output->innerHTML().Ascii().data())); @@ -1973,7 +1973,7 @@ webViewImpl()->Resize(IntSize(800, 600)); navigateTo(m_baseURL + "window_dimensions_wide_div.html"); - Element* output = frame()->GetDocument()->GetElementById("output"); + Element* output = frame()->GetDocument()->getElementById("output"); DCHECK(output); EXPECT_EQ(std::string("2000x1500"), std::string(output->innerHTML().Ascii().data())); @@ -2044,7 +2044,7 @@ FrameView& frameView = *webViewImpl()->MainFrameImpl()->GetFrameView(); - Element* scroller = frame()->GetDocument()->GetElementById("rootScroller"); + Element* scroller = frame()->GetDocument()->getElementById("rootScroller"); NonThrowableExceptionState nonThrow; frame()->GetDocument()->setRootScroller(scroller, nonThrow); @@ -2079,7 +2079,7 @@ FrameView& frameView = *webViewImpl()->MainFrameImpl()->GetFrameView(); - Element* scroller = frame()->GetDocument()->GetElementById("rootScroller"); + Element* scroller = frame()->GetDocument()->getElementById("rootScroller"); NonThrowableExceptionState nonThrow; frame()->GetDocument()->setRootScroller(scroller, nonThrow); webViewImpl()->UpdateAllLifecyclePhases();
diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp index a293e66..e5f9543 100644 --- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp +++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
@@ -285,12 +285,12 @@ LocalFrame* frame = ToLocalFrame(web_view_helper->WebView()->GetPage()->MainFrame()); DCHECK(frame); - Element* element = frame->GetDocument()->GetElementById(testcase.c_str()); + Element* element = frame->GetDocument()->getElementById(testcase.c_str()); return frame->NodeImage(*element); } void RemoveElementById(WebLocalFrameImpl* frame, const AtomicString& id) { - Element* element = frame->GetFrame()->GetDocument()->GetElementById(id); + Element* element = frame->GetFrame()->GetDocument()->getElementById(id); DCHECK(element); element->remove(); } @@ -1962,7 +1962,7 @@ WebLocalFrameImpl* frame = web_view_helper.WebView()->MainFrameImpl(); Document* document = frame->GetFrame()->GetDocument(); - Element* element = document->GetElementById("tap_button"); + Element* element = document->getElementById("tap_button"); ASSERT_NE(nullptr, element); EXPECT_EQ(String("oldValue"), element->innerText()); @@ -6520,7 +6520,7 @@ frame->SetTextCheckClient(&textcheck); Document* document = frame->GetFrame()->GetDocument(); - Element* element = document->GetElementById("data"); + Element* element = document->getElementById("data"); web_view_helper.WebView()->GetSettings()->SetEditingBehavior( WebSettings::kEditingBehaviorWin); @@ -6568,7 +6568,7 @@ frame->SetTextCheckClient(&textcheck); Document* document = frame->GetFrame()->GetDocument(); - Element* element = document->GetElementById("data"); + Element* element = document->getElementById("data"); web_view_helper.WebView()->GetSettings()->SetEditingBehavior( WebSettings::kEditingBehaviorWin); @@ -6621,7 +6621,7 @@ LocalFrame* frame = web_frame->GetFrame(); Document* document = frame->GetDocument(); - Element* element = document->GetElementById("data"); + Element* element = document->getElementById("data"); web_view_helper.WebView()->GetSettings()->SetEditingBehavior( WebSettings::kEditingBehaviorWin); @@ -6700,7 +6700,7 @@ frame->SetTextCheckClient(&textcheck); Document* document = frame->GetFrame()->GetDocument(); - Element* element = document->GetElementById("data"); + Element* element = document->getElementById("data"); web_view_helper.WebView()->GetSettings()->SetEditingBehavior( WebSettings::kEditingBehaviorWin); @@ -6741,7 +6741,7 @@ frame->SetTextCheckClient(0); Document* document = frame->GetFrame()->GetDocument(); - Element* element = document->GetElementById("data"); + Element* element = document->getElementById("data"); web_view_helper.WebView()->GetSettings()->SetEditingBehavior( WebSettings::kEditingBehaviorWin); @@ -6762,7 +6762,7 @@ frame->SetTextCheckClient(&textcheck); Document* document = frame->GetFrame()->GetDocument(); - Element* element = document->GetElementById("data"); + Element* element = document->getElementById("data"); web_view_helper.WebView()->GetSettings()->SetEditingBehavior( WebSettings::kEditingBehaviorWin); @@ -6802,7 +6802,7 @@ frame->SetTextCheckClient(&textcheck); Document* document = frame->GetFrame()->GetDocument(); - Element* element = document->GetElementById("data"); + Element* element = document->getElementById("data"); web_view_helper.WebView()->GetSettings()->SetEditingBehavior( WebSettings::kEditingBehaviorWin); @@ -7798,10 +7798,10 @@ web_view_helper.Resize(WebSize(100, 100)); Document* document = web_view->MainFrameImpl()->GetFrame()->GetDocument(); - Element* bottom_fixed = document->GetElementById("bottom-fixed"); - Element* top_bottom_fixed = document->GetElementById("top-bottom-fixed"); - Element* right_fixed = document->GetElementById("right-fixed"); - Element* left_right_fixed = document->GetElementById("left-right-fixed"); + Element* bottom_fixed = document->getElementById("bottom-fixed"); + Element* top_bottom_fixed = document->getElementById("top-bottom-fixed"); + Element* right_fixed = document->getElementById("right-fixed"); + Element* left_right_fixed = document->getElementById("left-right-fixed"); // The layout viewport will hit the min-scale limit of 0.25, so it'll be // 400x800. @@ -7944,7 +7944,7 @@ Document* document = web_view_impl->MainFrameImpl()->GetFrame()->GetDocument(); UserGestureIndicator gesture(DocumentUserGestureToken::Create(document)); - Element* div_fullscreen = document->GetElementById("div1"); + Element* div_fullscreen = document->getElementById("div1"); Fullscreen::RequestFullscreen(*div_fullscreen); EXPECT_EQ(nullptr, Fullscreen::CurrentFullScreenElementFrom(*document)); EXPECT_EQ(div_fullscreen, Fullscreen::FullscreenElementFrom(*document)); @@ -7987,7 +7987,7 @@ Document* document = web_view_impl->MainFrameImpl()->GetFrame()->GetDocument(); UserGestureIndicator gesture(DocumentUserGestureToken::Create(document)); - Element* div_fullscreen = document->GetElementById("div1"); + Element* div_fullscreen = document->getElementById("div1"); Fullscreen::RequestFullscreen(*div_fullscreen); EXPECT_EQ(nullptr, Fullscreen::CurrentFullScreenElementFrom(*document)); EXPECT_EQ(div_fullscreen, Fullscreen::FullscreenElementFrom(*document)); @@ -8107,7 +8107,7 @@ ->GetFrame() ->GetDocument(); UserGestureIndicator gesture(DocumentUserGestureToken::Create(document)); - Element* div_fullscreen = document->GetElementById("div1"); + Element* div_fullscreen = document->getElementById("div1"); Fullscreen::RequestFullscreen(*div_fullscreen); web_view_impl->DidEnterFullscreen(); web_view_impl->UpdateAllLifecyclePhases(); @@ -8439,7 +8439,7 @@ web_view_impl->MainFrameImpl()->GetFrame()->GetDocument(); UserGestureIndicator gesture(DocumentUserGestureToken::Create(document)); HTMLVideoElement* video = - toHTMLVideoElement(document->GetElementById("video")); + toHTMLVideoElement(document->getElementById("video")); EXPECT_TRUE(video->UsesOverlayFullscreenVideo()); EXPECT_FALSE(video->IsFullscreen()); EXPECT_FALSE(layer_tree_view.has_transparent_background); @@ -8468,12 +8468,12 @@ Document* document = web_view->MainFrameImpl()->GetFrame()->GetDocument(); LayoutBlock* container = - ToLayoutBlock(document->GetElementById("container")->GetLayoutObject()); + ToLayoutBlock(document->getElementById("container")->GetLayoutObject()); LayoutBox* percent_height_in_anonymous = - ToLayoutBox(document->GetElementById("percent-height-in-anonymous") + ToLayoutBox(document->getElementById("percent-height-in-anonymous") ->GetLayoutObject()); LayoutBox* percent_height_direct_child = - ToLayoutBox(document->GetElementById("percent-height-direct-child") + ToLayoutBox(document->getElementById("percent-height-direct-child") ->GetLayoutObject()); EXPECT_TRUE( @@ -9764,7 +9764,7 @@ ConfigureAndroid); LocalFrame* frame = ToLocalFrame(web_view_helper.WebView()->GetPage()->MainFrame()); - Element* element = frame->GetDocument()->GetElementById("test"); + Element* element = frame->GetDocument()->getElementById("test"); ASSERT_TRUE(element); client.screen_info_.rect = WebRect(0, 0, 700, 500); @@ -11020,7 +11020,7 @@ Document* document = web_view->MainFrameImpl()->GetFrame()->GetDocument(); FrameView* frame_view = web_view->MainFrameImpl()->GetFrameView(); - Element* scroller = document->GetElementById("scroller"); + Element* scroller = document->getElementById("scroller"); ScrollableArea* scroller_area = ToLayoutBox(scroller->GetLayoutObject())->GetScrollableArea(); @@ -11094,7 +11094,7 @@ web_view->UpdateAllLifecyclePhases(); Document* document = web_view->MainFrameImpl()->GetFrame()->GetDocument(); - Element* div1_tag = document->GetElementById("div1"); + Element* div1_tag = document->getElementById("div1"); HitTestResult hit_test_result = web_view->CoreHitTestResultAt( WebPoint(div1_tag->OffsetLeft() + 5, div1_tag->OffsetTop() + 5)); @@ -11119,7 +11119,7 @@ div1_tag, document->GetFrame()->GetChromeClient().LastSetTooltipNodeForTesting()); - Element* div2_tag = document->GetElementById("div2"); + Element* div2_tag = document->getElementById("div2"); WebMouseEvent mouse_move_event( WebInputEvent::kMouseMove, @@ -11161,7 +11161,7 @@ web_view->UpdateAllLifecyclePhases(); Document* document = web_view->MainFrameImpl()->GetFrame()->GetDocument(); - Element* a_tag = document->GetElementById("a"); + Element* a_tag = document->getElementById("a"); // Ensure hittest only has scrollbar. HitTestResult hit_test_result = @@ -11270,7 +11270,7 @@ Document* document = ToLocalFrame(web_view->GetPage()->MainFrame())->GetDocument(); - Element* scrollbar_div = document->GetElementById("scrollbar"); + Element* scrollbar_div = document->getElementById("scrollbar"); EXPECT_TRUE(scrollbar_div); // Ensure hittest only has DIV @@ -11327,7 +11327,7 @@ Document* document = ToLocalFrame(web_view->GetPage()->MainFrame())->GetDocument(); - Element* iframe = document->GetElementById("iframe"); + Element* iframe = document->getElementById("iframe"); DCHECK(iframe); // Ensure hittest only has IFRAME. @@ -11404,8 +11404,8 @@ Document* document = ToLocalFrame(web_view->GetPage()->MainFrame())->GetDocument(); - Element* parent_div = document->GetElementById("parent"); - Element* child_div = document->GetElementById("child"); + Element* parent_div = document->getElementById("parent"); + Element* child_div = document->getElementById("child"); EXPECT_TRUE(parent_div); EXPECT_TRUE(child_div); @@ -11487,7 +11487,7 @@ Document* document = ToLocalFrame(web_view->GetPage()->MainFrame())->GetDocument(); - Element* scrollbar_div = document->GetElementById("scrollbar"); + Element* scrollbar_div = document->getElementById("scrollbar"); EXPECT_TRUE(scrollbar_div); ScrollableArea* scrollable_area = @@ -11609,7 +11609,7 @@ WebLocalFrameImpl* frame = web_view_helper.WebView()->MainFrameImpl(); Document* document = ToLocalFrame(web_view_impl->GetPage()->MainFrame())->GetDocument(); - Element* container = document->GetElementById("container"); + Element* container = document->getElementById("container"); ScrollableArea* scrollable_area = ToLayoutBox(container->GetLayoutObject())->GetScrollableArea();
diff --git a/third_party/WebKit/Source/web/tests/WebViewTest.cpp b/third_party/WebKit/Source/web/tests/WebViewTest.cpp index 3fce7fb..928873a 100644 --- a/third_party/WebKit/Source/web/tests/WebViewTest.cpp +++ b/third_party/WebKit/Source/web/tests/WebViewTest.cpp
@@ -1774,7 +1774,7 @@ // Enter fullscreen. Document* document = web_view_impl->MainFrameImpl()->GetFrame()->GetDocument(); - Element* element = document->GetElementById("fullscreenElement"); + Element* element = document->getElementById("fullscreenElement"); UserGestureIndicator gesture(DocumentUserGestureToken::Create(document)); Fullscreen::RequestFullscreen(*element); web_view_impl->DidEnterFullscreen(); @@ -1814,7 +1814,7 @@ // Enter fullscreen. Document* document = web_view_impl->MainFrameImpl()->GetFrame()->GetDocument(); - Element* element = document->GetElementById("fullscreenElement"); + Element* element = document->getElementById("fullscreenElement"); UserGestureIndicator gesture(DocumentUserGestureToken::Create(document)); Fullscreen::RequestFullscreen(*element); web_view_impl->DidEnterFullscreen(); @@ -1880,7 +1880,7 @@ EXPECT_EQ(1.0f, web_view_impl->PageScaleFactor()); // Make sure fullscreen nesting doesn't disrupt scroll/scale saving. - Element* other_element = document->GetElementById("content"); + Element* other_element = document->getElementById("content"); Fullscreen::RequestFullscreen(*other_element); // Confirm that exiting fullscreen restores the parameters. @@ -2946,7 +2946,7 @@ HTMLInputElement* input_element; - input_element = toHTMLInputElement(document->GetElementById("date")); + input_element = toHTMLInputElement(document->getElementById("date")); OpenDateTimeChooser(web_view_impl, input_element); client.ChooserCompletion()->DidChooseValue(0); client.ClearChooserCompletion(); @@ -2958,7 +2958,7 @@ client.ClearChooserCompletion(); EXPECT_STREQ("", input_element->value().Utf8().data()); - input_element = toHTMLInputElement(document->GetElementById("datetimelocal")); + input_element = toHTMLInputElement(document->getElementById("datetimelocal")); OpenDateTimeChooser(web_view_impl, input_element); client.ChooserCompletion()->DidChooseValue(0); client.ClearChooserCompletion(); @@ -2970,7 +2970,7 @@ client.ClearChooserCompletion(); EXPECT_STREQ("", input_element->value().Utf8().data()); - input_element = toHTMLInputElement(document->GetElementById("month")); + input_element = toHTMLInputElement(document->getElementById("month")); OpenDateTimeChooser(web_view_impl, input_element); client.ChooserCompletion()->DidChooseValue(0); client.ClearChooserCompletion(); @@ -2982,7 +2982,7 @@ client.ClearChooserCompletion(); EXPECT_STREQ("", input_element->value().Utf8().data()); - input_element = toHTMLInputElement(document->GetElementById("time")); + input_element = toHTMLInputElement(document->getElementById("time")); OpenDateTimeChooser(web_view_impl, input_element); client.ChooserCompletion()->DidChooseValue(0); client.ClearChooserCompletion(); @@ -2994,7 +2994,7 @@ client.ClearChooserCompletion(); EXPECT_STREQ("", input_element->value().Utf8().data()); - input_element = toHTMLInputElement(document->GetElementById("week")); + input_element = toHTMLInputElement(document->getElementById("week")); OpenDateTimeChooser(web_view_impl, input_element); client.ChooserCompletion()->DidChooseValue(0); client.ClearChooserCompletion(); @@ -3292,7 +3292,7 @@ EXPECT_EQ(0, client.GetAndResetHasTouchEventHandlerCallCount(true)); // Adding a handler on a div results in a has-handlers call. - Element* parent_div = document->GetElementById("parentdiv"); + Element* parent_div = document->getElementById("parentdiv"); DCHECK(parent_div); registry->DidAddEventHandler(*parent_div, kTouchEvent); EXPECT_EQ(0, client.GetAndResetHasTouchEventHandlerCallCount(false)); @@ -3325,11 +3325,11 @@ EXPECT_EQ(0, client.GetAndResetHasTouchEventHandlerCallCount(true)); // Adding a handler inside of a child iframe results in a has-handlers call. - Element* child_frame = document->GetElementById("childframe"); + Element* child_frame = document->getElementById("childframe"); DCHECK(child_frame); Document* child_document = toHTMLIFrameElement(child_frame)->contentDocument(); - Element* child_div = child_document->GetElementById("childdiv"); + Element* child_div = child_document->getElementById("childdiv"); DCHECK(child_div); registry->DidAddEventHandler(*child_div, kTouchEvent); EXPECT_EQ(0, client.GetAndResetHasTouchEventHandlerCallCount(false)); @@ -3386,7 +3386,7 @@ Persistent<Document> document = web_view_impl->MainFrameImpl()->GetFrame()->GetDocument(); - Element* div = document->GetElementById("div"); + Element* div = document->getElementById("div"); EventHandlerRegistry& registry = document->GetPage()->GetEventHandlerRegistry(); @@ -3420,7 +3420,7 @@ // (A.1) Verifies autocorrect/autocomplete/spellcheck flags are Off and // autocapitalize is set to none. HTMLInputElement* input_element = - toHTMLInputElement(document->GetElementById("input")); + toHTMLInputElement(document->getElementById("input")); document->SetFocusedElement( input_element, FocusParams(SelectionBehaviorOnFocus::kNone, kWebFocusTypeNone, nullptr)); @@ -3433,7 +3433,7 @@ // (A.2) Verifies autocorrect/autocomplete/spellcheck flags are On and // autocapitalize is set to sentences. - input_element = toHTMLInputElement(document->GetElementById("input2")); + input_element = toHTMLInputElement(document->getElementById("input2")); document->SetFocusedElement( input_element, FocusParams(SelectionBehaviorOnFocus::kNone, kWebFocusTypeNone, nullptr)); @@ -3447,7 +3447,7 @@ // (B) <textarea> Verifies the default text input flags are // WebTextInputFlagAutocapitalizeSentences. HTMLTextAreaElement* text_area_element = - toHTMLTextAreaElement(document->GetElementById("textarea")); + toHTMLTextAreaElement(document->getElementById("textarea")); document->SetFocusedElement( text_area_element, FocusParams(SelectionBehaviorOnFocus::kNone, kWebFocusTypeNone, nullptr)); @@ -4199,7 +4199,7 @@ WebLocalFrameImpl* frame = web_view->MainFrameImpl(); Document* document = frame->GetFrame()->GetDocument(); - Element* vw_element = document->GetElementById("vw"); + Element* vw_element = document->getElementById("vw"); EXPECT_EQ(800, vw_element->OffsetWidth()); @@ -4244,7 +4244,7 @@ WebLocalFrameImpl* frame = web_view->MainFrameImpl(); Document* document = frame->GetFrame()->GetDocument(); - Element* div = document->GetElementById("d"); + Element* div = document->getElementById("d"); EXPECT_EQ(MakeRGB(0, 128, 0), div->GetComputedStyle()->VisitedDependentColor(CSSPropertyColor)); @@ -4280,8 +4280,8 @@ WebLocalFrameImpl* frame = web_view->MainFrameImpl(); Document* document = frame->GetFrame()->GetDocument(); - Element* t1 = document->GetElementById("t1"); - Element* t2 = document->GetElementById("t2"); + Element* t1 = document->getElementById("t1"); + Element* t2 = document->getElementById("t2"); EXPECT_EQ(400, t1->OffsetWidth()); EXPECT_EQ(400, t2->OffsetWidth());
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py index f3d5b32..e8a09100 100644 --- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py +++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
@@ -357,6 +357,7 @@ def error_handler(script_error): local_error.exit_code = script_error.exit_code + _log.warn('DISPLAY = %s', self.host.environ.get('DISPLAY', '')) output = self._executive.run_command(cmd, error_handler=error_handler) if local_error.exit_code: _log.error('System dependencies check failed.')
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux.py index 758f59f9..ed15115 100644 --- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux.py +++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux.py
@@ -27,6 +27,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import logging +import tempfile from webkitpy.layout_tests.breakpad.dump_reader_multipart import DumpReaderLinux from webkitpy.layout_tests.port import base @@ -69,6 +70,8 @@ self._original_home = None self._original_display = None self._xvfb_process = None + self._xvfb_stdout = None + self._xvfb_stderr = None def additional_driver_flag(self): flags = super(LinuxPort, self).additional_driver_flag() @@ -155,9 +158,11 @@ return _log.info('Starting Xvfb with display "%s".', display) + self._xvfb_stdout = tempfile.NamedTemporaryFile(delete=False) + self._xvfb_stderr = tempfile.NamedTemporaryFile(delete=False) self._xvfb_process = self.host.executive.popen( ['Xvfb', display, '-screen', '0', '1280x800x24', '-ac', '-dpi', '96'], - stderr=self.host.executive.DEVNULL) + stdout=self._xvfb_stdout, stderr=self._xvfb_stderr) # By setting DISPLAY here, the individual worker processes will # get the right DISPLAY. Note, if this environment could be passed @@ -169,6 +174,7 @@ # https://docs.python.org/2/library/subprocess.html#subprocess.Popen.poll if self._xvfb_process.poll() is not None: _log.warn('Failed to start Xvfb on display "%s."', display) + self._stop_xvfb() start_time = self.host.time() while self.host.time() - start_time < self.XVFB_START_TIMEOUT: @@ -197,11 +203,23 @@ def _stop_xvfb(self): if self._original_display: self.host.environ['DISPLAY'] = self._original_display - if not self._xvfb_process: - return - _log.debug('Killing Xvfb process pid %d.', self._xvfb_process.pid) - self._xvfb_process.kill() - self._xvfb_process.wait() + if self._xvfb_stdout: + self._xvfb_stdout.close() + if self._xvfb_stderr: + self._xvfb_stderr.close() + if self._xvfb_process: + _log.debug('Killing Xvfb process pid %d.', self._xvfb_process.pid) + self._xvfb_process.kill() + self._xvfb_process.wait() + if self._xvfb_stdout and self.host.filesystem.exists(self._xvfb_stdout.name): + for line in self.host.filesystem.read_text_file(self._xvfb_stdout.name).splitlines(): + _log.warn('Xvfb stdout: %s', line) + self.host.filesystem.remove(self._xvfb_stdout.name) + if self._xvfb_stderr and self.host.filesystem.exists(self._xvfb_stderr.name): + for line in self.host.filesystem.read_text_file(self._xvfb_stderr.name).splitlines(): + _log.warn('Xvfb stderr: %s', line) + self.host.filesystem.remove(self._xvfb_stderr.name) + def _path_to_driver(self, target=None):
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml index 05109eb..ed8f2031f 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml
@@ -123873,6 +123873,10 @@ label="Icons using a gray color (no favicon available)."/> <suffix name="IconsReal" label="Icons using an actual icon published by the site."/> + <suffix name="Thumbnail" + label="Not an icon but a thumbnail/screenshot of the page."/> + <suffix name="ThumbnailFailed" + label="Default gray box in place of a thumbnail/screenshot."/> <affected-histogram name="NewTabPage.MostVisited"/> <affected-histogram name="NewTabPage.SuggestionsImpression"/> </histogram_suffixes>