diff --git a/DEPS b/DEPS index 985b494..84dcfbec 100644 --- a/DEPS +++ b/DEPS
@@ -40,7 +40,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and whatever else without interference from each other. - 'skia_revision': '79a3aafc34c1a1b561f9fbb415b12cb1ff4772dd', + 'skia_revision': 'adf17dc52ff4b56720174f71a3e9507a682f8487', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other.
diff --git a/ash/accelerators/accelerator_controller_delegate_classic.cc b/ash/accelerators/accelerator_controller_delegate_classic.cc index abd5799..88c7ca4 100644 --- a/ash/accelerators/accelerator_controller_delegate_classic.cc +++ b/ash/accelerators/accelerator_controller_delegate_classic.cc
@@ -52,7 +52,7 @@ float scale = Shell::Get()->magnification_controller()->GetScale(); // Calculate rounded logarithm (base kMagnificationScaleFactor) of scale. int scale_index = - std::floor(std::log(scale) / std::log(kMagnificationScaleFactor) + 0.5); + std::round(std::log(scale) / std::log(kMagnificationScaleFactor)); int new_scale_index = std::max(0, std::min(8, scale_index + delta_index));
diff --git a/ash/wm/session_state_animator_impl.cc b/ash/wm/session_state_animator_impl.cc index b93756a..bbc8f01 100644 --- a/ash/wm/session_state_animator_impl.cc +++ b/ash/wm/session_state_animator_impl.cc
@@ -44,8 +44,8 @@ gfx::Size root_size = Shell::GetPrimaryRootWindow()->bounds().size(); gfx::Transform transform; transform.Translate( - floor(0.5 * (1.0 - kSlowCloseSizeRatio) * root_size.width() + 0.5), - floor(0.5 * (1.0 - kSlowCloseSizeRatio) * root_size.height() + 0.5)); + std::round(0.5 * (1.0 - kSlowCloseSizeRatio) * root_size.width()), + std::round(0.5 * (1.0 - kSlowCloseSizeRatio) * root_size.height())); transform.Scale(kSlowCloseSizeRatio, kSlowCloseSizeRatio); return transform; } @@ -56,8 +56,8 @@ gfx::Size root_size = Shell::GetPrimaryRootWindow()->bounds().size(); gfx::Transform transform; - transform.Translate(floor(0.5 * root_size.width() + 0.5), - floor(0.5 * root_size.height() + 0.5)); + transform.Translate(std::round(0.5 * root_size.width()), + std::round(0.5 * root_size.height())); transform.Scale(kMinimumScale, kMinimumScale); return transform; }
diff --git a/base/metrics/histogram.cc b/base/metrics/histogram.cc index bb3e6fa..5b38b00 100644 --- a/base/metrics/histogram.cc +++ b/base/metrics/histogram.cc
@@ -327,7 +327,7 @@ // See where the next bucket would start. log_next = log_current + log_ratio; Sample next; - next = static_cast<int>(floor(exp(log_next) + 0.5)); + next = static_cast<int>(std::round(exp(log_next))); if (next > current) current = next; else
diff --git a/cc/animation/timing_function.cc b/cc/animation/timing_function.cc index 0271c57..e0c7577c 100644 --- a/cc/animation/timing_function.cc +++ b/cc/animation/timing_function.cc
@@ -4,11 +4,11 @@ #include "cc/animation/timing_function.h" +#include <cmath> #include <memory> #include "base/logging.h" #include "base/memory/ptr_util.h" -#include "cc/base/math_util.h" namespace cc {
diff --git a/cc/base/math_util.h b/cc/base/math_util.h index d455b83..52fc6f0 100644 --- a/cc/base/math_util.h +++ b/cc/base/math_util.h
@@ -91,13 +91,6 @@ static float Deg2Rad(float deg) { return deg * kPiFloat / 180.0f; } static float Rad2Deg(float rad) { return rad * 180.0f / kPiFloat; } - static float Round(float f) { - return (f > 0.f) ? std::floor(f + 0.5f) : std::ceil(f - 0.5f); - } - static double Round(double d) { - return (d > 0.0) ? std::floor(d + 0.5) : std::ceil(d - 0.5); - } - // Returns true if rounded up value does not overflow, false otherwise. template <typename T> static bool VerifyRoundup(T n, T mul) { @@ -113,7 +106,6 @@ static T UncheckedRoundUp(T n, T mul) { static_assert(std::numeric_limits<T>::is_integer, "T must be an integer type"); - DCHECK(VerifyRoundup(n, mul)); return RoundUpInternal(n, mul); } @@ -142,7 +134,6 @@ static T UncheckedRoundDown(T n, T mul) { static_assert(std::numeric_limits<T>::is_integer, "T must be an integer type"); - DCHECK(VerifyRoundDown(n, mul)); return RoundDownInternal(n, mul); }
diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc index 6a0f3c1..3351505 100644 --- a/cc/trees/layer_tree_host_common_unittest.cc +++ b/cc/trees/layer_tree_host_common_unittest.cc
@@ -548,10 +548,9 @@ nullptr, nullptr); gfx::Transform expected_transform; gfx::PointF sub_layer_screen_position = kScrollLayerPosition - kScrollDelta; - expected_transform.Translate(MathUtil::Round(sub_layer_screen_position.x() * - page_scale * kDeviceScale), - MathUtil::Round(sub_layer_screen_position.y() * - page_scale * kDeviceScale)); + expected_transform.Translate( + std::round(sub_layer_screen_position.x() * page_scale * kDeviceScale), + std::round(sub_layer_screen_position.y() * page_scale * kDeviceScale)); expected_transform.Scale(page_scale * kDeviceScale, page_scale * kDeviceScale); EXPECT_TRANSFORMATION_MATRIX_EQ(expected_transform, @@ -570,12 +569,10 @@ nullptr, nullptr); expected_transform.MakeIdentity(); expected_transform.Translate( - MathUtil::Round(kTranslateX * page_scale * kDeviceScale + - sub_layer_screen_position.x() * page_scale * - kDeviceScale), - MathUtil::Round(kTranslateY * page_scale * kDeviceScale + - sub_layer_screen_position.y() * page_scale * - kDeviceScale)); + std::round(kTranslateX * page_scale * kDeviceScale + + sub_layer_screen_position.x() * page_scale * kDeviceScale), + std::round(kTranslateY * page_scale * kDeviceScale + + sub_layer_screen_position.y() * page_scale * kDeviceScale)); expected_transform.Scale(page_scale * kDeviceScale, page_scale * kDeviceScale); EXPECT_TRANSFORMATION_MATRIX_EQ(expected_transform, @@ -595,12 +592,10 @@ expected_transform.MakeIdentity(); expected_transform.Translate( - MathUtil::Round(kTranslateX * page_scale * kDeviceScale + - sub_layer_screen_position.x() * page_scale * - kDeviceScale), - MathUtil::Round(kTranslateY * page_scale * kDeviceScale + - sub_layer_screen_position.y() * page_scale * - kDeviceScale)); + std::round(kTranslateX * page_scale * kDeviceScale + + sub_layer_screen_position.x() * page_scale * kDeviceScale), + std::round(kTranslateY * page_scale * kDeviceScale + + sub_layer_screen_position.y() * page_scale * kDeviceScale)); expected_transform.Scale(page_scale * kDeviceScale, page_scale * kDeviceScale); EXPECT_TRANSFORMATION_MATRIX_EQ(expected_transform,
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/permissions/PermissionDialogController.java b/chrome/android/java/src/org/chromium/chrome/browser/permissions/PermissionDialogController.java index 301ae64..5c96d3e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/permissions/PermissionDialogController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/permissions/PermissionDialogController.java
@@ -238,12 +238,20 @@ String messageText = delegate.getMessageText(); String linkText = delegate.getLinkText(); - if (!TextUtils.isEmpty(messageText)) fullString.append(messageText); + assert !TextUtils.isEmpty(messageText); + // TODO(timloh): Currently the strings are shared with infobars, so we for now manually + // remove the full stop (this code catches most but not all languages). Update the strings + // after removing the infobar path. + if (TextUtils.isEmpty(linkText) + && (messageText.endsWith(".") || messageText.endsWith("。"))) { + messageText = messageText.substring(0, messageText.length() - 1); + } - // If the linkText exists, then wrap it in a clickable span and concatenate it with the main - // dialog message. + fullString.append(messageText); if (!TextUtils.isEmpty(linkText)) { - if (fullString.length() > 0) fullString.append(" "); + // If the linkText exists, then wrap it in a clickable span and concatenate it with the + // main dialog message. + fullString.append(" "); int spanStart = fullString.length(); fullString.append(linkText);
diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp index ce13c168..4dc2e22c 100644 --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp
@@ -914,9 +914,24 @@ <message name="IDS_SETTINGS_CLEAR_FOLLOWING_ITEMS_FROM" desc="Label at the top of the client area of the dialog, preceding the period combo box"> Clear the following items from </message> + <message name="IDS_SETTINGS_CLEAR_PERIOD_TITLE" desc="Label of the dropdown that selects the time range for which browsing data will be deleted."> + Time range + </message> <message name="IDS_SETTINGS_CLEAR_BROWSING_HISTORY" desc="Checkbox for deleting Browsing History"> Browsing history </message> + <message name="IDS_SETTINGS_CLEAR_COOKIES_AND_SITE_DATA_SUMMARY_BASIC" desc="A summary for the 'Cookies and site data' option in the 'Clear Browsing Data' screen, explaining that deleting cookies and site data will sign the user out of most websites."> + Signs you out of most sites. + </message> + <message name="IDS_SETTINGS_CLEAR_BROWSING_HISTORY_SUMMARY" desc="A subtext for the basic tab explaining browsing history."> + Clears history and autocompletions in the address bar. + </message> + <message name="IDS_SETTINGS_CLEAR_BROWSING_HISTORY_SUMMARY_SIGNED_IN" desc="A description explaining other forms of activity for signed in users."> + Clears history and autocompletions in the address bar. Your Google Account may have other forms of browsing history at <ph name="BEGIN_LINK"><a target='_blank' href='$1'></ph>myactivity.google.com<ph name="END_LINK"></a><ex></a></ex></ph>. + </message> + <message name="IDS_SETTINGS_CLEAR_BROWSING_HISTORY_SUMMARY_SYNCED" desc="A description for the basic tab explaining browsing history for users with history sync."> + Clears history from all signed-in devices. Your Google Account may have other forms of browsing history at <ph name="BEGIN_LINK"><a target='_blank' href='$1'></ph>myactivity.google.com<ph name="END_LINK"></a><ex></a></ex></ph>. + </message> <message name="IDS_SETTINGS_CLEAR_DOWNLOAD_HISTORY" desc="Checkbox for deleting Download History"> Download history </message> @@ -935,6 +950,9 @@ <message name="IDS_SETTINGS_CLEAR_FORM_DATA" desc="Checkbox for deleting form data saved for Autofill"> Autofill form data </message> + <message name="IDS_SETTINGS_CLEAR_SITE_SETTINGS" desc="Checkbox for deleting site settings"> + Site settings + </message> <message name="IDS_SETTINGS_CLEAR_HOSTED_APP_DATA" desc="Checkbox for deleting data of hosted apps"> Hosted app data </message> @@ -956,6 +974,21 @@ <message name="IDS_SETTINGS_CLEAR_DATA_EVERYTHING" desc="deletion period combo box: everything. In English this finishes the sentence that starts with 'Delete the following items from'."> the beginning of time </message> + <message name="IDS_SETTINGS_CLEAR_PERIOD_HOUR" desc="The option to delete browsing data from the last hour."> + Last hour + </message> + <message name="IDS_SETTINGS_CLEAR_PERIOD_24_HOURS" desc="The option to delete browsing data from the last 24 hours."> + Last 24 hours + </message> + <message name="IDS_SETTINGS_CLEAR_PERIOD_7_DAYS" desc="The option to delete browsing data from the last seven days."> + Last 7 days + </message> + <message name="IDS_SETTINGS_CLEAR_PERIOD_FOUR_WEEKS" desc="The option to delete browsing data from the last 4 weeks."> + Last 4 weeks + </message> + <message name="IDS_SETTINGS_CLEAR_PERIOD_EVERYTHING" desc="The option to delete browsing data from the beginning of time."> + All time + </message> <message name="IDS_SETTINGS_CLEAR_DATA_SOME_STUFF_REMAINS" desc="A text shown at the bottom of the Clear Browsing Data dialog, informing the user that some data types will not be cleared."> Some settings that may reflect browsing habits will not be cleared. </message>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 1a57217..4d81caa 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -2676,11 +2676,9 @@ {"important-sites-in-cbd", flag_descriptions::kImportantSitesInCbdName, flag_descriptions::kImportantSitesInCbdDescription, kOsAll, FEATURE_VALUE_TYPE(features::kImportantSitesInCbd)}, -#if defined(OS_ANDROID) {"tabs-in-cbd", flag_descriptions::kTabsInCbdName, - flag_descriptions::kTabsInCbdDescription, kOsAndroid, + flag_descriptions::kTabsInCbdDescription, kOsAll, FEATURE_VALUE_TYPE(features::kTabsInCbd)}, -#endif // OS_ANDROID {"passive-listener-default", flag_descriptions::kPassiveEventListenerDefaultName, flag_descriptions::kPassiveEventListenerDefaultDescription, kOsAll, @@ -3475,6 +3473,13 @@ kOsDesktop, // TODO(peria): Add Android support. FEATURE_VALUE_TYPE(features::kV8ContextSnapshot)}, +#if defined(OS_CHROMEOS) + {"enable-pixel-canvas-recording", + flag_descriptions::kEnablePixelCanvasRecordingName, + flag_descriptions::kEnablePixelCanvasRecordingDescription, kOsCrOS, + FEATURE_VALUE_TYPE(features::kEnablePixelCanvasRecording)}, +#endif + // NOTE: Adding new command-line switches requires adding corresponding // entries to enum "LoginCustomFlags" in histograms/enums.xml. See note in // enums.xml and don't forget to run AboutFlagsHistogramTest unit test.
diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc index 13a5135..433f61b 100644 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -206,22 +206,34 @@ // Clear browsing data settings. (*s_whitelist)[browsing_data::prefs::kDeleteBrowsingHistory] = settings_private::PrefType::PREF_TYPE_BOOLEAN; + (*s_whitelist)[browsing_data::prefs::kDeleteBrowsingHistoryBasic] = + settings_private::PrefType::PREF_TYPE_BOOLEAN; (*s_whitelist)[browsing_data::prefs::kDeleteDownloadHistory] = settings_private::PrefType::PREF_TYPE_BOOLEAN; (*s_whitelist)[browsing_data::prefs::kDeleteCache] = settings_private::PrefType::PREF_TYPE_BOOLEAN; + (*s_whitelist)[browsing_data::prefs::kDeleteCacheBasic] = + settings_private::PrefType::PREF_TYPE_BOOLEAN; (*s_whitelist)[browsing_data::prefs::kDeleteCookies] = settings_private::PrefType::PREF_TYPE_BOOLEAN; + (*s_whitelist)[browsing_data::prefs::kDeleteCookiesBasic] = + settings_private::PrefType::PREF_TYPE_BOOLEAN; (*s_whitelist)[browsing_data::prefs::kDeletePasswords] = settings_private::PrefType::PREF_TYPE_BOOLEAN; (*s_whitelist)[browsing_data::prefs::kDeleteFormData] = settings_private::PrefType::PREF_TYPE_BOOLEAN; + (*s_whitelist)[browsing_data::prefs::kDeleteSiteSettings] = + settings_private::PrefType::PREF_TYPE_BOOLEAN; (*s_whitelist)[browsing_data::prefs::kDeleteHostedAppsData] = settings_private::PrefType::PREF_TYPE_BOOLEAN; (*s_whitelist)[browsing_data::prefs::kDeleteMediaLicenses] = settings_private::PrefType::PREF_TYPE_BOOLEAN; (*s_whitelist)[browsing_data::prefs::kDeleteTimePeriod] = settings_private::PrefType::PREF_TYPE_NUMBER; + (*s_whitelist)[browsing_data::prefs::kDeleteTimePeriodBasic] = + settings_private::PrefType::PREF_TYPE_NUMBER; + (*s_whitelist)[browsing_data::prefs::kLastClearBrowsingDataTab] = + settings_private::PrefType::PREF_TYPE_NUMBER; #if defined(OS_CHROMEOS) // Accounts / Users / People.
diff --git a/chrome/browser/extensions/convert_web_app.cc b/chrome/browser/extensions/convert_web_app.cc index 80cedb3..8e5788e 100644 --- a/chrome/browser/extensions/convert_web_app.cc +++ b/chrome/browser/extensions/convert_web_app.cc
@@ -7,7 +7,6 @@ #include <stddef.h> #include <stdint.h> -#include <cmath> #include <limits> #include <memory> #include <string> @@ -37,6 +36,7 @@ #include "extensions/common/manifest_constants.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h" +#include "ui/gfx/geometry/safe_integer_conversions.h" #include "url/gurl.h" namespace extensions { @@ -128,14 +128,12 @@ (create_time_exploded.minute * Time::kMicrosecondsPerMinute) + (create_time_exploded.hour * Time::kMicrosecondsPerHour)); double day_fraction = micros / Time::kMicrosecondsPerDay; - double stamp = day_fraction * std::numeric_limits<uint16_t>::max(); + int stamp = + gfx::ToRoundedInt(day_fraction * std::numeric_limits<uint16_t>::max()); - // Ghetto-round, since VC++ doesn't have round(). - stamp = stamp >= (floor(stamp) + 0.5) ? (stamp + 1) : stamp; - - return base::StringPrintf( - "%i.%i.%i.%i", create_time_exploded.year, create_time_exploded.month, - create_time_exploded.day_of_month, static_cast<uint16_t>(stamp)); + return base::StringPrintf("%i.%i.%i.%i", create_time_exploded.year, + create_time_exploded.month, + create_time_exploded.day_of_month, stamp); } scoped_refptr<Extension> ConvertWebAppToExtension(
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc index a46624d1..8559a63 100644 --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -436,6 +436,12 @@ const char kEnablePictureInPictureDescription[] = "Enable the picture in picture feature for videos."; +const char kEnablePixelCanvasRecordingName[] = "Enable pixel canvas recording"; +const char kEnablePixelCanvasRecordingDescription[] = + "Pixel canvas recording allows the compositor to raster contents aligned " + "with the pixel and improves text rendering. This should be enabled when a " + "device is using fractional scale factor."; + const char kEnableTokenBindingName[] = "Token Binding."; const char kEnableTokenBindingDescription[] = "Enable Token Binding support."; @@ -1267,6 +1273,10 @@ "mute controls. This also adds commands in the tab context menu for " "quickly muting multiple selected tabs."; +const char kTabsInCbdName[] = "Enable tabs for the Clear Browsing Data dialog."; +const char kTabsInCbdDescription[] = + "Enables a basic and an advanced tab for the Clear Browsing Data dialog."; + const char kTcpFastOpenName[] = "TCP Fast Open"; const char kTcpFastOpenDescription[] = "Enable the option to send extra authentication information in the initial " @@ -1954,10 +1964,6 @@ "A new type of inline autocomplete for the omnibox that works with " "keyboards that compose text."; -const char kTabsInCbdName[] = "Enable tabs for the Clear Browsing Data dialog."; -const char kTabsInCbdDescription[] = - "Enables a basic and an advanced tab for the Clear Browsing Data dialog."; - const char kTranslateCompactUIName[] = "New Translate Infobar"; const char kTranslateCompactUIDescription[] = "Enable the new Translate compact infobar UI.";
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h index 19ed2368..8a1e956 100644 --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -285,6 +285,9 @@ extern const char kEnablePictureInPictureName[]; extern const char kEnablePictureInPictureDescription[]; +extern const char kEnablePixelCanvasRecordingName[]; +extern const char kEnablePixelCanvasRecordingDescription[]; + extern const char kEnableTokenBindingName[]; extern const char kEnableTokenBindingDescription[]; @@ -789,6 +792,9 @@ extern const char kTabAudioMutingName[]; extern const char kTabAudioMutingDescription[]; +extern const char kTabsInCbdName[]; +extern const char kTabsInCbdDescription[]; + extern const char kTcpFastOpenName[]; extern const char kTcpFastOpenDescription[]; @@ -1195,9 +1201,6 @@ extern const char kSpannableInlineAutocompleteName[]; extern const char kSpannableInlineAutocompleteDescription[]; -extern const char kTabsInCbdName[]; -extern const char kTabsInCbdDescription[]; - extern const char kTranslateCompactUIName[]; extern const char kTranslateCompactUIDescription[];
diff --git a/chrome/browser/resources/chromeos/zip_archiver/cpp/compressor_archive_minizip.cc b/chrome/browser/resources/chromeos/zip_archiver/cpp/compressor_archive_minizip.cc index ef48de90..e4c32972 100644 --- a/chrome/browser/resources/chromeos/zip_archiver/cpp/compressor_archive_minizip.cc +++ b/chrome/browser/resources/chromeos/zip_archiver/cpp/compressor_archive_minizip.cc
@@ -10,6 +10,19 @@ #include "base/time/time.h" #include "ppapi/cpp/logging.h" +namespace { + +uint32_t UnixToDosdate(const int64_t datetime) { + tm tm_datetime; + localtime_r(&datetime, &tm_datetime); + + return (tm_datetime.tm_year - 80) << 25 | (tm_datetime.tm_mon + 1) << 21 | + tm_datetime.tm_mday << 16 | tm_datetime.tm_hour << 11 | + tm_datetime.tm_min << 5 | (tm_datetime.tm_sec >> 1); +} + +}; // namespace + namespace compressor_archive_functions { // Called when minizip tries to open a zip archive file. We do nothing here @@ -149,17 +162,7 @@ // Fill zipfileMetadata with modification_time. zip_fileinfo zipfileMetadata; // modification_time is millisecond-based, while FromTimeT takes seconds. - base::Time tm = base::Time::FromTimeT((int64_t)modification_time / 1000); - base::Time::Exploded exploded_time = {}; - tm.LocalExplode(&exploded_time); - // TODO(yawano): fix this. - // zipfileMetadata.tmz_date.tm_sec = exploded_time.second; - // zipfileMetadata.tmz_date.tm_min = exploded_time.minute; - // zipfileMetadata.tmz_date.tm_hour = exploded_time.hour; - // zipfileMetadata.tmz_date.tm_year = exploded_time.year; - // zipfileMetadata.tmz_date.tm_mday = exploded_time.day_of_month; - // Convert from 1-based to 0-based. - // zipfileMetadata.tmz_date.tm_mon = exploded_time.month - 1; + zipfileMetadata.dos_date = UnixToDosdate((int64_t)modification_time / 1000); // Section 4.4.4 http://www.pkware.com/documents/casestudies/APPNOTE.TXT // Setting the Language encoding flag so the file is told to be in utf-8.
diff --git a/chrome/browser/resources/chromeos/zip_archiver/cpp/volume_archive_minizip.cc b/chrome/browser/resources/chromeos/zip_archiver/cpp/volume_archive_minizip.cc index cfee75ed..35225e52 100644 --- a/chrome/browser/resources/chromeos/zip_archiver/cpp/volume_archive_minizip.cc +++ b/chrome/browser/resources/chromeos/zip_archiver/cpp/volume_archive_minizip.cc
@@ -14,6 +14,23 @@ #include "base/time/time.h" #include "ppapi/cpp/logging.h" +namespace { + +base::Time::Exploded ExplodeDosdate(uint32_t dos_timedate) { + base::Time::Exploded exploded_time = {}; + exploded_time.year = 1980 + ((dos_timedate >> 25) & 0x7f); + exploded_time.month = (dos_timedate >> 21) & 0x0f; + exploded_time.day_of_month = (dos_timedate >> 16) & 0x1f; + exploded_time.hour = (dos_timedate >> 11) & 0x1f; + exploded_time.minute = (dos_timedate >> 5) & 0x3f; + exploded_time.second = (dos_timedate & 0x1f) << 1; + exploded_time.millisecond = 0; + + return exploded_time; +} + +}; // namespace + namespace volume_archive_functions { void* CustomArchiveOpen(void* archive, const char* /* filename */, @@ -263,21 +280,11 @@ // Construct the last modified time. The timezone info is not present in // zip files. By default, the time is set as local time in zip format. - base::Time::Exploded exploded_time = {}; // Zero-clear. - // exploded_time.year = raw_file_info.tmu_date.tm_year; - // The month in zip file is 0-based, whereas ours is 1-based. - // TODO(yawano): fix this. - // exploded_time.month = raw_file_info.tmu_date.tm_mon + 1; - // exploded_time.day_of_month = raw_file_info.tmu_date.tm_mday; - // exploded_time.hour = raw_file_info.tmu_date.tm_hour; - // exploded_time.minute = raw_file_info.tmu_date.tm_min; - // exploded_time.second = raw_file_info.tmu_date.tm_sec; - // exploded_time.millisecond = 0; - base::Time local_time; // If the modification time is not available, we set the value to the current // local time. - if (!base::Time::FromLocalExploded(exploded_time, &local_time)) + if (!base::Time::FromLocalExploded(ExplodeDosdate(raw_file_info.dos_date), + &local_time)) local_time = base::Time::UnixEpoch(); *modification_time = local_time.ToTimeT();
diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.js b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.js index c78b9dd..6bf142a 100644 --- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.js +++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.js
@@ -99,7 +99,8 @@ /** @override */ ready: function() { this.$.clearFrom.menuOptions = this.clearFromOptions_; - this.addWebUIListener('update-footer', this.updateFooter_.bind(this)); + this.addWebUIListener( + 'update-sync-state', this.updateSyncState_.bind(this)); this.addWebUIListener( 'update-counter-text', this.updateCounterText_.bind(this)); }, @@ -122,12 +123,13 @@ /** * Updates the footer to show only those sentences that are relevant to this * user. + * @param {boolean} signedIn Whether the user is signed in. * @param {boolean} syncing Whether the user is syncing data. * @param {boolean} otherFormsOfBrowsingHistory Whether the user has other * forms of browsing history in their account. * @private */ - updateFooter_: function(syncing, otherFormsOfBrowsingHistory) { + updateSyncState_: function(signedIn, syncing, otherFormsOfBrowsingHistory) { this.$.googleFooter.hidden = !otherFormsOfBrowsingHistory; this.$.syncedDataSentence.hidden = !syncing; this.$.clearBrowsingDataDialog.classList.add('fully-rendered');
diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_tabs.html b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_tabs.html index b991c99..3f2bf7cce 100644 --- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_tabs.html +++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_tabs.html
@@ -2,8 +2,10 @@ <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html"> <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> +<link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner.html"> +<link rel="import" href="chrome://resources/polymer/v1_0/paper-tabs/paper-tabs.html"> <link rel="import" href="../i18n_setup.html"> <link rel="import" href="clear_browsing_data_browser_proxy.html"> <link rel="import" href="history_deletion_dialog.html"> @@ -12,12 +14,23 @@ <link rel="import" href="../controls/settings_dropdown_menu.html"> <link rel="import" href="../icons.html"> <link rel="import" href="../settings_shared_css.html"> +<link rel="import" href="../settings_vars_css.html"> <!-- This file is a fork of clear_browsing_data_dialog.html until the new CBD UI is launched. --> <dom-module id="settings-clear-browsing-data-dialog-tabs"> <template> <style include="settings-shared"> + #clearBrowsingDataDialog { + --cr-dialog-top-container-min-height: 42px; + --cr-dialog-title: { + padding-bottom: 8px; + } + --cr-dialog-body-container: { + flex-grow: 1; + } + } + #clearBrowsingDataDialog:not(.fully-rendered) { visibility: hidden; } @@ -26,6 +39,16 @@ color: var(--paper-grey-600); } + #clearBrowsingDataDialog, + #importantSitesDialog { + /* Fixed height to allow multiple tabs with different height. + * The last entry in the advanced tab should show half an entry. + * crbug.com/652027 */ + --cr-dialog-body-container: { + height: 322px; + }; + } + .row { align-items: center; display: flex; @@ -43,55 +66,21 @@ --settings-row-two-line-min-height: 48px; --settings-checkbox-label: { line-height: 1.25rem; - }; + } } - #generalFooter { - margin: 0; - min-height: 18px; + paper-tabs { + --paper-tabs: { + font-size: 100%; + height: 40px; + } } - #generalFooter iron-icon { - height: 18px; - padding: 1px; - width: 18px; + .time-range-row { + margin-bottom: 4px; } - #googleFooter { - margin: 0 0 0.8em 0; - min-height: 16px; - } - - #googleFooter iron-icon { - height: 16px; - padding: 2px; - width: 16px; - } - - [slot=footer] iron-icon { - margin: auto; - } - - .clear-browsing-data-footer { - -webkit-padding-start: 4px; - align-items: flex-start; - display: flex; - line-height: 1.538em; /* 20px/13px */ - } - - .clear-browsing-data-footer .footer-text { - -webkit-margin-start: 16px; - } - - .clear-browsing-data-footer iron-icon { - flex-shrink: 0; - } - - .clear-browsing-data-footer a { - text-decoration: none; - } - - #clearFrom { + .time-range-select { -webkit-margin-start: 0.5em; /* Adjust for md-select-underline and 1px additional bottom padding * to keep md-select's text (without the underline) aligned with @@ -103,87 +92,139 @@ font-size: calc(13 / 15 * 100%); padding-top: 8px; } - - /* Cap the height on smaller screens to avoid unfavorable clipping. - * Replace the bottom margin with padding to avoid the gap between - * the scrollbar and the bottom separator. */ - @media all and (max-height: 724px) { - #clearBrowsingDataDialog { - /* crbug.com/652027: Show four and a *half* items in the list. */ - --cr-dialog-body-container: { - max-height: 280px; - }; - } - } </style> <dialog is="cr-dialog" id="clearBrowsingDataDialog" on-close="onClearBrowsingDataDialogClose_" - close-text="$i18n{close}" ignore-popstate> - <div slot="title">$i18n{clearBrowsingData} - NEW UI</div> + close-text="$i18n{close}" ignore-popstate has-tabs> + <div slot="title"> + <div>$i18n{clearBrowsingData}</div> + </div> + <div slot="header"> + <paper-tabs noink + selected="{{prefs.browser.last_clear_browsing_data_tab.value}}"> + <paper-tab>$i18n{basicPageTitle}</paper-tab> + <paper-tab>$i18n{advancedPageTitle}</paper-tab> + </paper-tabs> + </div> <div slot="body"> - <div class="row"> - $i18n{clearFollowingItemsFrom} - <settings-dropdown-menu id="clearFrom" - label="$i18n{clearFollowingItemsFrom}" - pref="{{prefs.browser.clear_data.time_period}}" - menu-options="[[clearFromOptions_]]"> - </settings-dropdown-menu> - </div> - <!-- Note: whether these checkboxes are checked are ignored if deleting - history is disabled (i.e. supervised users, policy), so it's OK to - have a hidden checkbox that's also checked (as the C++ accounts for - whether a user is allowed to delete history independently). --> - <settings-checkbox id="browsingCheckbox" class="browsing-data-checkbox" - pref="{{prefs.browser.clear_data.browsing_history}}" - label="$i18n{clearBrowsingHistory}" - sub-label="[[counters_.browsing_history]]" - disabled="[[clearingInProgress_]]" - hidden="[[isSupervised_]]"> - </settings-checkbox> - <settings-checkbox id="downloadCheckbox" class="browsing-data-checkbox" - pref="{{prefs.browser.clear_data.download_history}}" - label="$i18n{clearDownloadHistory}" - sub-label="[[counters_.download_history]]" - disabled="[[clearingInProgress_]]" - hidden="[[isSupervised_]]"> - </settings-checkbox> - <settings-checkbox id="cacheCheckbox" class="browsing-data-checkbox" - pref="{{prefs.browser.clear_data.cache}}" - label="$i18n{clearCache}" - sub-label="[[counters_.cache]]" - disabled="[[clearingInProgress_]]"> - </settings-checkbox> - <settings-checkbox id="cookiesCheckbox" class="browsing-data-checkbox" - pref="{{prefs.browser.clear_data.cookies}}" - label="$i18n{clearCookies}" - sub-label="$i18n{clearCookiesCounter}" - disabled="[[clearingInProgress_]]"> - </settings-checkbox> - <settings-checkbox class="browsing-data-checkbox" - pref="{{prefs.browser.clear_data.passwords}}" - label="$i18n{clearPasswords}" - sub-label="[[counters_.passwords]]" - disabled="[[clearingInProgress_]]"> - </settings-checkbox> - <settings-checkbox class="browsing-data-checkbox" - pref="{{prefs.browser.clear_data.form_data}}" - label="$i18n{clearFormData}" - sub-label="[[counters_.form_data]]" - disabled="[[clearingInProgress_]]"> - </settings-checkbox> - <settings-checkbox class="browsing-data-checkbox" - pref="{{prefs.browser.clear_data.hosted_apps_data}}" - label="$i18n{clearHostedAppData}" - sub-label="[[counters_.hosted_apps_data]]" - disabled="[[clearingInProgress_]]"> - </settings-checkbox> - <settings-checkbox class="browsing-data-checkbox" - pref="{{prefs.browser.clear_data.media_licenses}}" - label="$i18n{clearMediaLicenses}" - sub-label="[[counters_.media_licenses]]" - disabled="[[clearingInProgress_]]"> - </settings-checkbox> + <iron-pages id="tabs" + selected="[[prefs.browser.last_clear_browsing_data_tab.value]]"> + <div id="basic-tab"> + <div class="row time-range-row"> + <span class="time-range-label"> + $i18n{clearTimeRange} + </span> + <settings-dropdown-menu id="clearFromBasic" + class="time-range-select" + label="$i18n{clearTimeRange}" + pref="{{prefs.browser.clear_data.time_period_basic}}" + menu-options="[[clearFromOptions_]]"> + </settings-dropdown-menu> + </div> + <!-- Note: whether these checkboxes are checked are ignored if + deleting history is disabled (i.e. supervised users, policy), + so it's OK to have a hidden checkbox that's also checked (as + the C++ accounts for whether a user is allowed to delete + history independently). --> + <settings-checkbox id="browsingCheckboxBasic" + pref="{{prefs.browser.clear_data.browsing_history_basic}}" + label="$i18n{clearBrowsingHistory}" + sub-label-html="[[browsingCheckboxLabel_( + isSignedIn_, isSyncingHistory_, + '$i18nPolymer{clearBrowsingHistorySummary}', + '$i18nPolymer{clearBrowsingHistorySummarySignedIn}', + '$i18nPolymer{clearBrowsingHistorySummarySynced}')]]" + disabled="[[clearingInProgress_]]" + hidden="[[isSupervised_]]"> + </settings-checkbox> + <settings-checkbox id="cookiesCheckboxBasic" + class="cookies-checkbox" + pref="{{prefs.browser.clear_data.cookies_basic}}" + label="$i18n{clearCookies}" + sub-label="$i18n{clearCookiesSummary}" + disabled="[[clearingInProgress_]]"> + </settings-checkbox> + <settings-checkbox id="cacheCheckboxBasic" + class="cache-checkbox" + pref="{{prefs.browser.clear_data.cache_basic}}" + label="$i18n{clearCache}" + sub-label="[[counters_.cache_basic]]" + disabled="[[clearingInProgress_]]"> + </settings-checkbox> + </div> + <div id="advanced-tab"> + <div class="row time-range-row"> + <span class="time-range-label"> + $i18n{clearTimeRange} + </span> + <settings-dropdown-menu id="clearFrom" + class="time-range-select" + label="$i18n{clearTimeRange}" + pref="{{prefs.browser.clear_data.time_period}}" + menu-options="[[clearFromOptions_]]"> + </settings-dropdown-menu> + </div> + <settings-checkbox id="browsingCheckbox" + pref="{{prefs.browser.clear_data.browsing_history}}" + label="$i18n{clearBrowsingHistory}" + sub-label="[[counters_.browsing_history]]" + disabled="[[clearingInProgress_]]" + hidden="[[isSupervised_]]"> + </settings-checkbox> + <settings-checkbox id="downloadCheckbox" + pref="{{prefs.browser.clear_data.download_history}}" + label="$i18n{clearDownloadHistory}" + sub-label="[[counters_.download_history]]" + disabled="[[clearingInProgress_]]" + hidden="[[isSupervised_]]"> + </settings-checkbox> + <settings-checkbox id="cookiesCheckbox" + class="cookies-checkbox" + pref="{{prefs.browser.clear_data.cookies}}" + label="$i18n{clearCookies}" + sub-label="[[counters_.cookies]]" + disabled="[[clearingInProgress_]]"> + </settings-checkbox> + <settings-checkbox id="cacheCheckbox" + class="cache-checkbox" + pref="{{prefs.browser.clear_data.cache}}" + label="$i18n{clearCache}" + sub-label="[[counters_.cache]]" + disabled="[[clearingInProgress_]]"> + </settings-checkbox> + <settings-checkbox + pref="{{prefs.browser.clear_data.passwords}}" + label="$i18n{clearPasswords}" + sub-label="[[counters_.passwords]]" + disabled="[[clearingInProgress_]]"> + </settings-checkbox> + <settings-checkbox + pref="{{prefs.browser.clear_data.form_data}}" + label="$i18n{clearFormData}" + sub-label="[[counters_.form_data]]" + disabled="[[clearingInProgress_]]"> + </settings-checkbox> + <settings-checkbox + pref="{{prefs.browser.clear_data.site_settings}}" + label="$i18n{clearSiteSettings}" + sub-label="[[counters_.site_settings]]" + disabled="[[clearingInProgress_]]"> + </settings-checkbox> + <settings-checkbox + pref="{{prefs.browser.clear_data.hosted_apps_data}}" + label="$i18n{clearHostedAppData}" + sub-label="[[counters_.hosted_apps_data]]" + disabled="[[clearingInProgress_]]"> + </settings-checkbox> + <settings-checkbox + pref="{{prefs.browser.clear_data.media_licenses}}" + label="$i18n{clearMediaLicenses}" + sub-label="[[counters_.media_licenses]]" + disabled="[[clearingInProgress_]]"> + </settings-checkbox> + </div> + </iron-pages> </div> <div slot="button-container"> <paper-spinner active="[[clearingInProgress_]]"></paper-spinner> @@ -195,22 +236,6 @@ $i18n{clearBrowsingData} </paper-button> </div> - <div slot="footer"> - <div id="googleFooter" class="clear-browsing-data-footer"> - <iron-icon icon="settings:googleg"></iron-icon> - <div class="footer-text">$i18nRaw{otherFormsOfBrowsingHistory}</div> - </div> - <div id="generalFooter" class="clear-browsing-data-footer"> - <iron-icon icon="settings:info"></iron-icon> - <div class="footer-text"> - <span id="syncedDataSentence">$i18n{clearsSyncedData}</span> - <span>$i18n{warnAboutNonClearedData}</span> - <a id="clear-browser-data-old-learn-more-link" - href="$i18n{clearBrowsingDataLearnMoreUrl}" - target="_blank">$i18n{learnMore}</a> - </div> - </div> - </div> </dialog> <template is="dom-if" if="[[showImportantSitesDialog_]]"> @@ -219,13 +244,12 @@ <div slot="title"> $i18n{clearBrowsingData} <div class="secondary"> - <template is="dom-if" - if="[[!prefs.browser.clear_data.cache.value]]"> + <span hidden$="[[showImportantSitesCacheSubtitle_]]"> $i18n{importantSitesSubtitleCookies} - </template> - <template is="dom-if" if="[[prefs.browser.clear_data.cache.value]]"> + </span> + <span hidden$="[[!showImportantSitesCacheSubtitle_]]"> $i18n{importantSitesSubtitleCookiesAndCache} - </template> + </span> </div> </div> <div slot="body">
diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_tabs.js b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_tabs.js index b0c9479a..d953e8a 100644 --- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_tabs.js +++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_tabs.js
@@ -45,11 +45,11 @@ readOnly: true, type: Array, value: [ - {value: 0, name: loadTimeData.getString('clearDataHour')}, - {value: 1, name: loadTimeData.getString('clearDataDay')}, - {value: 2, name: loadTimeData.getString('clearDataWeek')}, - {value: 3, name: loadTimeData.getString('clearData4Weeks')}, - {value: 4, name: loadTimeData.getString('clearDataEverything')}, + {value: 0, name: loadTimeData.getString('clearPeriodHour')}, + {value: 1, name: loadTimeData.getString('clearPeriod24Hours')}, + {value: 2, name: loadTimeData.getString('clearPeriod7Days')}, + {value: 3, name: loadTimeData.getString('clearPeriod4Weeks')}, + {value: 4, name: loadTimeData.getString('clearPeriodEverything')}, ], }, @@ -73,6 +73,18 @@ value: false, }, + /** @private */ + isSignedIn_: { + type: Boolean, + value: false, + }, + + /** @private */ + isSyncingHistory_: { + type: Boolean, + value: false, + }, + /** @private {!Array<ImportantSite>} */ importantSites_: { type: Array, @@ -90,7 +102,16 @@ }, /** @private */ - showImportantSitesDialog_: {type: Boolean, value: false}, + showImportantSitesDialog_: { + type: Boolean, + value: false, + }, + + /** @private */ + showImportantSitesCacheSubtitle_: { + type: Boolean, + value: false, + }, }, /** @private {settings.ClearBrowsingDataBrowserProxy} */ @@ -98,8 +119,8 @@ /** @override */ ready: function() { - this.$.clearFrom.menuOptions = this.clearFromOptions_; - this.addWebUIListener('update-footer', this.updateFooter_.bind(this)); + this.addWebUIListener( + 'update-sync-state', this.updateSyncState_.bind(this)); this.addWebUIListener( 'update-counter-text', this.updateCounterText_.bind(this)); }, @@ -120,19 +141,32 @@ }, /** - * Updates the footer to show only those sentences that are relevant to this - * user. - * @param {boolean} syncing Whether the user is syncing data. + * Updates the history description to show the relevant information + * depending on sync and signin state. + * + * @param {boolean} signedIn Whether the user is signed in. + * @param {boolean} syncing Whether the user is syncing history. * @param {boolean} otherFormsOfBrowsingHistory Whether the user has other * forms of browsing history in their account. * @private */ - updateFooter_: function(syncing, otherFormsOfBrowsingHistory) { - this.$.googleFooter.hidden = !otherFormsOfBrowsingHistory; - this.$.syncedDataSentence.hidden = !syncing; + updateSyncState_: function(signedIn, syncing, otherFormsOfBrowsingHistory) { + this.isSignedIn_ = signedIn; + this.isSyncingHistory_ = syncing; this.$.clearBrowsingDataDialog.classList.add('fully-rendered'); }, + browsingCheckboxLabel_: function( + isSignedIn, isSyncingHistory, historySummary, historySummarySigned, + historySummarySynced) { + if (isSyncingHistory) { + return historySummarySynced; + } else if (isSignedIn) { + return historySummarySigned; + } + return historySummary; + }, + /** * Updates the text of a browsing data counter corresponding to the given * preference. @@ -154,8 +188,10 @@ shouldShowImportantSites_: function() { if (!this.importantSitesFlagEnabled_) return false; - if (!this.$.cookiesCheckbox.checked) + var tab = this.$.tabs.selectedItem; + if (!tab.querySelector('.cookies-checkbox').checked) { return false; + } var haveImportantSites = this.importantSites_.length > 0; chrome.send( @@ -170,7 +206,10 @@ */ onClearBrowsingDataTap_: function() { if (this.shouldShowImportantSites_()) { + var tab = this.$.tabs.selectedItem; this.showImportantSitesDialog_ = true; + this.showImportantSitesCacheSubtitle_ = + tab.querySelector('.cache-checkbox').checked; this.$.clearBrowsingDataDialog.close(); // Show important sites dialog after dom-if is applied. this.async(function() { @@ -198,15 +237,16 @@ */ clearBrowsingData_: function() { this.clearingInProgress_ = true; + var tab = this.$.tabs.selectedItem; - var checkboxes = this.root.querySelectorAll('.browsing-data-checkbox'); + checkboxes = tab.querySelectorAll('settings-checkbox'); var dataTypes = []; checkboxes.forEach((checkbox) => { if (checkbox.checked) dataTypes.push(checkbox.pref.key); }); - var timePeriod = this.$.clearFrom.pref.value; + var timePeriod = tab.querySelector('.time-range-select').pref.value; this.browserProxy_ .clearBrowsingData(dataTypes, timePeriod, this.importantSites_)
diff --git a/chrome/browser/resources/settings/device_page/display.html b/chrome/browser/resources/settings/device_page/display.html index 03b9666..fcfd583 100644 --- a/chrome/browser/resources/settings/device_page/display.html +++ b/chrome/browser/resources/settings/device_page/display.html
@@ -28,10 +28,6 @@ padding: 0; } - :host { - --paper-tabs-selection-bar-color: var(--paper-blue-500); - } - .display-tabs { width: 100%; }
diff --git a/chrome/browser/resources/settings/settings_vars_css.html b/chrome/browser/resources/settings/settings_vars_css.html index 9efc68e9..2f5e47c 100644 --- a/chrome/browser/resources/settings/settings_vars_css.html +++ b/chrome/browser/resources/settings/settings_vars_css.html
@@ -92,5 +92,7 @@ }; --paper-input-container-underline: var(--settings-input-underline); + + --paper-tabs-selection-bar-color: var(--paper-blue-500); } </style>
diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc index 43c11e1a..a05ca74 100644 --- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -417,14 +417,20 @@ void AddClearBrowsingDataStrings(content::WebUIDataSource* html_source) { LocalizedString localized_strings[] = { {"clearFollowingItemsFrom", IDS_SETTINGS_CLEAR_FOLLOWING_ITEMS_FROM}, + {"clearTimeRange", IDS_SETTINGS_CLEAR_PERIOD_TITLE}, {"clearBrowsingHistory", IDS_SETTINGS_CLEAR_BROWSING_HISTORY}, + {"clearBrowsingHistorySummary", + IDS_SETTINGS_CLEAR_BROWSING_HISTORY_SUMMARY}, {"clearDownloadHistory", IDS_SETTINGS_CLEAR_DOWNLOAD_HISTORY}, {"clearCache", IDS_SETTINGS_CLEAR_CACHE}, {"clearCookies", IDS_SETTINGS_CLEAR_COOKIES}, + {"clearCookiesSummary", + IDS_SETTINGS_CLEAR_COOKIES_AND_SITE_DATA_SUMMARY_BASIC}, {"clearCookiesCounter", IDS_DEL_COOKIES_COUNTER}, {"clearCookiesFlash", IDS_SETTINGS_CLEAR_COOKIES_FLASH}, {"clearPasswords", IDS_SETTINGS_CLEAR_PASSWORDS}, {"clearFormData", IDS_SETTINGS_CLEAR_FORM_DATA}, + {"clearSiteSettings", IDS_SETTINGS_CLEAR_SITE_SETTINGS}, {"clearHostedAppData", IDS_SETTINGS_CLEAR_HOSTED_APP_DATA}, {"clearMediaLicenses", IDS_SETTINGS_CLEAR_MEDIA_LICENSES}, {"clearDataHour", IDS_SETTINGS_CLEAR_DATA_HOUR}, @@ -432,6 +438,11 @@ {"clearDataWeek", IDS_SETTINGS_CLEAR_DATA_WEEK}, {"clearData4Weeks", IDS_SETTINGS_CLEAR_DATA_4WEEKS}, {"clearDataEverything", IDS_SETTINGS_CLEAR_DATA_EVERYTHING}, + {"clearPeriodHour", IDS_SETTINGS_CLEAR_PERIOD_HOUR}, + {"clearPeriod24Hours", IDS_SETTINGS_CLEAR_PERIOD_24_HOURS}, + {"clearPeriod7Days", IDS_SETTINGS_CLEAR_PERIOD_7_DAYS}, + {"clearPeriod4Weeks", IDS_SETTINGS_CLEAR_PERIOD_FOUR_WEEKS}, + {"clearPeriodEverything", IDS_SETTINGS_CLEAR_PERIOD_EVERYTHING}, {"warnAboutNonClearedData", IDS_SETTINGS_CLEAR_DATA_SOME_STUFF_REMAINS}, {"clearsSyncedData", IDS_SETTINGS_CLEAR_DATA_CLEARS_SYNCED_DATA}, {"clearBrowsingDataLearnMoreUrl", IDS_SETTINGS_CLEAR_DATA_LEARN_MORE_URL}, @@ -447,6 +458,15 @@ }; html_source->AddString( + "clearBrowsingHistorySummarySignedIn", + l10n_util::GetStringFUTF16( + IDS_SETTINGS_CLEAR_BROWSING_HISTORY_SUMMARY_SIGNED_IN, + base::ASCIIToUTF16(chrome::kMyActivityUrl))); + html_source->AddString("clearBrowsingHistorySummarySynced", + l10n_util::GetStringFUTF16( + IDS_SETTINGS_CLEAR_BROWSING_HISTORY_SUMMARY_SYNCED, + base::ASCIIToUTF16(chrome::kMyActivityUrl))); + html_source->AddString( "otherFormsOfBrowsingHistory", l10n_util::GetStringFUTF16( IDS_CLEAR_BROWSING_DATA_HISTORY_FOOTER,
diff --git a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc index 598f324..5ee1717 100644 --- a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc +++ b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
@@ -21,6 +21,7 @@ #include "chrome/browser/engagement/important_sites_usage_counter.h" #include "chrome/browser/engagement/important_sites_util.h" #include "chrome/browser/history/web_history_service_factory.h" +#include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/common/channel_info.h" #include "chrome/common/chrome_features.h" @@ -28,6 +29,7 @@ #include "components/browsing_data/core/history_notice_utils.h" #include "components/browsing_data/core/pref_names.h" #include "components/prefs/pref_service.h" +#include "components/signin/core/browser/signin_manager.h" #include "content/public/browser/browsing_data_filter_builder.h" #include "content/public/browser/storage_partition.h" #include "content/public/browser/web_ui.h" @@ -42,13 +44,23 @@ // TODO(msramek): Get the list of deletion preferences from the JS side. const char* kCounterPrefs[] = { - browsing_data::prefs::kDeleteBrowsingHistory, - browsing_data::prefs::kDeleteCache, - browsing_data::prefs::kDeleteDownloadHistory, - browsing_data::prefs::kDeleteFormData, - browsing_data::prefs::kDeleteHostedAppsData, - browsing_data::prefs::kDeleteMediaLicenses, - browsing_data::prefs::kDeletePasswords, + browsing_data::prefs::kDeleteBrowsingHistory, + browsing_data::prefs::kDeleteCache, + browsing_data::prefs::kDeleteDownloadHistory, + browsing_data::prefs::kDeleteFormData, + browsing_data::prefs::kDeleteHostedAppsData, + browsing_data::prefs::kDeleteMediaLicenses, + browsing_data::prefs::kDeletePasswords, +}; + +// Additional counters for the tabbed ui. +const char* kCounterPrefsBasic[] = { + browsing_data::prefs::kDeleteCacheBasic, +}; + +const char* kCounterPrefsAdvanced[] = { + browsing_data::prefs::kDeleteCookies, + browsing_data::prefs::kDeleteSiteSettings, }; const char kRegisterableDomainField[] = "registerableDomain"; @@ -70,7 +82,11 @@ sync_service_observer_(this), show_history_footer_(false), show_history_deletion_dialog_(false), - weak_ptr_factory_(this) {} + weak_ptr_factory_(this) { + if (base::FeatureList::IsEnabled(features::kTabsInCbd)) { + browsing_data::MigratePreferencesToBasic(profile_->GetPrefs()); + } +} ClearBrowsingDataHandler::~ClearBrowsingDataHandler() { } @@ -98,8 +114,20 @@ DCHECK(counters_.empty()); for (const std::string& pref : kCounterPrefs) { - AddCounter( - BrowsingDataCounterFactory::GetForProfileAndPref(profile_, pref)); + AddCounter(BrowsingDataCounterFactory::GetForProfileAndPref(profile_, pref), + browsing_data::ClearBrowsingDataTab::ADVANCED); + } + if (base::FeatureList::IsEnabled(features::kTabsInCbd)) { + for (const std::string& pref : kCounterPrefsBasic) { + AddCounter( + BrowsingDataCounterFactory::GetForProfileAndPref(profile_, pref), + browsing_data::ClearBrowsingDataTab::BASIC); + } + for (const std::string& pref : kCounterPrefsAdvanced) { + AddCounter( + BrowsingDataCounterFactory::GetForProfileAndPref(profile_, pref), + browsing_data::ClearBrowsingDataTab::ADVANCED); + } } } @@ -127,7 +155,7 @@ std::vector<BrowsingDataType> data_type_vector; const base::ListValue* data_type_list = nullptr; CHECK(args->GetList(1, &data_type_list)); - for (const auto& type : *data_type_list) { + for (const base::Value& type : *data_type_list) { std::string pref_name; CHECK(type.GetAsString(&pref_name)); BrowsingDataType data_type = @@ -157,6 +185,10 @@ case BrowsingDataType::FORM_DATA: remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_FORM_DATA; break; + case BrowsingDataType::SITE_SETTINGS: + remove_mask |= + ChromeBrowsingDataRemoverDelegate::DATA_TYPE_CONTENT_SETTINGS; + break; case BrowsingDataType::MEDIA_LICENSES: remove_mask |= content::BrowsingDataRemover::DATA_TYPE_MEDIA_LICENSES; break; @@ -165,7 +197,6 @@ origin_mask |= content::BrowsingDataRemover::ORIGIN_TYPE_PROTECTED_WEB; break; case BrowsingDataType::BOOKMARKS: - case BrowsingDataType::SITE_SETTINGS: // Only implemented on Android. NOTREACHED(); case BrowsingDataType::NUM_TYPES: @@ -378,9 +409,16 @@ } void ClearBrowsingDataHandler::UpdateSyncState() { + auto* signin_manager = SigninManagerFactory::GetForProfile(profile_); + // TODO(dullweber): Remove "show_history_footer" attribute when the new UI + // is launched as it doesn't have this footer anymore. Instead the + // myactivity.google.com link is shown when a user is signed in or syncing. CallJavascriptFunction( - "cr.webUIListenerCallback", base::Value("update-footer"), - base::Value(sync_service_ && sync_service_->IsSyncActive()), + "cr.webUIListenerCallback", base::Value("update-sync-state"), + base::Value(signin_manager && signin_manager->IsAuthenticated()), + base::Value(sync_service_ && sync_service_->IsSyncActive() && + sync_service_->GetActiveDataTypes().Has( + syncer::HISTORY_DELETE_DIRECTIVES)), base::Value(show_history_footer_)); } @@ -422,9 +460,10 @@ } void ClearBrowsingDataHandler::AddCounter( - std::unique_ptr<browsing_data::BrowsingDataCounter> counter) { - counter->Init(profile_->GetPrefs(), - browsing_data::ClearBrowsingDataTab::ADVANCED, + std::unique_ptr<browsing_data::BrowsingDataCounter> counter, + browsing_data::ClearBrowsingDataTab tab) { + DCHECK(counter); + counter->Init(profile_->GetPrefs(), tab, base::Bind(&ClearBrowsingDataHandler::UpdateCounterText, base::Unretained(this))); counters_.push_back(std::move(counter));
diff --git a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h index 7e833071..641143c 100644 --- a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h +++ b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h
@@ -87,7 +87,8 @@ void UpdateHistoryDeletionDialog(bool show); // Adds a browsing data |counter|. - void AddCounter(std::unique_ptr<browsing_data::BrowsingDataCounter> counter); + void AddCounter(std::unique_ptr<browsing_data::BrowsingDataCounter> counter, + browsing_data::ClearBrowsingDataTab tab); // Updates a counter text according to the |result|. void UpdateCounterText(
diff --git a/chrome/browser/vr/ui_scene_manager.cc b/chrome/browser/vr/ui_scene_manager.cc index a6060e2..0939d94 100644 --- a/chrome/browser/vr/ui_scene_manager.cc +++ b/chrome/browser/vr/ui_scene_manager.cc
@@ -6,7 +6,6 @@ #include "base/callback.h" #include "base/memory/ptr_util.h" -#include "cc/base/math_util.h" #include "chrome/browser/vr/elements/button.h" #include "chrome/browser/vr/elements/close_button_texture.h" #include "chrome/browser/vr/elements/content_element.h" @@ -454,7 +453,6 @@ } void UiSceneManager::CreateBackground() { - // Background solid-color panels. struct Panel { UiElementName name;
diff --git a/chrome/browser/vr/ui_scene_unittest.cc b/chrome/browser/vr/ui_scene_unittest.cc index 10b7ef5..84efc1f 100644 --- a/chrome/browser/vr/ui_scene_unittest.cc +++ b/chrome/browser/vr/ui_scene_unittest.cc
@@ -4,8 +4,6 @@ #include "chrome/browser/vr/ui_scene.h" -#define _USE_MATH_DEFINES // For M_PI in MSVC. -#include <cmath> #include <utility> #include <vector>
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc index 54a4df2..ee7ec947 100644 --- a/chrome/common/url_constants.cc +++ b/chrome/common/url_constants.cc
@@ -528,6 +528,8 @@ "https://support.google.com/chrome/?p=settings_privacy"; #endif +extern const char kMyActivityUrl[] = "https://myactivity.google.com"; + const char kDoNotTrackLearnMoreURL[] = #if defined(OS_CHROMEOS) "https://support.google.com/chromebook/?p=settings_do_not_track";
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h index 1481f1e9..3404a231 100644 --- a/chrome/common/url_constants.h +++ b/chrome/common/url_constants.h
@@ -444,6 +444,9 @@ // "Learn more" URL for the Privacy section under Options. extern const char kPrivacyLearnMoreURL[]; +// "myactivity.google.com" URL for the history checkbox in ClearBrowsingData. +extern const char kMyActivityUrl[]; + // "Learn more" URL for the "Do not track" setting in the privacy section. extern const char kDoNotTrackLearnMoreURL[];
diff --git a/components/autofill/core/browser/webdata/autofill_table.cc b/components/autofill/core/browser/webdata/autofill_table.cc index 92ce220..3bf42b53 100644 --- a/components/autofill/core/browser/webdata/autofill_table.cc +++ b/components/autofill/core/browser/webdata/autofill_table.cc
@@ -7,7 +7,6 @@ #include <stdint.h> #include <algorithm> -#include <cmath> #include <limits> #include <map> #include <set> @@ -43,6 +42,7 @@ #include "sql/statement.h" #include "sql/transaction.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/geometry/safe_integer_conversions.h" #include "url/gurl.h" namespace autofill { @@ -61,12 +61,6 @@ int count; }; -// Rounds a positive floating point number to the nearest integer. -int Round(float f) { - DCHECK_GE(f, 0.f); - return base::checked_cast<int>(std::floor(f + 0.5f)); -} - // Returns the |data_model|'s value corresponding to the |type|, trimmed to the // maximum length that can be stored in a column of the Autofill database. base::string16 GetInfo(const AutofillDataModel& data_model, @@ -631,10 +625,10 @@ ? date_last_used_time_t : delete_begin_time_t - 1; updated_entry.count = - 1 + - Round(1.0 * (count - 1) * - (updated_entry.date_last_used - updated_entry.date_created) / - (date_last_used_time_t - date_created_time_t)); + 1 + gfx::ToRoundedInt( + 1.0 * (count - 1) * + (updated_entry.date_last_used - updated_entry.date_created) / + (date_last_used_time_t - date_created_time_t)); updates.push_back(updated_entry); }
diff --git a/components/browsing_data/core/browsing_data_utils.h b/components/browsing_data/core/browsing_data_utils.h index dff3ccd7..0a3ff6d0 100644 --- a/components/browsing_data/core/browsing_data_utils.h +++ b/components/browsing_data/core/browsing_data_utils.h
@@ -23,9 +23,9 @@ COOKIES, PASSWORDS, FORM_DATA, + SITE_SETTINGS, // Only for Android: BOOKMARKS, - SITE_SETTINGS, // Only for Desktop: DOWNLOADS, MEDIA_LICENSES,
diff --git a/components/browsing_data/core/pref_names.cc b/components/browsing_data/core/pref_names.cc index ef88d87a..87bb1f7 100644 --- a/components/browsing_data/core/pref_names.cc +++ b/components/browsing_data/core/pref_names.cc
@@ -83,10 +83,7 @@ registry->RegisterInt64Pref(prefs::kLastClearBrowsingDataTime, 0); #endif // !defined(OS_IOS) -#if defined(OS_ANDROID) registry->RegisterIntegerPref(kLastClearBrowsingDataTab, 0); -#endif - registry->RegisterBooleanPref( kPreferencesMigratedToBasic, false, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
diff --git a/components/wallpaper/wallpaper_resizer.cc b/components/wallpaper/wallpaper_resizer.cc index bd215df5..8710571a 100644 --- a/components/wallpaper/wallpaper_resizer.cc +++ b/components/wallpaper/wallpaper_resizer.cc
@@ -13,17 +13,13 @@ #include "base/task_runner.h" #include "components/wallpaper/wallpaper_resizer_observer.h" #include "third_party/skia/include/core/SkImage.h" +#include "ui/gfx/geometry/safe_integer_conversions.h" #include "ui/gfx/image/image_skia_rep.h" #include "ui/gfx/skia_util.h" namespace wallpaper { namespace { -// For our scaling ratios we need to round positive numbers. -int RoundPositive(double x) { - return static_cast<int>(floor(x + 0.5)); -} - // Resizes |image| to |target_size| using |layout| and stores the // resulting bitmap at |resized_bitmap_out|. // @@ -75,12 +71,10 @@ if (vertical_ratio > horizontal_ratio) { cropped_size = gfx::Size( - RoundPositive(static_cast<double>(new_width) / vertical_ratio), - orig_height); + gfx::ToRoundedInt(new_width / vertical_ratio), orig_height); } else { cropped_size = gfx::Size( - orig_width, RoundPositive(static_cast<double>(new_height) / - horizontal_ratio)); + orig_width, gfx::ToRoundedInt(new_height / horizontal_ratio)); } wallpaper_rect.ClampToCenteredSize(cropped_size); SkBitmap sub_image;
diff --git a/media/base/audio_converter_unittest.cc b/media/base/audio_converter_unittest.cc index c4e5ff1..b25bb65 100644 --- a/media/base/audio_converter_unittest.cc +++ b/media/base/audio_converter_unittest.cc
@@ -2,14 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// MSVC++ requires this to be set before any other includes to get M_PI. -#define _USE_MATH_DEFINES - #include "media/base/audio_converter.h" #include <stddef.h> -#include <cmath> #include <memory> #include "base/macros.h"
diff --git a/media/base/audio_renderer_mixer_unittest.cc b/media/base/audio_renderer_mixer_unittest.cc index 5fed0356..fb34254 100644 --- a/media/base/audio_renderer_mixer_unittest.cc +++ b/media/base/audio_renderer_mixer_unittest.cc
@@ -2,14 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// MSVC++ requires this to be set before any other includes to get M_PI. -#define _USE_MATH_DEFINES - #include "media/base/audio_renderer_mixer.h" #include <stddef.h> -#include <cmath> #include <memory> #include "base/bind.h"
diff --git a/media/base/channel_mixer_unittest.cc b/media/base/channel_mixer_unittest.cc index dda89865..3de5e14d 100644 --- a/media/base/channel_mixer_unittest.cc +++ b/media/base/channel_mixer_unittest.cc
@@ -163,25 +163,41 @@ static float kFiveDiscreteValues[] = { 0.1f, 0.2f, 0.3f, 0.4f, 0.5f }; // Run through basic sanity tests for some common conversions. -INSTANTIATE_TEST_CASE_P(ChannelMixerTest, ChannelMixerTest, testing::Values( - ChannelMixerTestData(CHANNEL_LAYOUT_STEREO, CHANNEL_LAYOUT_MONO, - kStereoToMonoValues, arraysize(kStereoToMonoValues), - 0.5f), - ChannelMixerTestData(CHANNEL_LAYOUT_MONO, CHANNEL_LAYOUT_STEREO, - kMonoToStereoValues, arraysize(kMonoToStereoValues), - 1.0f), - ChannelMixerTestData(CHANNEL_LAYOUT_5_1, CHANNEL_LAYOUT_MONO, - kFiveOneToMonoValues, arraysize(kFiveOneToMonoValues), - static_cast<float>(M_SQRT1_2)), - ChannelMixerTestData(CHANNEL_LAYOUT_DISCRETE, 2, - CHANNEL_LAYOUT_DISCRETE, 2, - kStereoToMonoValues, arraysize(kStereoToMonoValues)), - ChannelMixerTestData(CHANNEL_LAYOUT_DISCRETE, 2, - CHANNEL_LAYOUT_DISCRETE, 5, - kStereoToMonoValues, arraysize(kStereoToMonoValues)), - ChannelMixerTestData(CHANNEL_LAYOUT_DISCRETE, 5, - CHANNEL_LAYOUT_DISCRETE, 2, - kFiveDiscreteValues, arraysize(kFiveDiscreteValues)) -)); +INSTANTIATE_TEST_CASE_P( + ChannelMixerTest, + ChannelMixerTest, + testing::Values(ChannelMixerTestData(CHANNEL_LAYOUT_STEREO, + CHANNEL_LAYOUT_MONO, + kStereoToMonoValues, + arraysize(kStereoToMonoValues), + 0.5f), + ChannelMixerTestData(CHANNEL_LAYOUT_MONO, + CHANNEL_LAYOUT_STEREO, + kMonoToStereoValues, + arraysize(kMonoToStereoValues), + 1.0f), + ChannelMixerTestData(CHANNEL_LAYOUT_5_1, + CHANNEL_LAYOUT_MONO, + kFiveOneToMonoValues, + arraysize(kFiveOneToMonoValues), + static_cast<float>(M_SQRT1_2)), + ChannelMixerTestData(CHANNEL_LAYOUT_DISCRETE, + 2, + CHANNEL_LAYOUT_DISCRETE, + 2, + kStereoToMonoValues, + arraysize(kStereoToMonoValues)), + ChannelMixerTestData(CHANNEL_LAYOUT_DISCRETE, + 2, + CHANNEL_LAYOUT_DISCRETE, + 5, + kStereoToMonoValues, + arraysize(kStereoToMonoValues)), + ChannelMixerTestData(CHANNEL_LAYOUT_DISCRETE, + 5, + CHANNEL_LAYOUT_DISCRETE, + 2, + kFiveDiscreteValues, + arraysize(kFiveDiscreteValues)))); } // namespace media
diff --git a/media/base/vector_math_unittest.cc b/media/base/vector_math_unittest.cc index 3fcb3fa..a78bfaa 100644 --- a/media/base/vector_math_unittest.cc +++ b/media/base/vector_math_unittest.cc
@@ -2,10 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// MSVC++ requires this to be set before any other includes to get M_PI. -#define _USE_MATH_DEFINES #include <cmath> - #include <memory> #include "base/macros.h" @@ -282,109 +279,109 @@ }; INSTANTIATE_TEST_CASE_P( - Scenarios, VectorMathEWMAAndMaxPowerTest, + Scenarios, + VectorMathEWMAAndMaxPowerTest, ::testing::Values( - // Zero-length input: Result should equal initial value. - EWMATestScenario(0.0f, NULL, 0, 0.0f).HasExpectedResult(0.0f, 0.0f), - EWMATestScenario(1.0f, NULL, 0, 0.0f).HasExpectedResult(1.0f, 0.0f), + // Zero-length input: Result should equal initial value. + EWMATestScenario(0.0f, NULL, 0, 0.0f).HasExpectedResult(0.0f, 0.0f), + EWMATestScenario(1.0f, NULL, 0, 0.0f).HasExpectedResult(1.0f, 0.0f), - // Smoothing factor of zero: Samples have no effect on result. - EWMATestScenario(0.0f, kOnes, 32, 0.0f).HasExpectedResult(0.0f, 1.0f), - EWMATestScenario(1.0f, kZeros, 32, 0.0f).HasExpectedResult(1.0f, 0.0f), + // Smoothing factor of zero: Samples have no effect on result. + EWMATestScenario(0.0f, kOnes, 32, 0.0f).HasExpectedResult(0.0f, 1.0f), + EWMATestScenario(1.0f, kZeros, 32, 0.0f).HasExpectedResult(1.0f, 0.0f), - // Smothing factor of one: Result = last sample squared. - EWMATestScenario(0.0f, kCheckerboard, 32, 1.0f) - .ScaledBy(2.0f) - .HasExpectedResult(4.0f, 4.0f), - EWMATestScenario(1.0f, kInverseCheckerboard, 32, 1.0f) - .ScaledBy(2.0f) - .HasExpectedResult(0.0f, 4.0f), + // Smothing factor of one: Result = last sample squared. + EWMATestScenario(0.0f, kCheckerboard, 32, 1.0f) + .ScaledBy(2.0f) + .HasExpectedResult(4.0f, 4.0f), + EWMATestScenario(1.0f, kInverseCheckerboard, 32, 1.0f) + .ScaledBy(2.0f) + .HasExpectedResult(0.0f, 4.0f), - // Smoothing factor of 1/4, muted signal. - EWMATestScenario(1.0f, kZeros, 1, 0.25f) - .HasExpectedResult(powf(0.75, 1.0f), 0.0f), - EWMATestScenario(1.0f, kZeros, 2, 0.25f) - .HasExpectedResult(powf(0.75, 2.0f), 0.0f), - EWMATestScenario(1.0f, kZeros, 3, 0.25f) - .HasExpectedResult(powf(0.75, 3.0f), 0.0f), - EWMATestScenario(1.0f, kZeros, 12, 0.25f) - .HasExpectedResult(powf(0.75, 12.0f), 0.0f), - EWMATestScenario(1.0f, kZeros, 13, 0.25f) - .HasExpectedResult(powf(0.75, 13.0f), 0.0f), - EWMATestScenario(1.0f, kZeros, 14, 0.25f) - .HasExpectedResult(powf(0.75, 14.0f), 0.0f), - EWMATestScenario(1.0f, kZeros, 15, 0.25f) - .HasExpectedResult(powf(0.75, 15.0f), 0.0f), + // Smoothing factor of 1/4, muted signal. + EWMATestScenario(1.0f, kZeros, 1, 0.25f) + .HasExpectedResult(std::pow(0.75f, 1.0f), 0.0f), + EWMATestScenario(1.0f, kZeros, 2, 0.25f) + .HasExpectedResult(std::pow(0.75f, 2.0f), 0.0f), + EWMATestScenario(1.0f, kZeros, 3, 0.25f) + .HasExpectedResult(std::pow(0.75f, 3.0f), 0.0f), + EWMATestScenario(1.0f, kZeros, 12, 0.25f) + .HasExpectedResult(std::pow(0.75f, 12.0f), 0.0f), + EWMATestScenario(1.0f, kZeros, 13, 0.25f) + .HasExpectedResult(std::pow(0.75f, 13.0f), 0.0f), + EWMATestScenario(1.0f, kZeros, 14, 0.25f) + .HasExpectedResult(std::pow(0.75f, 14.0f), 0.0f), + EWMATestScenario(1.0f, kZeros, 15, 0.25f) + .HasExpectedResult(std::pow(0.75f, 15.0f), 0.0f), - // Smoothing factor of 1/4, constant full-amplitude signal. - EWMATestScenario(0.0f, kOnes, 1, 0.25f).HasExpectedResult(0.25f, 1.0f), - EWMATestScenario(0.0f, kOnes, 2, 0.25f) - .HasExpectedResult(0.4375f, 1.0f), - EWMATestScenario(0.0f, kOnes, 3, 0.25f) - .HasExpectedResult(0.578125f, 1.0f), - EWMATestScenario(0.0f, kOnes, 12, 0.25f) - .HasExpectedResult(0.96832365f, 1.0f), - EWMATestScenario(0.0f, kOnes, 13, 0.25f) - .HasExpectedResult(0.97624274f, 1.0f), - EWMATestScenario(0.0f, kOnes, 14, 0.25f) - .HasExpectedResult(0.98218205f, 1.0f), - EWMATestScenario(0.0f, kOnes, 15, 0.25f) - .HasExpectedResult(0.98663654f, 1.0f), + // Smoothing factor of 1/4, constant full-amplitude signal. + EWMATestScenario(0.0f, kOnes, 1, 0.25f).HasExpectedResult(0.25f, 1.0f), + EWMATestScenario(0.0f, kOnes, 2, 0.25f) + .HasExpectedResult(0.4375f, 1.0f), + EWMATestScenario(0.0f, kOnes, 3, 0.25f) + .HasExpectedResult(0.578125f, 1.0f), + EWMATestScenario(0.0f, kOnes, 12, 0.25f) + .HasExpectedResult(0.96832365f, 1.0f), + EWMATestScenario(0.0f, kOnes, 13, 0.25f) + .HasExpectedResult(0.97624274f, 1.0f), + EWMATestScenario(0.0f, kOnes, 14, 0.25f) + .HasExpectedResult(0.98218205f, 1.0f), + EWMATestScenario(0.0f, kOnes, 15, 0.25f) + .HasExpectedResult(0.98663654f, 1.0f), - // Smoothing factor of 1/4, checkerboard signal. - EWMATestScenario(0.0f, kCheckerboard, 1, 0.25f) - .HasExpectedResult(0.0f, 0.0f), - EWMATestScenario(0.0f, kCheckerboard, 2, 0.25f) - .HasExpectedResult(0.25f, 1.0f), - EWMATestScenario(0.0f, kCheckerboard, 3, 0.25f) - .HasExpectedResult(0.1875f, 1.0f), - EWMATestScenario(0.0f, kCheckerboard, 12, 0.25f) - .HasExpectedResult(0.55332780f, 1.0f), - EWMATestScenario(0.0f, kCheckerboard, 13, 0.25f) - .HasExpectedResult(0.41499585f, 1.0f), - EWMATestScenario(0.0f, kCheckerboard, 14, 0.25f) - .HasExpectedResult(0.56124689f, 1.0f), - EWMATestScenario(0.0f, kCheckerboard, 15, 0.25f) - .HasExpectedResult(0.42093517f, 1.0f), + // Smoothing factor of 1/4, checkerboard signal. + EWMATestScenario(0.0f, kCheckerboard, 1, 0.25f) + .HasExpectedResult(0.0f, 0.0f), + EWMATestScenario(0.0f, kCheckerboard, 2, 0.25f) + .HasExpectedResult(0.25f, 1.0f), + EWMATestScenario(0.0f, kCheckerboard, 3, 0.25f) + .HasExpectedResult(0.1875f, 1.0f), + EWMATestScenario(0.0f, kCheckerboard, 12, 0.25f) + .HasExpectedResult(0.55332780f, 1.0f), + EWMATestScenario(0.0f, kCheckerboard, 13, 0.25f) + .HasExpectedResult(0.41499585f, 1.0f), + EWMATestScenario(0.0f, kCheckerboard, 14, 0.25f) + .HasExpectedResult(0.56124689f, 1.0f), + EWMATestScenario(0.0f, kCheckerboard, 15, 0.25f) + .HasExpectedResult(0.42093517f, 1.0f), - // Smoothing factor of 1/4, inverse checkerboard signal. - EWMATestScenario(0.0f, kInverseCheckerboard, 1, 0.25f) - .HasExpectedResult(0.25f, 1.0f), - EWMATestScenario(0.0f, kInverseCheckerboard, 2, 0.25f) - .HasExpectedResult(0.1875f, 1.0f), - EWMATestScenario(0.0f, kInverseCheckerboard, 3, 0.25f) - .HasExpectedResult(0.390625f, 1.0f), - EWMATestScenario(0.0f, kInverseCheckerboard, 12, 0.25f) - .HasExpectedResult(0.41499585f, 1.0f), - EWMATestScenario(0.0f, kInverseCheckerboard, 13, 0.25f) - .HasExpectedResult(0.56124689f, 1.0f), - EWMATestScenario(0.0f, kInverseCheckerboard, 14, 0.25f) - .HasExpectedResult(0.42093517f, 1.0f), - EWMATestScenario(0.0f, kInverseCheckerboard, 15, 0.25f) - .HasExpectedResult(0.56570137f, 1.0f), + // Smoothing factor of 1/4, inverse checkerboard signal. + EWMATestScenario(0.0f, kInverseCheckerboard, 1, 0.25f) + .HasExpectedResult(0.25f, 1.0f), + EWMATestScenario(0.0f, kInverseCheckerboard, 2, 0.25f) + .HasExpectedResult(0.1875f, 1.0f), + EWMATestScenario(0.0f, kInverseCheckerboard, 3, 0.25f) + .HasExpectedResult(0.390625f, 1.0f), + EWMATestScenario(0.0f, kInverseCheckerboard, 12, 0.25f) + .HasExpectedResult(0.41499585f, 1.0f), + EWMATestScenario(0.0f, kInverseCheckerboard, 13, 0.25f) + .HasExpectedResult(0.56124689f, 1.0f), + EWMATestScenario(0.0f, kInverseCheckerboard, 14, 0.25f) + .HasExpectedResult(0.42093517f, 1.0f), + EWMATestScenario(0.0f, kInverseCheckerboard, 15, 0.25f) + .HasExpectedResult(0.56570137f, 1.0f), - // Smoothing factor of 1/4, impluse signal. - EWMATestScenario(0.0f, kZeros, 3, 0.25f) - .WithImpulse(2.0f, 0) - .HasExpectedResult(0.562500f, 4.0f), - EWMATestScenario(0.0f, kZeros, 3, 0.25f) - .WithImpulse(2.0f, 1) - .HasExpectedResult(0.75f, 4.0f), - EWMATestScenario(0.0f, kZeros, 3, 0.25f) - .WithImpulse(2.0f, 2) - .HasExpectedResult(1.0f, 4.0f), - EWMATestScenario(0.0f, kZeros, 32, 0.25f) - .WithImpulse(2.0f, 0) - .HasExpectedResult(0.00013394f, 4.0f), - EWMATestScenario(0.0f, kZeros, 32, 0.25f) - .WithImpulse(2.0f, 1) - .HasExpectedResult(0.00017858f, 4.0f), - EWMATestScenario(0.0f, kZeros, 32, 0.25f) - .WithImpulse(2.0f, 2) - .HasExpectedResult(0.00023811f, 4.0f), - EWMATestScenario(0.0f, kZeros, 32, 0.25f) - .WithImpulse(2.0f, 3) - .HasExpectedResult(0.00031748f, 4.0f) - )); + // Smoothing factor of 1/4, impluse signal. + EWMATestScenario(0.0f, kZeros, 3, 0.25f) + .WithImpulse(2.0f, 0) + .HasExpectedResult(0.562500f, 4.0f), + EWMATestScenario(0.0f, kZeros, 3, 0.25f) + .WithImpulse(2.0f, 1) + .HasExpectedResult(0.75f, 4.0f), + EWMATestScenario(0.0f, kZeros, 3, 0.25f) + .WithImpulse(2.0f, 2) + .HasExpectedResult(1.0f, 4.0f), + EWMATestScenario(0.0f, kZeros, 32, 0.25f) + .WithImpulse(2.0f, 0) + .HasExpectedResult(0.00013394f, 4.0f), + EWMATestScenario(0.0f, kZeros, 32, 0.25f) + .WithImpulse(2.0f, 1) + .HasExpectedResult(0.00017858f, 4.0f), + EWMATestScenario(0.0f, kZeros, 32, 0.25f) + .WithImpulse(2.0f, 2) + .HasExpectedResult(0.00023811f, 4.0f), + EWMATestScenario(0.0f, kZeros, 32, 0.25f) + .WithImpulse(2.0f, 3) + .HasExpectedResult(0.00031748f, 4.0f))); } // namespace media
diff --git a/media/capture/video/chromeos/camera_device_delegate.cc b/media/capture/video/chromeos/camera_device_delegate.cc index 0a37726..0d78fb5 100644 --- a/media/capture/video/chromeos/camera_device_delegate.cc +++ b/media/capture/video/chromeos/camera_device_delegate.cc
@@ -92,9 +92,11 @@ // CameraDeviceContext::State::kStopping. DCHECK_NE(device_context_->GetState(), CameraDeviceContext::State::kStopping); - if (device_context_->GetState() == CameraDeviceContext::State::kStopped) { + if (device_context_->GetState() == CameraDeviceContext::State::kStopped || + !stream_buffer_manager_) { // In case of Mojo connection error the device may be stopped before - // StopAndDeAllocate is called. + // StopAndDeAllocate is called; in case of device open failure, the state + // is set to kError and |stream_buffer_manager_| is uninitialized. std::move(device_close_callback).Run(); return; } @@ -151,7 +153,9 @@ OnClosed(0); } else { // The Mojo channel terminated unexpectedly. - stream_buffer_manager_->StopCapture(); + if (stream_buffer_manager_) { + stream_buffer_manager_->StopCapture(); + } device_context_->SetState(CameraDeviceContext::State::kStopped); device_context_->SetErrorState(FROM_HERE, "Mojo connection error"); ResetMojoInterface(); @@ -214,6 +218,11 @@ DCHECK(ipc_task_runner_->BelongsToCurrentThread()); if (device_context_->GetState() != CameraDeviceContext::State::kStarting) { + if (device_context_->GetState() == CameraDeviceContext::State::kError) { + // In case of camera open failed, the HAL can terminate the Mojo channel + // before we do and set the state to kError in OnMojoConnectionError. + return; + } DCHECK_EQ(device_context_->GetState(), CameraDeviceContext::State::kStopping); OnClosed(0);
diff --git a/media/capture/video/chromeos/camera_device_delegate_unittest.cc b/media/capture/video/chromeos/camera_device_delegate_unittest.cc index 6db1fa0..ad81512 100644 --- a/media/capture/video/chromeos/camera_device_delegate_unittest.cc +++ b/media/capture/video/chromeos/camera_device_delegate_unittest.cc
@@ -29,6 +29,7 @@ using testing::A; using testing::AtLeast; using testing::Invoke; +using testing::InvokeWithoutArgs; namespace media { @@ -521,4 +522,56 @@ ResetDevice(); } +// Test that the camera device delegate handles camera device open failures +// correctly. +TEST_F(CameraDeviceDelegateTest, FailToOpenDevice) { + AllocateDeviceWithDescriptor(kDefaultDescriptor); + + VideoCaptureParams params; + params.requested_format = kDefaultCaptureFormat; + + auto* mock_client = + reinterpret_cast<unittest_internal::MockVideoCaptureClient*>( + mock_client_.get()); + + auto stop_on_error = [&]() { + device_delegate_thread_.task_runner()->PostTask( + FROM_HERE, base::Bind(&CameraDeviceDelegate::StopAndDeAllocate, + camera_device_delegate_->GetWeakPtr(), + BindToCurrentLoop(base::Bind( + &CameraDeviceDelegateTest::QuitRunLoop, + base::Unretained(this))))); + }; + EXPECT_CALL(*mock_client, OnError(_, _)) + .Times(AtLeast(1)) + .WillOnce(InvokeWithoutArgs(stop_on_error)); + + EXPECT_CALL(mock_camera_module_, DoGetCameraInfo(0, _)) + .Times(1) + .WillOnce(Invoke(this, &CameraDeviceDelegateTest::GetFakeCameraInfo)); + + auto open_device_with_error_cb = + [](int32_t camera_id, + arc::mojom::Camera3DeviceOpsRequest& device_ops_request, + base::OnceCallback<void(int32_t)>& callback) { + std::move(callback).Run(-ENODEV); + device_ops_request.ResetWithReason(-ENODEV, + "Failed to open camera device"); + }; + EXPECT_CALL(mock_camera_module_, DoOpenDevice(0, _, _)) + .Times(1) + .WillOnce(Invoke(open_device_with_error_cb)); + + device_delegate_thread_.task_runner()->PostTask( + FROM_HERE, base::Bind(&CameraDeviceDelegate::AllocateAndStart, + camera_device_delegate_->GetWeakPtr(), params, + base::Passed(&mock_client_))); + + // Wait unitl |camera_device_delegate_->StopAndDeAllocate| calls the + // QuitRunLoop callback. + DoLoop(); + + ResetDevice(); +} + } // namespace media
diff --git a/pdf/out_of_process_instance.cc b/pdf/out_of_process_instance.cc index fb0e1d7..657b5ba 100644 --- a/pdf/out_of_process_instance.cc +++ b/pdf/out_of_process_instance.cc
@@ -7,10 +7,8 @@ #include <stddef.h> #include <stdint.h> -#include <algorithm> // for min/max() -#define _USE_MATH_DEFINES // for M_PI -#include <math.h> -#include <cmath> // for log() and pow() +#include <algorithm> // for min/max() +#include <cmath> // for log() and pow() #include <list> #include "base/logging.h"
diff --git a/remoting/protocol/webrtc_dummy_video_encoder.cc b/remoting/protocol/webrtc_dummy_video_encoder.cc index 7a72f3d..59981ff 100644 --- a/remoting/protocol/webrtc_dummy_video_encoder.cc +++ b/remoting/protocol/webrtc_dummy_video_encoder.cc
@@ -183,8 +183,7 @@ webrtc::VideoEncoder* WebrtcDummyVideoEncoderFactory::CreateVideoEncoder( const cricket::VideoCodec& codec) { - webrtc::VideoCodecType type = webrtc::PayloadNameToCodecType(codec.name) - .value_or(webrtc::kVideoCodecUnknown); + webrtc::VideoCodecType type = webrtc::PayloadStringToCodecType(codec.name); WebrtcDummyVideoEncoder* encoder = new WebrtcDummyVideoEncoder( main_task_runner_, video_channel_state_observer_, type); base::AutoLock lock(lock_);
diff --git a/services/device/generic_sensor/platform_sensor_reader_win.cc b/services/device/generic_sensor/platform_sensor_reader_win.cc index ed87d062..5cb3cc2b 100644 --- a/services/device/generic_sensor/platform_sensor_reader_win.cc +++ b/services/device/generic_sensor/platform_sensor_reader_win.cc
@@ -58,16 +58,15 @@ std::unique_ptr<ReaderInitParams> CreateAmbientLightReaderInitParams() { auto params = base::MakeUnique<ReaderInitParams>(); params->sensor_type_id = SENSOR_TYPE_AMBIENT_LIGHT; - params->reader_func = - [](ISensorDataReport* report, SensorReading* reading) { - double lux = 0.0; - if (!GetReadingValueForProperty(SENSOR_DATA_TYPE_LIGHT_LEVEL_LUX, - report, &lux)) { - return E_FAIL; - } - reading->als.value = lux; - return S_OK; - }; + params->reader_func = [](ISensorDataReport* report, SensorReading* reading) { + double lux = 0.0; + if (!GetReadingValueForProperty(SENSOR_DATA_TYPE_LIGHT_LEVEL_LUX, report, + &lux)) { + return E_FAIL; + } + reading->als.value = lux; + return S_OK; + }; return params; } @@ -75,28 +74,27 @@ std::unique_ptr<ReaderInitParams> CreateAccelerometerReaderInitParams() { auto params = base::MakeUnique<ReaderInitParams>(); params->sensor_type_id = SENSOR_TYPE_ACCELEROMETER_3D; - params->reader_func = - [](ISensorDataReport* report, SensorReading* reading) { - double x = 0.0; - double y = 0.0; - double z = 0.0; - if (!GetReadingValueForProperty(SENSOR_DATA_TYPE_ACCELERATION_X_G, - report, &x) || - !GetReadingValueForProperty(SENSOR_DATA_TYPE_ACCELERATION_Y_G, - report, &y) || - !GetReadingValueForProperty(SENSOR_DATA_TYPE_ACCELERATION_Z_G, - report, &z)) { - return E_FAIL; - } + params->reader_func = [](ISensorDataReport* report, SensorReading* reading) { + double x = 0.0; + double y = 0.0; + double z = 0.0; + if (!GetReadingValueForProperty(SENSOR_DATA_TYPE_ACCELERATION_X_G, report, + &x) || + !GetReadingValueForProperty(SENSOR_DATA_TYPE_ACCELERATION_Y_G, report, + &y) || + !GetReadingValueForProperty(SENSOR_DATA_TYPE_ACCELERATION_Z_G, report, + &z)) { + return E_FAIL; + } - // Windows uses coordinate system where Z axis points down from device - // screen, therefore, using right hand notation, we have to reverse - // sign for each axis. Values are converted from G/s^2 to m/s^2. - reading->accel.x = -x * kMeanGravity; - reading->accel.y = -y * kMeanGravity; - reading->accel.z = -z * kMeanGravity; - return S_OK; - }; + // Windows uses coordinate system where Z axis points down from device + // screen, therefore, using right hand notation, we have to reverse + // sign for each axis. Values are converted from G/s^2 to m/s^2. + reading->accel.x = -x * kMeanGravity; + reading->accel.y = -y * kMeanGravity; + reading->accel.z = -z * kMeanGravity; + return S_OK; + }; return params; } @@ -104,31 +102,30 @@ std::unique_ptr<ReaderInitParams> CreateGyroscopeReaderInitParams() { auto params = base::MakeUnique<ReaderInitParams>(); params->sensor_type_id = SENSOR_TYPE_GYROMETER_3D; - params->reader_func = - [](ISensorDataReport* report, SensorReading* reading) { - double x = 0.0; - double y = 0.0; - double z = 0.0; - if (!GetReadingValueForProperty( - SENSOR_DATA_TYPE_ANGULAR_VELOCITY_X_DEGREES_PER_SECOND, report, - &x) || - !GetReadingValueForProperty( - SENSOR_DATA_TYPE_ANGULAR_VELOCITY_Y_DEGREES_PER_SECOND, report, - &y) || - !GetReadingValueForProperty( - SENSOR_DATA_TYPE_ANGULAR_VELOCITY_Z_DEGREES_PER_SECOND, report, - &z)) { - return E_FAIL; - } + params->reader_func = [](ISensorDataReport* report, SensorReading* reading) { + double x = 0.0; + double y = 0.0; + double z = 0.0; + if (!GetReadingValueForProperty( + SENSOR_DATA_TYPE_ANGULAR_VELOCITY_X_DEGREES_PER_SECOND, report, + &x) || + !GetReadingValueForProperty( + SENSOR_DATA_TYPE_ANGULAR_VELOCITY_Y_DEGREES_PER_SECOND, report, + &y) || + !GetReadingValueForProperty( + SENSOR_DATA_TYPE_ANGULAR_VELOCITY_Z_DEGREES_PER_SECOND, report, + &z)) { + return E_FAIL; + } - // Windows uses coordinate system where Z axis points down from device - // screen, therefore, using right hand notation, we have to reverse - // sign for each axis. Values are converted from deg to rad. - reading->gyro.x = -x * kDegreesToRadians; - reading->gyro.y = -y * kDegreesToRadians; - reading->gyro.z = -z * kDegreesToRadians; - return S_OK; - }; + // Windows uses coordinate system where Z axis points down from device + // screen, therefore, using right hand notation, we have to reverse + // sign for each axis. Values are converted from deg to rad. + reading->gyro.x = -x * kDegreesToRadians; + reading->gyro.y = -y * kDegreesToRadians; + reading->gyro.z = -z * kDegreesToRadians; + return S_OK; + }; return params; } @@ -136,32 +133,31 @@ std::unique_ptr<ReaderInitParams> CreateMagnetometerReaderInitParams() { auto params = base::MakeUnique<ReaderInitParams>(); params->sensor_type_id = SENSOR_TYPE_COMPASS_3D; - params->reader_func = - [](ISensorDataReport* report, SensorReading* reading) { - double x = 0.0; - double y = 0.0; - double z = 0.0; - if (!GetReadingValueForProperty( - SENSOR_DATA_TYPE_MAGNETIC_FIELD_STRENGTH_X_MILLIGAUSS, report, - &x) || - !GetReadingValueForProperty( - SENSOR_DATA_TYPE_MAGNETIC_FIELD_STRENGTH_Y_MILLIGAUSS, report, - &y) || - !GetReadingValueForProperty( - SENSOR_DATA_TYPE_MAGNETIC_FIELD_STRENGTH_Z_MILLIGAUSS, report, - &z)) { - return E_FAIL; - } + params->reader_func = [](ISensorDataReport* report, SensorReading* reading) { + double x = 0.0; + double y = 0.0; + double z = 0.0; + if (!GetReadingValueForProperty( + SENSOR_DATA_TYPE_MAGNETIC_FIELD_STRENGTH_X_MILLIGAUSS, report, + &x) || + !GetReadingValueForProperty( + SENSOR_DATA_TYPE_MAGNETIC_FIELD_STRENGTH_Y_MILLIGAUSS, report, + &y) || + !GetReadingValueForProperty( + SENSOR_DATA_TYPE_MAGNETIC_FIELD_STRENGTH_Z_MILLIGAUSS, report, + &z)) { + return E_FAIL; + } - // Windows uses coordinate system where Z axis points down from device - // screen, therefore, using right hand notation, we have to reverse - // sign for each axis. Values are converted from Milligaus to - // Microtesla. - reading->magn.x = -x * kMicroteslaInMilligauss; - reading->magn.y = -y * kMicroteslaInMilligauss; - reading->magn.z = -z * kMicroteslaInMilligauss; - return S_OK; - }; + // Windows uses coordinate system where Z axis points down from device + // screen, therefore, using right hand notation, we have to reverse + // sign for each axis. Values are converted from Milligaus to + // Microtesla. + reading->magn.x = -x * kMicroteslaInMilligauss; + reading->magn.y = -y * kMicroteslaInMilligauss; + reading->magn.z = -z * kMicroteslaInMilligauss; + return S_OK; + }; return params; } @@ -170,25 +166,24 @@ CreateAbsoluteOrientationEulerAnglesReaderInitParams() { auto params = base::MakeUnique<ReaderInitParams>(); params->sensor_type_id = SENSOR_TYPE_INCLINOMETER_3D; - params->reader_func = - [](ISensorDataReport* report, SensorReading* reading) { - double x = 0.0; - double y = 0.0; - double z = 0.0; - if (!GetReadingValueForProperty(SENSOR_DATA_TYPE_TILT_X_DEGREES, report, - &x) || - !GetReadingValueForProperty(SENSOR_DATA_TYPE_TILT_Y_DEGREES, report, - &y) || - !GetReadingValueForProperty(SENSOR_DATA_TYPE_TILT_Z_DEGREES, report, - &z)) { - return E_FAIL; - } + params->reader_func = [](ISensorDataReport* report, SensorReading* reading) { + double x = 0.0; + double y = 0.0; + double z = 0.0; + if (!GetReadingValueForProperty(SENSOR_DATA_TYPE_TILT_X_DEGREES, report, + &x) || + !GetReadingValueForProperty(SENSOR_DATA_TYPE_TILT_Y_DEGREES, report, + &y) || + !GetReadingValueForProperty(SENSOR_DATA_TYPE_TILT_Z_DEGREES, report, + &z)) { + return E_FAIL; + } - reading->orientation_euler.x = x; - reading->orientation_euler.y = y; - reading->orientation_euler.z = z; - return S_OK; - }; + reading->orientation_euler.x = x; + reading->orientation_euler.y = y; + reading->orientation_euler.z = z; + return S_OK; + }; return params; } @@ -197,27 +192,26 @@ CreateAbsoluteOrientationQuaternionReaderInitParams() { auto params = base::MakeUnique<ReaderInitParams>(); params->sensor_type_id = SENSOR_TYPE_AGGREGATED_DEVICE_ORIENTATION; - params->reader_func = - [](ISensorDataReport* report, SensorReading* reading) { - base::win::ScopedPropVariant quat_variant; - HRESULT hr = report->GetSensorValue(SENSOR_DATA_TYPE_QUATERNION, - quat_variant.Receive()); - if (FAILED(hr) || quat_variant.get().vt != (VT_VECTOR | VT_UI1) || - quat_variant.get().caub.cElems < 16) { - return E_FAIL; - } + params->reader_func = [](ISensorDataReport* report, SensorReading* reading) { + base::win::ScopedPropVariant quat_variant; + HRESULT hr = report->GetSensorValue(SENSOR_DATA_TYPE_QUATERNION, + quat_variant.Receive()); + if (FAILED(hr) || quat_variant.get().vt != (VT_VECTOR | VT_UI1) || + quat_variant.get().caub.cElems < 16) { + return E_FAIL; + } - float* quat = reinterpret_cast<float*>(quat_variant.get().caub.pElems); + float* quat = reinterpret_cast<float*>(quat_variant.get().caub.pElems); - // Windows uses coordinate system where Z axis points down from device - // screen, therefore, using right hand notation, we have to reverse - // sign for each quaternion component. - reading->orientation_quat.x = -quat[0]; // x*sin(Theta/2) - reading->orientation_quat.y = -quat[1]; // y*sin(Theta/2) - reading->orientation_quat.z = -quat[2]; // z*sin(Theta/2) - reading->orientation_quat.w = quat[3]; // cos(Theta/2) - return S_OK; - }; + // Windows uses coordinate system where Z axis points down from device + // screen, therefore, using right hand notation, we have to reverse + // sign for each quaternion component. + reading->orientation_quat.x = -quat[0]; // x*sin(Theta/2) + reading->orientation_quat.y = -quat[1]; // y*sin(Theta/2) + reading->orientation_quat.z = -quat[2]; // z*sin(Theta/2) + reading->orientation_quat.w = quat[3]; // cos(Theta/2) + return S_OK; + }; return params; }
diff --git a/third_party/WebKit/LayoutTests/FlagExpectations/enable-blink-features=LayoutNG b/third_party/WebKit/LayoutTests/FlagExpectations/enable-blink-features=LayoutNG index ec94eab..0df7bb30 100644 --- a/third_party/WebKit/LayoutTests/FlagExpectations/enable-blink-features=LayoutNG +++ b/third_party/WebKit/LayoutTests/FlagExpectations/enable-blink-features=LayoutNG
@@ -15,6 +15,60 @@ # LayoutNG is enabled, but not when disabled. crbug.com/707656 editing/deleting/in-visibly-empty-root.html [ Failure Pass ] +# TextIterator differ in trailing spaces. +crbug.com/591099 fast/text/bidi-isolate-nextlinebreak-failure.html [ Failure Pass ] + +# TextIterator has additional empty lines. +crbug.com/758816 fast/text/chromium-linux-fallback-crash.html [ Failure Pass ] +crbug.com/758816 fast/text/chromium-mac-duplicate-ime-composition.html [ Failure Pass ] +crbug.com/758816 fast/text/combining-character-sequence-fallback-crash.html [ Failure Pass ] +crbug.com/758816 fast/text/computed-line-height-and-font-size-with-font-size-adjust.html [ Failure Pass ] +crbug.com/758816 fast/text/find-russian.html [ Failure Pass ] +crbug.com/758816 fast/text/find-soft-hyphen.html [ Failure Pass ] +crbug.com/758816 fast/text/font-fallback-synthetic-italics.html [ Failure Pass ] +crbug.com/758816 fast/text/font-size-zero.html [ Failure Pass ] +crbug.com/758816 fast/text/fractional-word-and-letter-spacing-with-kerning.html [ Failure Pass ] +crbug.com/758816 fast/text/glyph-reordering.html [ Failure Pass ] +crbug.com/758816 fast/text/ipa-tone-letters.html [ Failure Pass ] +crbug.com/758816 fast/text/multiglyph-characters.html [ Failure Pass ] +crbug.com/758816 fast/text/nested-bidi-isolate-crash.html [ Failure Pass ] +crbug.com/758816 fast/text/regional-indicator-symobls.html [ Failure Pass ] +crbug.com/758816 fast/text/reset-drag-on-mouse-down.html [ Failure Pass ] +crbug.com/758816 fast/text/soft-hyphen-5.html [ Failure Pass ] +crbug.com/758816 fast/text/tab-min-size.html [ Failure Pass ] +crbug.com/758816 fast/text/text-between-two-brs-in-nowrap-overflow.html [ Failure Pass ] +crbug.com/758816 fast/text/text-container-bounding-rect.html [ Failure Pass ] +crbug.com/758816 fast/text/text-iterator-crash.html [ Failure Pass ] +crbug.com/758816 fast/text/text-large-negative-letter-spacing-with-opacity.html [ Failure Pass ] +crbug.com/758816 fast/text/text-transform-nontext-node-crash.xhtml [ Failure Pass ] +crbug.com/758816 fast/text/whitespace/nowrap-line-break-after-white-space.html [ Failure Pass ] +crbug.com/758816 fast/text/whitespace/nowrap-previous-trailing-space.html [ Failure Pass ] +crbug.com/758816 fast/text/whitespace/nowrap-trailing-space.html [ Failure Pass ] + +# Element boundary position differ by 1px. +crbug.com/591099 fast/text/fallback-for-custom-font.html [ Failure ] +crbug.com/591099 fast/text/justified-selection-at-edge.html [ Failure ] +crbug.com/591099 fast/text/justify-ideograph-complex.html [ Failure ] +crbug.com/591099 fast/text/justify-ideograph-simple.html [ Crash Failure ] +crbug.com/591099 fast/text/whitespace/028.html [ Failure ] + +# Fix only in NGPaint. +crbug.com/591099 fast/text/justify-ideograph-leading-expansion.html [ Failure ] +crbug.com/591099 fast/text/justify-nbsp.html [ Failure ] +crbug.com/591099 fast/text/justify-vertical.html [ Failure ] +crbug.com/591099 fast/text/word-space.html [ Failure ] + +# Glyph overflow. +crbug.com/591099 fast/text/letter-spacing-negative-opacity.html [ Failure ] +crbug.com/591099 fast/text/shadow-no-blur.html [ Failure ] + +# Improved shaping we can rebase once we switch. +crbug.com/591099 fast/text/atsui-kerning-and-ligatures.html [ Failure ] +crbug.com/591099 fast/text/font-initial.html [ Failure ] + +# Non-interoperable behavior not worth to fix. +crbug.com/591099 fast/text/apply-start-width-after-skipped-text.html [ Skip ] + # New passes crbug.com/626703 external/wpt/css/css-ui-3/text-overflow-021.html [ Pass ] crbug.com/492664 external/wpt/css/css-writing-modes-3/inline-block-alignment-003.xht [ Pass ] @@ -10629,20 +10683,13 @@ crbug.com/591099 fast/text-autosizing/wide-block.html [ Failure ] crbug.com/591099 fast/text-autosizing/wide-child.html [ Failure ] crbug.com/591099 fast/text-autosizing/wide-in-narrow-overflow-scroll.html [ Failure ] -crbug.com/591099 fast/text/apply-start-width-after-skipped-text.html [ Failure ] crbug.com/591099 fast/text/atomic-inline-before-ellipsis.html [ Failure ] -crbug.com/591099 fast/text/atsui-kerning-and-ligatures.html [ Failure ] crbug.com/591099 fast/text/basic/004.html [ Failure ] crbug.com/591099 fast/text/basic/015.html [ Failure ] crbug.com/591099 fast/text/bidi-explicit-embedding-past-end.html [ Failure Pass ] -crbug.com/591099 fast/text/bidi-isolate-nextlinebreak-failure.html [ Failure Pass ] crbug.com/591099 fast/text/break-word-with-floats.html [ Failure Pass ] -crbug.com/591099 fast/text/chromium-linux-fallback-crash.html [ Failure Pass ] crbug.com/591099 fast/text/chromium-linux-fontconfig-renderstyle.html [ Failure ] -crbug.com/591099 fast/text/chromium-mac-duplicate-ime-composition.html [ Failure Pass ] -crbug.com/591099 fast/text/combining-character-sequence-fallback-crash.html [ Failure Pass ] crbug.com/591099 fast/text/complex-text-opacity.html [ Failure ] -crbug.com/591099 fast/text/computed-line-height-and-font-size-with-font-size-adjust.html [ Failure Pass ] crbug.com/591099 fast/text/container-align-with-inlines.html [ Failure ] crbug.com/591099 fast/text/decorations-with-text-combine.html [ Failure ] crbug.com/591099 fast/text/ellipsis-at-edge-of-ltr-text-in-rtl-flow.html [ Failure ] @@ -10676,20 +10723,12 @@ crbug.com/591099 fast/text/emphasis-complex.html [ Failure ] crbug.com/591099 fast/text/emphasis-ellipsis-complextext.html [ Failure ] crbug.com/591099 fast/text/emphasis-overlap.html [ Failure ] -crbug.com/591099 fast/text/fallback-for-custom-font.html [ Failure ] crbug.com/591099 fast/text/find-kana.html [ Timeout ] -crbug.com/591099 fast/text/find-russian.html [ Failure Pass ] -crbug.com/591099 fast/text/find-soft-hyphen.html [ Failure Pass ] crbug.com/591099 fast/text/firstline/001.html [ Failure ] crbug.com/591099 fast/text/font-ascent-mac.html [ Failure ] -crbug.com/591099 fast/text/font-fallback-synthetic-italics.html [ Failure Pass ] -crbug.com/591099 fast/text/font-initial.html [ Failure ] -crbug.com/591099 fast/text/font-size-zero.html [ Failure Pass ] crbug.com/591099 fast/text/font-smallcaps-layout.html [ Failure ] -crbug.com/591099 fast/text/fractional-word-and-letter-spacing-with-kerning.html [ Failure Pass ] crbug.com/591099 fast/text/glyph-overflow-with-word-spacing.html [ Failure ] crbug.com/591099 fast/text/glyph-overflow.html [ Failure ] -crbug.com/591099 fast/text/glyph-reordering.html [ Failure Pass ] crbug.com/591099 fast/text/hide-atomic-inlines-after-ellipsis.html [ Crash Failure ] crbug.com/591099 fast/text/international/bidi-AN-after-empty-run.html [ Failure ] crbug.com/591099 fast/text/international/bidi-LDB-2-CSS.html [ Failure ] @@ -10718,22 +10757,12 @@ crbug.com/591099 fast/text/international/thai-offsetForPosition-inside-character.html [ Failure Pass ] crbug.com/591099 fast/text/international/unicode-bidi-plaintext.html [ Failure ] crbug.com/591099 fast/text/international/vertical-text-metrics-test.html [ Failure Pass ] -crbug.com/591099 fast/text/ipa-tone-letters.html [ Failure Pass ] -crbug.com/591099 fast/text/justified-selection-at-edge.html [ Failure ] -crbug.com/591099 fast/text/justify-ideograph-complex.html [ Crash Failure ] -crbug.com/591099 fast/text/justify-ideograph-leading-expansion.html [ Failure ] -crbug.com/591099 fast/text/justify-ideograph-simple.html [ Crash Failure ] crbug.com/591099 fast/text/justify-ideograph-vertical.html [ Crash Failure ] -crbug.com/591099 fast/text/justify-nbsp.html [ Failure ] -crbug.com/591099 fast/text/justify-vertical.html [ Failure ] crbug.com/591099 fast/text/large-text-composed-char.html [ Failure Timeout ] crbug.com/591099 fast/text/letter-spacing-leading-and-trailing.html [ Failure ] -crbug.com/591099 fast/text/letter-spacing-negative-opacity.html [ Failure ] crbug.com/591099 fast/text/long-word.html [ Failure Timeout ] crbug.com/591099 fast/text/midword-break-after-breakable-char.html [ Failure ] crbug.com/591099 fast/text/monospace-width-cache.html [ Failure ] -crbug.com/591099 fast/text/multiglyph-characters.html [ Failure Pass ] -crbug.com/591099 fast/text/nested-bidi-isolate-crash.html [ Failure Pass ] crbug.com/591099 fast/text/offsetForPosition-cluster-at-zero.html [ Failure ] crbug.com/591099 fast/text/offsetForPosition-complex-fallback.html [ Failure ] crbug.com/591099 fast/text/orientation-sideways.html [ Failure ] @@ -10760,39 +10789,25 @@ crbug.com/591099 fast/text/place-rtl-ellipsis-in-inline-blocks-align-left.html [ Failure ] crbug.com/591099 fast/text/place-rtl-ellipsis-in-inline-blocks-align-right.html [ Failure ] crbug.com/591099 fast/text/place-rtl-ellipsis-in-inline-blocks.html [ Failure ] -crbug.com/591099 fast/text/regional-indicator-symobls.html [ Failure Pass ] -crbug.com/591099 fast/text/reset-drag-on-mouse-down.html [ Failure Pass ] crbug.com/591099 fast/text/selection-hard-linebreak.html [ Failure ] crbug.com/591099 fast/text/selection-rect-line-height-too-big.html [ Failure ] crbug.com/591099 fast/text/selection-rect-line-height-too-small.html [ Failure ] crbug.com/591099 fast/text/selection-rect-rounding.html [ Failure ] crbug.com/591099 fast/text/selection-with-inline-padding.html [ Failure ] -crbug.com/591099 fast/text/shadow-no-blur.html [ Failure ] crbug.com/591099 fast/text/shaping/same-script-different-lang.html [ Failure ] crbug.com/591099 fast/text/shaping/shaping-width-initialized.html [ Failure Pass ] -crbug.com/591099 fast/text/soft-hyphen-5.html [ Failure Pass ] crbug.com/591099 fast/text/sub-pixel/text-scaling-pixel.html [ Failure Timeout ] -crbug.com/591099 fast/text/tab-min-size.html [ Failure Pass ] -crbug.com/591099 fast/text/text-between-two-brs-in-nowrap-overflow.html [ Failure Pass ] -crbug.com/591099 fast/text/text-container-bounding-rect.html [ Failure Pass ] -crbug.com/591099 fast/text/text-iterator-crash.html [ Failure Pass ] -crbug.com/591099 fast/text/text-large-negative-letter-spacing-with-opacity.html [ Failure Pass ] crbug.com/591099 fast/text/text-letter-spacing.html [ Failure ] -crbug.com/591099 fast/text/text-transform-nontext-node-crash.xhtml [ Failure Pass ] crbug.com/591099 fast/text/textIteratorNilRenderer.html [ Failure ] crbug.com/591099 fast/text/trailing-white-space-2.html [ Failure ] crbug.com/591099 fast/text/trailing-white-space.html [ Failure ] crbug.com/591099 fast/text/vertical-rl-rtl-linebreak.html [ Failure ] crbug.com/591099 fast/text/whitespace/018.html [ Failure ] crbug.com/591099 fast/text/whitespace/024.html [ Failure ] -crbug.com/591099 fast/text/whitespace/028.html [ Failure ] crbug.com/591099 fast/text/whitespace/inline-whitespace-wrapping-3.html [ Failure Pass ] crbug.com/591099 fast/text/whitespace/inline-whitespace-wrapping-4.html [ Failure Pass ] crbug.com/591099 fast/text/whitespace/inline-whitespace-wrapping-5.html [ Failure Pass ] crbug.com/591099 fast/text/whitespace/normal-after-nowrap-breaking.html [ Crash Failure ] -crbug.com/591099 fast/text/whitespace/nowrap-line-break-after-white-space.html [ Failure Pass ] -crbug.com/591099 fast/text/whitespace/nowrap-previous-trailing-space.html [ Failure Pass ] -crbug.com/591099 fast/text/whitespace/nowrap-trailing-space.html [ Failure Pass ] crbug.com/591099 fast/text/whitespace/pre-wrap-spaces-after-newline.html [ Failure ] crbug.com/591099 fast/text/whitespace/select-new-line-with-line-break-normal.html [ Failure ] crbug.com/591099 fast/text/whitespace/tab-character-basics.html [ Failure ] @@ -10801,7 +10816,6 @@ crbug.com/591099 fast/text/wide-preformatted.html [ Failure ] crbug.com/591099 fast/text/word-break.html [ Failure Pass ] crbug.com/591099 fast/text/word-space-between-inlines.html [ Failure ] -crbug.com/591099 fast/text/word-space.html [ Failure ] crbug.com/591099 fast/text/writing-root-with-overflow-clip-baseline.html [ Crash Failure Pass ] crbug.com/591099 fast/text/zero-width-characters-complex-script.html [ Failure ] crbug.com/591099 fast/text/zero-width-characters.html [ Failure ]
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations index 845ef76..477922a 100644 --- a/third_party/WebKit/LayoutTests/TestExpectations +++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -2411,11 +2411,6 @@ # This test needs to be updated: fails because it expects showModalDialog and some other APIs. crbug.com/508728 external/wpt/html/browsers/the-window-object/security-window/window-security.html [ Failure ] -crbug.com/602693 external/wpt/service-workers/service-worker/fetch-frame-resource.https.html [ Timeout ] -crbug.com/602693 virtual/service-worker-script-streaming/external/wpt/service-workers/service-worker/fetch-frame-resource.https.html [ Timeout ] -crbug.com/602693 virtual/mojo-blobs/external/wpt/service-workers/service-worker/fetch-frame-resource.https.html [ Timeout ] -crbug.com/602693 virtual/outofblink-cors/external/wpt/service-workers/service-worker/fetch-frame-resource.https.html [ Timeout ] - # This test requires a special browser flag and seems not suitable for a wpt test, see bug. crbug.com/691944 external/wpt/service-workers/service-worker/update-after-oneday.https.html [ Skip ] crbug.com/691944 virtual/service-worker-script-streaming/external/wpt/service-workers/service-worker/update-after-oneday.https.html [ Skip ]
diff --git a/third_party/WebKit/LayoutTests/accessibility/canvas-fallback-content-2-expected.txt b/third_party/WebKit/LayoutTests/accessibility/canvas-fallback-content-2-expected.txt index 7077bc5..a9042733 100644 --- a/third_party/WebKit/LayoutTests/accessibility/canvas-fallback-content-2-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/canvas-fallback-content-2-expected.txt
@@ -1,7 +1,6 @@ Link Button Button Button Focusable Heading - ARIA button ARIA disabled button ARIA enabled button
diff --git a/third_party/WebKit/LayoutTests/accessibility/readonly-expected.txt b/third_party/WebKit/LayoutTests/accessibility/readonly-expected.txt index 64b1ed9..9a336f92 100644 --- a/third_party/WebKit/LayoutTests/accessibility/readonly-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/readonly-expected.txt
@@ -1,7 +1,6 @@ Link Button A B C D E F G H I J K L M Focusable Heading - Plain div can't be readonly ARIA button ARIA toggle button
diff --git a/third_party/WebKit/LayoutTests/editing/execCommand/19087-expected.txt b/third_party/WebKit/LayoutTests/editing/execCommand/19087-expected.txt index 3211e80..6778625 100644 --- a/third_party/WebKit/LayoutTests/editing/execCommand/19087-expected.txt +++ b/third_party/WebKit/LayoutTests/editing/execCommand/19087-expected.txt
@@ -2,6 +2,3 @@ - - -
diff --git a/third_party/WebKit/LayoutTests/editing/execCommand/arguments-combinations-expected.txt b/third_party/WebKit/LayoutTests/editing/execCommand/arguments-combinations-expected.txt index 7f407938..b6962de 100644 --- a/third_party/WebKit/LayoutTests/editing/execCommand/arguments-combinations-expected.txt +++ b/third_party/WebKit/LayoutTests/editing/execCommand/arguments-combinations-expected.txt
@@ -1,7 +1,6 @@ These are tests for testing the how execCommand() works with different combinations of arguments. The "InsertHorizontalRule" command was chosen arbitrarily because it was what I was working on at the time, but the results should be paralleled in the other commands as well. CONSOLE - PASS <hr> is <hr> PASS <hr> is <hr> PASS <hr id="foo"> is <hr id="foo">
diff --git a/third_party/WebKit/LayoutTests/external/wpt/XMLHttpRequest/access-control-preflight-sync-not-supported.htm b/third_party/WebKit/LayoutTests/external/wpt/XMLHttpRequest/access-control-preflight-sync-not-supported.htm new file mode 100644 index 0000000..a0b079e0 --- /dev/null +++ b/third_party/WebKit/LayoutTests/external/wpt/XMLHttpRequest/access-control-preflight-sync-not-supported.htm
@@ -0,0 +1,38 @@ +<!DOCTYPE html> +<html> + <head> + <title>Sync PUT request denied at preflight</title> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/get-host-info.sub.js"></script> + <script src="/common/utils.js"></script> + </head> + <body> + <script type="text/javascript"> +const uuid = token(); +const url = get_host_info().HTTP_REMOTE_ORIGIN + + "/XMLHttpRequest/resources/access-control-preflight-denied.py?token=" + uuid; + +test(() => { + let xhr = new XMLHttpRequest; + xhr.open("GET", url + "&command=reset", false); + xhr.send(); + + xhr = new XMLHttpRequest; + xhr.open("PUT", url, false); + + try { + xhr.send(""); + } catch(e) { + xhr = new XMLHttpRequest; + xhr.open("GET", url + "&command=complete", false); + xhr.send(); + assert_equals(xhr.responseText, "Request successfully blocked."); + return; + } + + assert_unreached("Cross-domain access allowed without throwing exception"); +}); + </script> + </body> +</html>
diff --git a/third_party/WebKit/LayoutTests/external/wpt/innerText/getter-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/innerText/getter-expected.txt index 0187a02..10a8f78 100644 --- a/third_party/WebKit/LayoutTests/external/wpt/innerText/getter-expected.txt +++ b/third_party/WebKit/LayoutTests/external/wpt/innerText/getter-expected.txt
@@ -1,5 +1,5 @@ This is a testharness.js-based test. -Found 213 tests; 126 PASS, 87 FAIL, 0 TIMEOUT, 0 NOTRUN. +Found 213 tests; 129 PASS, 84 FAIL, 0 TIMEOUT, 0 NOTRUN. PASS Simplest possible test ("<div>abc") PASS Leading whitespace removed ("<div> abc") PASS Trailing whitespace removed ("<div>abc ") @@ -139,9 +139,9 @@ FAIL No blank lines around <h1> ("<div>123<h1>abc</h1>def") assert_equals: expected "123\nabc\ndef" but got "123\nabc\n\ndef" FAIL No blank lines around <h2> ("<div>123<h2>abc</h2>def") assert_equals: expected "123\nabc\ndef" but got "123\nabc\n\ndef" FAIL No blank lines around <h3> ("<div>123<h3>abc</h3>def") assert_equals: expected "123\nabc\ndef" but got "123\nabc\n\ndef" -FAIL No blank lines around <h4> ("<div>123<h4>abc</h4>def") assert_equals: expected "123\nabc\ndef" but got "123\nabc\n\ndef" -FAIL No blank lines around <h5> ("<div>123<h5>abc</h5>def") assert_equals: expected "123\nabc\ndef" but got "123\nabc\n\ndef" -FAIL No blank lines around <h6> ("<div>123<h6>abc</h6>def") assert_equals: expected "123\nabc\ndef" but got "123\nabc\n\ndef" +PASS No blank lines around <h4> ("<div>123<h4>abc</h4>def") +PASS No blank lines around <h5> ("<div>123<h5>abc</h5>def") +PASS No blank lines around <h6> ("<div>123<h6>abc</h6>def") PASS <span> boundaries are irrelevant ("<div>123<span>abc</span>def") PASS <span> boundaries are irrelevant ("<div>123 <span>abc</span> def") PASS <span> boundaries are irrelevant ("<div style='width:0'>123 <span>abc</span> def")
diff --git a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/fetch-frame-resource.https.html b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/fetch-frame-resource.https.html index 4d30ff4..d7abd00 100644 --- a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/fetch-frame-resource.https.html +++ b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/fetch-frame-resource.https.html
@@ -50,7 +50,12 @@ win.onload = function() { clearTimeout(timeout); - var content = contentFunc(win); + let content = ''; + try { + content = contentFunc(win); + } catch(e) { + // use default empty string for cross-domain window (see above) + } done(content); }; });
diff --git a/third_party/WebKit/LayoutTests/fast/css/text-align-webkit-match-parent-expected.txt b/third_party/WebKit/LayoutTests/fast/css/text-align-webkit-match-parent-expected.txt index 1a1d829..21e131dc 100644 --- a/third_party/WebKit/LayoutTests/fast/css/text-align-webkit-match-parent-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/css/text-align-webkit-match-parent-expected.txt
@@ -2,19 +2,15 @@ The test passes if all the lines containing the text "Left Align" are aligned to the left and vice-versa for "Right Align". Cases where the outermost div is LTR. - PASS PASS PASS Cases where the outermost div is RTL. - PASS PASS Changing text-align programmatically - PASS check -webkit-match-parent in a nested div - PASS PASS
diff --git a/third_party/WebKit/LayoutTests/fast/dom/inner-text-001-expected.txt b/third_party/WebKit/LayoutTests/fast/dom/inner-text-001-expected.txt index 33055fd..e5e2c9d 100644 --- a/third_party/WebKit/LayoutTests/fast/dom/inner-text-001-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/dom/inner-text-001-expected.txt
@@ -15,9 +15,7 @@ Collapsed margins are supposed to result in an extra line break. First header - Second header - First list element Second list element This line contains an image. @@ -40,9 +38,7 @@ Collapsed margins are supposed to result in an extra line break. First header - Second header - First list element Second list element This line contains an image.
diff --git a/third_party/WebKit/LayoutTests/fast/events/drag-in-frames-expected.txt b/third_party/WebKit/LayoutTests/fast/events/drag-in-frames-expected.txt index fb9ca40..ba689b37 100644 --- a/third_party/WebKit/LayoutTests/fast/events/drag-in-frames-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/events/drag-in-frames-expected.txt
@@ -1,5 +1,4 @@ Event log - ondragstart src ondrag src ondragenter left target
diff --git a/third_party/WebKit/LayoutTests/fast/invalid/nestedh3s-rapidweaver-expected.txt b/third_party/WebKit/LayoutTests/fast/invalid/nestedh3s-rapidweaver-expected.txt index dca7839..5e2a1af0 100644 --- a/third_party/WebKit/LayoutTests/fast/invalid/nestedh3s-rapidweaver-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/invalid/nestedh3s-rapidweaver-expected.txt
@@ -5,5 +5,4 @@ h3.nextSibling.innerText: content header - content
diff --git a/third_party/WebKit/LayoutTests/fast/table/rowspan-only-rows-height-distribution-expected.txt b/third_party/WebKit/LayoutTests/fast/table/rowspan-only-rows-height-distribution-expected.txt index 31b0a01..6bd7377 100644 --- a/third_party/WebKit/LayoutTests/fast/table/rowspan-only-rows-height-distribution-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/table/rowspan-only-rows-height-distribution-expected.txt
@@ -1,7 +1,6 @@ Test for chromium bug : 396653. Tables with specific merge cell configuration render improperly when removing table column. Second row is rowspan-only-cell and some empty cells present in the row because td node is deleted from the dom tree using script. So Please check that second row height should not be zero in this case. - PASS PASS PASS
diff --git a/third_party/WebKit/LayoutTests/fast/table/table-all-rowspans-height-distribution-in-rows-expected.txt b/third_party/WebKit/LayoutTests/fast/table/table-all-rowspans-height-distribution-in-rows-expected.txt index bf4870a..c24f1a7 100644 --- a/third_party/WebKit/LayoutTests/fast/table/table-all-rowspans-height-distribution-in-rows-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/table/table-all-rowspans-height-distribution-in-rows-expected.txt
@@ -1,9 +1,7 @@ Test for chromium bug : 252120. Content of the row spanning cell is flowing out of the cell boundries. Row spanning cell height is not set as per its content height or given height to this cells. - Test 1 - One row spanning cell present under the boundries of other row spanning cell and inner row spanning cell have lots of content. - row0 col0 rowspan=6 height=400px row0 col1 PASS row1 col1 @@ -29,7 +27,6 @@ row6 col0 PASS Test 2 - One row spanning cell present under the boundries of other row spanning cell and inner row spanning cell have its own height. - row0 col0 rowspan=6 height=600px row0 col1 PASS row1 col1 @@ -45,7 +42,6 @@ row6 col0 PASS Test 3 - 2 same row spanning cells with different heights. - row0 col0 rowspan=6 height=300px row0 col1 rowspan=6 height=500px PASS row1 col1 @@ -61,7 +57,6 @@ row6 col0 PASS Test 4 - some rows are common between 2 row spanning cells. - row0 col0 rowspan=6 height=400px row0 col1 PASS row1 col1 rowspan=6 height=800px @@ -79,7 +74,6 @@ row7 col0 PASS Test 5 - 2 spanning cells starts at different row index but end at same row index. - row0 col0 rowspan=6 height=400px row0 col1 PASS row1 col1 rowspan=6 height=800px @@ -97,7 +91,6 @@ row7 col0 PASS Test 6 - RowSpan and ColSpan. - row0 col0 row0 col1 - rowspan=3 colspan=2 row0 col2 PASS row1 col0 @@ -109,7 +102,6 @@ row4 col0 PASS Test 7 - Mix of baseline aligned and non-baseline aligned cells. - row0 col0 row0 col1 vertical-align=top row0 col2 vertical-align=bottom PASS row1 col0 @@ -125,7 +117,6 @@ row6 col0 PASS Test 8 - CSS Table. - row0 col0 row0 col1 row0 col2 row1 col0 row1 col1 row1 col2 row2 col0 @@ -138,7 +129,6 @@ row9 col0 row10 col0 Test 9 - Table Similar to CSS table with rowspan. - row0 col0 row0 col1 row0 col2 PASS row1 col1 row1 col2 row1 col3
diff --git a/third_party/WebKit/LayoutTests/fast/table/table-colgroup-present-after-table-row-expected.txt b/third_party/WebKit/LayoutTests/fast/table/table-colgroup-present-after-table-row-expected.txt index d4bb4a1..fef0630 100644 --- a/third_party/WebKit/LayoutTests/fast/table/table-colgroup-present-after-table-row-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/table/table-colgroup-present-after-table-row-expected.txt
@@ -1,7 +1,6 @@ Test for chromium bug : 305169. <colgroup> is ignored if seen after <tr>. Columns width are not based on width specified in colGroup because colGroup is present after table row and we was supporting it only when colGroup is present at the start in table. - First PASS Col-1
diff --git a/third_party/WebKit/LayoutTests/fast/table/table-rowspan-cell-with-empty-cell-expected.txt b/third_party/WebKit/LayoutTests/fast/table/table-rowspan-cell-with-empty-cell-expected.txt index 0844e9f..25d949f 100644 --- a/third_party/WebKit/LayoutTests/fast/table/table-rowspan-cell-with-empty-cell-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/table/table-rowspan-cell-with-empty-cell-expected.txt
@@ -1,7 +1,6 @@ Test for chromium bug : 258420. Table rows are incorrectly collapsed in case of hidden cells and rowspans. A spanning cell whose rows have only empty cell(s) shouldn't have a non-zero height. - A A1 A1.1 A2 PASS
diff --git a/third_party/WebKit/LayoutTests/fast/table/table-rowspan-crash-with-huge-pedding-value-expected.txt b/third_party/WebKit/LayoutTests/fast/table/table-rowspan-crash-with-huge-pedding-value-expected.txt index 12aaff98..63cda34 100644 --- a/third_party/WebKit/LayoutTests/fast/table/table-rowspan-crash-with-huge-pedding-value-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/table/table-rowspan-crash-with-huge-pedding-value-expected.txt
@@ -4,5 +4,4 @@ r0c0 r0c1 - rowspan=2
diff --git a/third_party/WebKit/LayoutTests/fast/table/table-rowspan-crash-with-huge-rowspan-cells-2-expected.txt b/third_party/WebKit/LayoutTests/fast/table/table-rowspan-crash-with-huge-rowspan-cells-2-expected.txt index 234ab45..fedbe85 100644 --- a/third_party/WebKit/LayoutTests/fast/table/table-rowspan-crash-with-huge-rowspan-cells-2-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/table/table-rowspan-crash-with-huge-rowspan-cells-2-expected.txt
@@ -1,7 +1,6 @@ Test for chromium bug : 296003. Heap-buffer-overflow in void std::__final_insertion_sort. For this test to PASS, it should not crash. - row0col0 (rowspan=3) row0col1 (rowspan=3) row0col2 (rowspan=6) row0col3 (rowspan=4) row0col4 (rowspan=16) row0col5 (rowspan=4) row0col6 (rowspan=12) row0col7 (rowspan=4) row0col8 (rowspan=12) row1col9 row2col9 (rowspan=3) row2col10 (rowspan=8) row2col11 (rowspan=8) row2col12 (rowspan=8) row2col13 (rowspan=8)
diff --git a/third_party/WebKit/LayoutTests/fast/table/table-rowspan-crash-with-huge-rowspan-cells-expected.txt b/third_party/WebKit/LayoutTests/fast/table/table-rowspan-crash-with-huge-rowspan-cells-expected.txt index 321cf33..7457bd1 100644 --- a/third_party/WebKit/LayoutTests/fast/table/table-rowspan-crash-with-huge-rowspan-cells-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/table/table-rowspan-crash-with-huge-rowspan-cells-expected.txt
@@ -1,7 +1,6 @@ Test for chromium bug : 276253. Crash when opening web page http://build.webkit.org/waterfall. It should not crash. - delete stale build files killed old processes 07:19:30 updater154325
diff --git a/third_party/WebKit/LayoutTests/fast/table/table-rowspan-height-distribution-in-rows-1-expected.txt b/third_party/WebKit/LayoutTests/fast/table/table-rowspan-height-distribution-in-rows-1-expected.txt index 43dbd41f..a38256c 100644 --- a/third_party/WebKit/LayoutTests/fast/table/table-rowspan-height-distribution-in-rows-1-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/table/table-rowspan-height-distribution-in-rows-1-expected.txt
@@ -1,9 +1,7 @@ Test for chromium bug : 78724. Extra logical height is not properly spread over the rows in a row-spanning cell. Rows in rowspan should get proportional height. - Test 1 - One rowSpan cell - row0 col0 PASS row1 col0 - rowspan=4 row1 col1 @@ -17,7 +15,6 @@ row5 col0 PASS Test 2 - One rowSpan cell and specified table width - row0 col0 - rowspan=5 row0 col1 PASS row1 col1 @@ -29,7 +26,6 @@ row4 col1 PASS Test 3 - One rowSpan cell and specified rowSpan cell height - row0 col0 PASS row1 col0 row1 col1 - rowspan=4 @@ -43,7 +39,6 @@ row5 col0 row5 col1 PASS Test 4 - One rowSpan cell and specified cells height - row0 col0 PASS row1 col0 row1 col1 - rowspan=4 @@ -57,7 +52,6 @@ row5 col0 row5 col1 PASS Test 5 - RowSpan and ColSpan. - row0 col0 row0 col1 - rowspan=3 colspan=2 row0 col2 PASS row1 col0 @@ -69,7 +63,6 @@ row4 col0 PASS Test 6 - Mix of baseline aligned and non-baseline aligned cells. - row0 col0 row0 col1 vertical-align=top row0 col2 vertical-align=bottom PASS row1 col0 @@ -85,7 +78,6 @@ row6 col0 PASS Test 7 - CSS Table. - row0 col0 row0 col1 row0 col2 row1 col0 row1 col1 row1 col2 row2 col0 @@ -98,7 +90,6 @@ row9 col0 row10 col0 Test 8 - Table Similar to CSS table with rowspan. - row0 col0 row0 col1 row0 col2 PASS row1 col1 row1 col2 row1 col3
diff --git a/third_party/WebKit/LayoutTests/fast/table/table-rowspan-height-distribution-in-rows-2-expected.txt b/third_party/WebKit/LayoutTests/fast/table/table-rowspan-height-distribution-in-rows-2-expected.txt index 8c945c0..b8fc36f 100644 --- a/third_party/WebKit/LayoutTests/fast/table/table-rowspan-height-distribution-in-rows-2-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/table/table-rowspan-height-distribution-in-rows-2-expected.txt
@@ -1,9 +1,7 @@ Test for chromium bug : 254914. Height of fixed height cell is not proper when cell's row is under row spanning cell. Rows in rowspan should get proportional height. - Test 1 - One rowSpan cell - row0 col0 PASS row1 col0 - rowspan=4 row1 col1 @@ -17,7 +15,6 @@ row5 col0 PASS Test 2 - One rowSpan cell and specified table width - row0 col0 - rowspan=5 row0 col1 PASS row1 col1 @@ -29,7 +26,6 @@ row4 col1 PASS Test 3 - One rowSpan cell and specified rowSpan cell height - row0 col0 PASS row1 col0 row1 col1 - rowspan=4 height=300px @@ -43,7 +39,6 @@ row5 col0 row5 col1 PASS Test 4 - One rowSpan cell and one cell have fixed height. - row0 col0 PASS row1 col0 row1 col1 - rowspan=4 height=300px @@ -57,7 +52,6 @@ row5 col0 row5 col1 PASS Test 5 - One rowSpan cell and one cell have percent height. - row0 col0 PASS row1 col0 row1 col1 - rowspan=4 height=300px @@ -71,7 +65,6 @@ row5 col0 row5 col1 PASS Test 6 - One rowSpan cell, one cell have percent height and another one cell have fixed height. - row0 col0 PASS row1 col0 row1 col1 - rowspan=4 height=300px @@ -85,7 +78,6 @@ row5 col0 row5 col1 PASS Test 7 - One rowSpan cell and two cells have percent height but total percent is less than 100. - row0 col0 PASS row1 col0 row1 col1 - rowspan=4 height=300px @@ -99,7 +91,6 @@ row5 col0 row5 col1 PASS Test 8 - One rowSpan cell and three cells have percent height but total percent is more than 100. - row0 col0 PASS row1 col0 height=60% row1 col1 - rowspan=4 height=300px @@ -113,7 +104,6 @@ row5 col0 row5 col1 PASS Test 9 - One rowSpan cell and specified cells height. - row0 col0 PASS row1 col0 height=70px row1 col1 - rowspan=4 height=500px @@ -127,7 +117,6 @@ row5 col0 height=50px row5 col1 PASS Test 10 - RowSpan and ColSpan. - row0 col0 row0 col1 - rowspan=3 colspan=2 row0 col2 PASS row1 col0 @@ -139,7 +128,6 @@ row4 col0 PASS Test 11 - Mix of baseline aligned and non-baseline aligned cells. - row0 col0 row0 col1 vertical-align=top row0 col2 vertical-align=bottom PASS row1 col0 @@ -155,7 +143,6 @@ row6 col0 PASS Test 12 - CSS Table. - row0 col0 row0 col1 row0 col2 row1 col0 row1 col1 row1 col2 row2 col0 @@ -168,7 +155,6 @@ row9 col0 row10 col0 Test 13 - Table Similar to CSS table with rowspan. - row0 col0 row0 col1 row0 col2 PASS row1 col1 row1 col2 row1 col3
diff --git a/third_party/WebKit/LayoutTests/fast/table/table-rowspan-table-height-and-row-precent-height-too-large-expected.txt b/third_party/WebKit/LayoutTests/fast/table/table-rowspan-table-height-and-row-precent-height-too-large-expected.txt index 7731d0f..4654f37 100644 --- a/third_party/WebKit/LayoutTests/fast/table/table-rowspan-table-height-and-row-precent-height-too-large-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/table/table-rowspan-table-height-and-row-precent-height-too-large-expected.txt
@@ -2,6 +2,5 @@ Page is crashing on assression when table row span cell's percent height is too large. For this test to PASS, it should not crash. - This row span cell height is too large.
diff --git a/third_party/WebKit/LayoutTests/fast/table/table-sections-border-spacing-expected.txt b/third_party/WebKit/LayoutTests/fast/table/table-sections-border-spacing-expected.txt index 20ca3e12..aa2f4c5 100644 --- a/third_party/WebKit/LayoutTests/fast/table/table-sections-border-spacing-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/table/table-sections-border-spacing-expected.txt
@@ -1,7 +1,6 @@ Test for chromium bug : 29502. border-spacing is doubled between table-row-groups. Border-spacing was adding twice, One for bottom of first section and another for top of second section. But bottom of first section and top of second section border spacing should be common. - Distance between all rows in the table should be same. row0 head0 row0 head1
diff --git a/third_party/WebKit/LayoutTests/fast/table/table-toggle-paragraph-padding-expected.txt b/third_party/WebKit/LayoutTests/fast/table/table-toggle-paragraph-padding-expected.txt index c0636db..a3eb63c 100644 --- a/third_party/WebKit/LayoutTests/fast/table/table-toggle-paragraph-padding-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/table/table-toggle-paragraph-padding-expected.txt
@@ -1,7 +1,6 @@ Test for chromium bug : 241331. Margins on children of display:table-cell elements get stuck at highest value. BeforeMargin of the row was not reseting back to 0 when margin of the cell's child is changed from 100px to 0. - The two blocks below should look identical. a
diff --git a/third_party/WebKit/LayoutTests/fast/tokenizer/004-expected.txt b/third_party/WebKit/LayoutTests/fast/tokenizer/004-expected.txt index 8457497f..13e14f6 100644 --- a/third_party/WebKit/LayoutTests/fast/tokenizer/004-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/tokenizer/004-expected.txt
@@ -1,7 +1,6 @@ Variations on type attribute of script tag These scripts should execute - no type attribute executed empty string executed text/javascript executed @@ -25,7 +24,6 @@ application/x-javascript executed application/x-ecmascript executed These scripts should not execute - one space text/ text/vbscript @@ -95,7 +93,6 @@ Variations on language attribute of script tag These scripts should execute - no language attribute executed empty string executed jscript executed @@ -113,7 +110,6 @@ JavaScript1.6 executed JavaScript1.7 executed These scripts should not execute - one space vbscript livescript1.1 @@ -160,7 +156,6 @@ Variations on combined type and language attributes of script tag These scripts should execute - empty string type, "javascript" language executed empty string language, "text/javascript" type executed "javascript" language, "text/javascript" type executed @@ -168,7 +163,6 @@ "livescript" language, "text/javascript" type executed "javascript1.2" language, "text/javascript" type executed These scripts should not execute - "javascript" language, "bogus" type empty string type, "bogus" language empty string language, "bogus" type
diff --git a/third_party/WebKit/LayoutTests/fast/xpath/xpath-functional-test-expected.txt b/third_party/WebKit/LayoutTests/fast/xpath/xpath-functional-test-expected.txt index 6fa3553..98967b3 100644 --- a/third_party/WebKit/LayoutTests/fast/xpath/xpath-functional-test-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/xpath/xpath-functional-test-expected.txt
@@ -95,5 +95,4 @@ dfna subsup - abbrq
diff --git a/third_party/WebKit/LayoutTests/html/sections/nav-element-expected.txt b/third_party/WebKit/LayoutTests/html/sections/nav-element-expected.txt index acd6c4fa..eeda2d8 100644 --- a/third_party/WebKit/LayoutTests/html/sections/nav-element-expected.txt +++ b/third_party/WebKit/LayoutTests/html/sections/nav-element-expected.txt
@@ -1,5 +1,4 @@ Test content - Test that nav closes p. This paragraph should be surrounded by a thin green border, instead of a thick red one. Also tests that nav lays out as a block. There should be only a single border box with width of the content area (minus margins). Test that p does not close nav. This paragraph should have a double green border. @@ -15,7 +14,6 @@ DOM for the above (so this test can dump as text) - <p></p><nav>Test that <code>nav</code> closes <code>p</code>. This paragraph should be surrounded by a thin green border, instead of a thick red one. Also tests that nav lays out as a block. There should be only a single border box with width of the content area (minus margins).</nav> <br> <nav><p>Test that <code>p</code> does not close <code>nav</code>. This paragraph should have a double green border.</p></nav>
diff --git a/third_party/WebKit/LayoutTests/html/tabular_data/table_insertrow-expected.txt b/third_party/WebKit/LayoutTests/html/tabular_data/table_insertrow-expected.txt index 7dc5ba90d..b281a504 100644 --- a/third_party/WebKit/LayoutTests/html/tabular_data/table_insertrow-expected.txt +++ b/third_party/WebKit/LayoutTests/html/tabular_data/table_insertrow-expected.txt
@@ -1,7 +1,6 @@ HTMLTableElement's insertRow() method The first three test whether HTMLTableElement's insertRow() method can add an implicit tbody into a table without one, to hold the inserted row. - The first tests an empty table The second tests a table with text contents. @@ -9,7 +8,6 @@ The third tests a table with only a form element inside. The next four test the method on typical cases. - The first tests a table with only a thead The second tests a table with only a tbody
diff --git a/third_party/WebKit/LayoutTests/http/tests/cache/resources/etag-200-different.php b/third_party/WebKit/LayoutTests/http/tests/cache/resources/etag-200-different.php new file mode 100644 index 0000000..9d7a868 --- /dev/null +++ b/third_party/WebKit/LayoutTests/http/tests/cache/resources/etag-200-different.php
@@ -0,0 +1,13 @@ +<? +// Returns response headers that cause revalidation, and for revalidating +// requests returns 200 and a body different from the original one. +header('ETag: foo'); +header('Cache-control: max-age=0'); + +if ($_SERVER['HTTP_IF_NONE_MATCH'] == 'foo') { + // The body after revalidation. + echo "/* after revalidation */"; + exit; +} +// The body before revalidation. +echo "/* comment */";
diff --git a/third_party/WebKit/LayoutTests/http/tests/loading/redirect-methods-expected.txt b/third_party/WebKit/LayoutTests/http/tests/loading/redirect-methods-expected.txt index 6ec7f3e..3b614893 100644 --- a/third_party/WebKit/LayoutTests/http/tests/loading/redirect-methods-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/loading/redirect-methods-expected.txt
@@ -91,13 +91,9 @@ 301, 302, 303, and 307 http redirects are all tested. 301 redirect - 302 redirect - 303 redirect - 307 redirect -
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/sandbox-ALLOWED-top-navigation-with-two-flags-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/sandbox-ALLOWED-top-navigation-with-two-flags-expected.txt index 9968bd11..4ec5fe0 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/sandbox-ALLOWED-top-navigation-with-two-flags-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/sandbox-ALLOWED-top-navigation-with-two-flags-expected.txt
@@ -1,3 +1,2 @@ localhost - PASSED: Navigation succeeded.
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/sandbox-ALLOWED-top-navigation-with-user-gesture-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/sandbox-ALLOWED-top-navigation-with-user-gesture-expected.txt index 9968bd11..4ec5fe0 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/sandbox-ALLOWED-top-navigation-with-user-gesture-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/sandbox-ALLOWED-top-navigation-with-user-gesture-expected.txt
@@ -1,3 +1,2 @@ localhost - PASSED: Navigation succeeded.
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-ALLOWED-parent-navigation-change-async-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-ALLOWED-parent-navigation-change-async-expected.txt index 9968bd11..4ec5fe0 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-ALLOWED-parent-navigation-change-async-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-ALLOWED-parent-navigation-change-async-expected.txt
@@ -1,3 +1,2 @@ localhost - PASSED: Navigation succeeded.
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-ALLOWED-parent-navigation-change-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-ALLOWED-parent-navigation-change-expected.txt index 9968bd11..4ec5fe0 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-ALLOWED-parent-navigation-change-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-ALLOWED-parent-navigation-change-expected.txt
@@ -1,3 +1,2 @@ localhost - PASSED: Navigation succeeded.
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-ALLOWED-targeted-subframe-navigation-change-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-ALLOWED-targeted-subframe-navigation-change-expected.txt index 06e8706..d52aca0 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-ALLOWED-targeted-subframe-navigation-change-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-ALLOWED-targeted-subframe-navigation-change-expected.txt
@@ -1,7 +1,6 @@ This tests that documents can navigate the location of any of it's sub-frames regardless of domain. 127.0.0.1 - Perform Test -------- @@ -10,10 +9,8 @@ localhost - -------- Frame: 'targetFrame' -------- localhost - PASSED: Navigation succeeded.
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-targeted-link-navigation-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-targeted-link-navigation-expected.txt index ec9f4b7e..655ebe4 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-targeted-link-navigation-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-targeted-link-navigation-expected.txt
@@ -6,7 +6,6 @@ Frame-with-link-to-navigate localhost - Test PASSED Click me
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-top-navigation-user-gesture-in-parent-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-top-navigation-user-gesture-in-parent-expected.txt index 9968bd11..4ec5fe0 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-top-navigation-user-gesture-in-parent-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-top-navigation-user-gesture-in-parent-expected.txt
@@ -1,3 +1,2 @@ localhost - PASSED: Navigation succeeded.
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-top-navigation-without-user-gesture-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-top-navigation-without-user-gesture-expected.txt index 211d03a..5a29641 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-top-navigation-without-user-gesture-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-top-navigation-without-user-gesture-expected.txt
@@ -1,4 +1,3 @@ CONSOLE WARNING: line 8: Frame with URL 'http://localhost:8000/security/frameNavigation/resources/iframe-that-performs-top-navigation-without-user-gesture.html' attempted to navigate its top-level window with URL 'http://127.0.0.1:8000/security/frameNavigation/xss-DENIED-top-navigation-without-user-gesture.html'. Navigating the top-level window from a cross-origin iframe will soon require that the iframe has received a user gesture. See https://www.chromestatus.com/features/5851021045661696. localhost - PASSED: Navigation succeeded.
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/subresourceIntegrity/revalidation-failed-css.html b/third_party/WebKit/LayoutTests/http/tests/security/subresourceIntegrity/revalidation-failed-css.html new file mode 100644 index 0000000..3d9a8c52 --- /dev/null +++ b/third_party/WebKit/LayoutTests/http/tests/security/subresourceIntegrity/revalidation-failed-css.html
@@ -0,0 +1,28 @@ +<!DOCTYPE html> +<html> +<head> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> +</head> +<script> + var t_css = async_test( + "SRI with CSS with non-empty body after revalidation"); + function revalidate_css() { + var link = document.createElement('link'); + link.setAttribute('rel', 'stylesheet'); + link.integrity="sha256-YsI40D9FX0QghiYVdxQyySP2TOmARkLC5uPRO8RL2dE="; + link.onload = t_css.unreached_func('Second request should fail'); + link.onerror = t_css.step_func_done(); + link.href = + "../../cache/resources/etag-200-different.php?empty-after-revalidate-css"; + document.head.appendChild(link); + } +</script> +<link + href="../../cache/resources/etag-200-different.php?empty-after-revalidate-css" + rel="stylesheet" + integrity="sha256-YsI40D9FX0QghiYVdxQyySP2TOmARkLC5uPRO8RL2dE=" + onload="t_css.step_timeout(revalidate_css, 0)" + onerror="t_css.unreached_func('First request should pass')()" +> +</html>
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/subresourceIntegrity/revalidation-failed-script.html b/third_party/WebKit/LayoutTests/http/tests/security/subresourceIntegrity/revalidation-failed-script.html new file mode 100644 index 0000000..9420a6d --- /dev/null +++ b/third_party/WebKit/LayoutTests/http/tests/security/subresourceIntegrity/revalidation-failed-script.html
@@ -0,0 +1,27 @@ +<!DOCTYPE html> +<html> +<head> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> +</head> +<script> + var t_script = async_test( + "SRI with script with non-empty body after failed revalidation"); + function revalidate_script() { + var script = document.createElement('script'); + script.integrity = "sha256-YsI40D9FX0QghiYVdxQyySP2TOmARkLC5uPRO8RL2dE="; + script.onload = t_script.unreached_func('Second request should fail'); + script.onerror = t_script.step_func_done(); + script.src = + "../../cache/resources/etag-200-different.php?revalidation-failed-script"; + document.head.appendChild(script); + } +</script> +<script + src="../../cache/resources/etag-200-different.php?revalidation-failed-script" + type="text/javascript" + integrity="sha256-YsI40D9FX0QghiYVdxQyySP2TOmARkLC5uPRO8RL2dE=" + onload="t_script.step_timeout(revalidate_script, 0)" + onerror="t_script.unreached_func('First request should pass')()" +></script> +</html>
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/subresourceIntegrity/revalidation-succeeded-css.html b/third_party/WebKit/LayoutTests/http/tests/security/subresourceIntegrity/revalidation-succeeded-css.html new file mode 100644 index 0000000..a9de7a85 --- /dev/null +++ b/third_party/WebKit/LayoutTests/http/tests/security/subresourceIntegrity/revalidation-succeeded-css.html
@@ -0,0 +1,28 @@ +<!DOCTYPE html> +<html> +<head> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> +</head> +<script> + var t_css = async_test( + "SRI with CSS with successful revalidation shouldn't crash"); + function revalidate_css() { + var link = document.createElement('link'); + link.setAttribute('rel', 'stylesheet'); + link.integrity="sha256-tbudgBSg+bHWHiHnlteNzN8TUvI80ygS9IULh4rklEw="; + link.onload = t_css.step_func_done(); + link.onerror = t_css.unreached_func('Second request should pass'); + link.href = + "../../cache/resources/etag.php?empty-after-revalidate-css"; + document.head.appendChild(link); + } +</script> +<link + href="../../cache/resources/etag.php?empty-after-revalidate-css" + rel="stylesheet" + integrity="sha256-tbudgBSg+bHWHiHnlteNzN8TUvI80ygS9IULh4rklEw=" + onload="t_css.step_timeout(revalidate_css, 0)" + onerror="t_css.unreached_func('First request should pass')()" +> +</html>
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/subresourceIntegrity/revalidation-succeeded-script.html b/third_party/WebKit/LayoutTests/http/tests/security/subresourceIntegrity/revalidation-succeeded-script.html new file mode 100644 index 0000000..1266ee6 --- /dev/null +++ b/third_party/WebKit/LayoutTests/http/tests/security/subresourceIntegrity/revalidation-succeeded-script.html
@@ -0,0 +1,28 @@ +<!DOCTYPE html> +<html> +<head> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> +</head> +<script> + var foo; + var t_script = async_test( + "SRI with script with successful revalidation shouldn't crash"); + function revalidate_script() { + var script = document.createElement('script'); + script.integrity = "sha256-tbudgBSg+bHWHiHnlteNzN8TUvI80ygS9IULh4rklEw="; + script.onload = t_script.step_func_done(); + script.onerror = t_script.unreached_func('Second request should pass'); + script.src = + "../../cache/resources/etag.php?revalidation-failed-script"; + document.head.appendChild(script); + } +</script> +<script + src="../../cache/resources/etag.php?revalidation-failed-script" + type="text/javascript" + integrity="sha256-tbudgBSg+bHWHiHnlteNzN8TUvI80ygS9IULh4rklEw=" + onload="t_script.step_timeout(revalidate_script, 0)" + onerror="t_script.unreached_func('First request should pass')()" +></script> +</html>
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/vibration/vibrate-in-cross-origin-iframe-with-user-gesture-allowed-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/vibration/vibrate-in-cross-origin-iframe-with-user-gesture-allowed-expected.txt index 5f496306..3aecb43 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/vibration/vibrate-in-cross-origin-iframe-with-user-gesture-allowed-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/vibration/vibrate-in-cross-origin-iframe-with-user-gesture-allowed-expected.txt
@@ -4,7 +4,6 @@ 127.0.0.1 - -------- Frame: '<!--framePath //<!--frame0-->-->' --------
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/vibration/vibrate-in-same-origin-iframe-with-user-gesture-allowed-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/vibration/vibrate-in-same-origin-iframe-with-user-gesture-allowed-expected.txt index 3427454..47d28de 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/vibration/vibrate-in-same-origin-iframe-with-user-gesture-allowed-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/vibration/vibrate-in-same-origin-iframe-with-user-gesture-allowed-expected.txt
@@ -4,7 +4,6 @@ 127.0.0.1 - -------- Frame: '<!--framePath //<!--frame0-->-->' --------
diff --git a/third_party/WebKit/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-not-supported-expected.txt b/third_party/WebKit/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-not-supported-expected.txt deleted file mode 100644 index 15ab859..0000000 --- a/third_party/WebKit/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-not-supported-expected.txt +++ /dev/null
@@ -1,5 +0,0 @@ -CONSOLE WARNING: line 17: Synchronous XMLHttpRequest on the main thread is deprecated because of its detrimental effects to the end user's experience. For more help, check https://xhr.spec.whatwg.org/. -CONSOLE ERROR: line 34: Failed to load http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php: Response to preflight request doesn't pass access control check: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. -PASS: Request successfully blocked. - -
diff --git a/third_party/WebKit/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-not-supported.html b/third_party/WebKit/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-not-supported.html deleted file mode 100644 index 30991f1..0000000 --- a/third_party/WebKit/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-not-supported.html +++ /dev/null
@@ -1,61 +0,0 @@ -<html> -<body> -<pre id='console'></pre> -<script type="text/javascript"> -function log(message) -{ - document.getElementById('console').appendChild(document.createTextNode(message + "\n")); -} - -if (window.testRunner) - testRunner.dumpAsText(); - -(function() { - var xhr = new XMLHttpRequest(); - - try { - xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=reset", false); - xhr.send(null); - } catch(e) { - log("FAIL: Unable to reset server state: [" + e.message + "]."); - return; - } - - xhr = new XMLHttpRequest(); - - try { - xhr.open("PUT", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php", false); - } catch(e) { - log("FAIL: Exception thrown. Cross-domain access is not allowed in first 'open'. [" + e.message + "]."); - return; - } - - try { - xhr.send(null); - log("FAIL: Cross-domain access allowed in first send without throwing an exception"); - return; - } catch(e) { - // Eat the exception. - } - - xhr = new XMLHttpRequest(); - - try { - xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=complete", false); - } catch(e) { - log("FAIL: Exception thrown. Cross-domain access is not allowed in second 'open'. [" + e.message + "]."); - return; - } - - try { - xhr.send(null); - } catch(e) { - log("FAIL: Exception thrown. Cross-domain access is not allowed in second 'send'. [" + e.message + "]."); - return; - } - - log(xhr.responseText); -})(); -</script> -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/http/tests/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php b/third_party/WebKit/LayoutTests/http/tests/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php deleted file mode 100644 index 7b99096..0000000 --- a/third_party/WebKit/LayoutTests/http/tests/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php +++ /dev/null
@@ -1,67 +0,0 @@ -<?php -require_once '../../resources/portabilityLayer.php'; - -$tmpFile = sys_get_temp_dir() . "/xsrf.txt"; - -function fail($state) -{ - header("Access-Control-Allow-Origin: http://127.0.0.1:8000"); - header("Access-Control-Allow-Credentials: true"); - header("Access-Control-Allow-Methods: GET"); - header("Access-Control-Max-Age: 1"); - echo "FAILED: Issued a " . $_SERVER['REQUEST_METHOD'] . " request during state '" . $state . "'\n"; - exit(); -} - -function setState($newState, $file) -{ - file_put_contents($file, $newState); -} - -function getState($file) -{ - $state = NULL; - if (file_exists($file)) - $state = file_get_contents($file); - return $state ? $state : "Uninitialized"; -} - -$state = getState($tmpFile); - -if ($_SERVER['REQUEST_METHOD'] == "GET" - && $_GET['state'] == "reset") { - if (file_exists($tmpFile)) unlink($tmpFile); - header("Access-Control-Allow-Origin: http://127.0.0.1:8000"); - header("Access-Control-Max-Age: 1"); - echo "Server state reset.\n"; -} else if ($state == "Uninitialized") { - if ($_SERVER['REQUEST_METHOD'] == "OPTIONS") { - if ($_GET['state'] == "method" || $_GET['state'] == "header") { - header("Access-Control-Allow-Methods: GET"); - header("Access-Control-Allow-Origin: http://127.0.0.1:8000"); - header("Access-Control-Max-Age: 1"); - } - echo("FAIL: This request should not be displayed.\n"); - setState("Denied", $tmpFile); - } else { - fail($state); - } -} else if ($state == "Denied") { - if ($_SERVER['REQUEST_METHOD'] == "GET" - && $_GET['state'] == "complete") { - unlink($tmpFile); - header("Access-Control-Allow-Origin: http://127.0.0.1:8000"); - header("Access-Control-Max-Age: 1"); - echo "PASS: Request successfully blocked.\n"; - } else { - setState("Deny Ignored", $tmpFile); - fail($state); - } -} else if ($state == "Deny Ignored") { - unlink($tmpFile); - fail($state); -} else { - if (file_exists($tmpFile)) unlink($tmpFile); - fail("Unknown"); -} -?>
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/table-all-rowspans-height-distribution-in-rows-except-overlapped-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/table/table-all-rowspans-height-distribution-in-rows-except-overlapped-expected.txt index c69d0c3b..e59dc818 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/table-all-rowspans-height-distribution-in-rows-except-overlapped-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/table-all-rowspans-height-distribution-in-rows-except-overlapped-expected.txt
@@ -1,9 +1,7 @@ Test for chromium bug : 249600. Extra logical height is not properly spread over the rows in a row-spanning cell. Rows in rowspan should get proportional height. - Test 1 - Three rowSpan cells - row0 col0 PASS row1 col0 - rowspan=4 row1 col1 @@ -58,7 +56,6 @@ row17 col0 row17 col1 PASS Test 2 - Three rowSpan cell and specified table width - row0 col0 - rowspan=5 row0 col1 PASS row1 col1 @@ -117,7 +114,6 @@ row16 col0 row16 col1 PASS Test 3 - Continuous 3 rowSpan cells - row0 col0 PASS row1 col0 - rowspan=4 row1 col1 @@ -164,7 +160,6 @@ row13 col0 row13 col1 PASS Test 4 - Two rowSpan cells, 2 rows in first spanning cell have percent height and 2 rows in second spanning cell have fixed height - row0 col0 PASS row1 col0 - rowspan=4 row1 col1 @@ -214,7 +209,6 @@ row12 col0 PASS Test 5 - Two rowSpan cells, in first spanning cell, 2 rows have percent height and 2 rows have fixed height and in second spanning cell, 1 row have fixed height, 1 row have percent height and remaining are auto. - row0 col0 PASS row1 col0 - rowspan=4 row1 col1 @@ -257,7 +251,6 @@ row12 col0 PASS Test 6 - RowSpan and ColSpan. - row0 col0 row0 col1 - rowspan=3 colspan=2 row0 col2 PASS row1 col0 @@ -269,7 +262,6 @@ row4 col0 PASS Test 7 - Mix of baseline aligned and non-baseline aligned cells. - row0 col0 row0 col1 vertical-align=top row0 col2 vertical-align=bottom PASS row1 col0 @@ -296,7 +288,6 @@ row6 col0 PASS Test 8 - CSS Table. - row0 col0 row0 col1 row0 col2 row1 col0 row1 col1 row1 col2 row2 col0 @@ -309,7 +300,6 @@ row9 col0 row10 col0 Test 9 - Table Similar to CSS table with rowspan. - row0 col0 row0 col1 row0 col2 FAIL: Expected 21 for height, but got 19.
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/table-all-rowspans-height-distribution-in-rows-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/table/table-all-rowspans-height-distribution-in-rows-expected.txt index 1715ead..6bd815d 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/table-all-rowspans-height-distribution-in-rows-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/table-all-rowspans-height-distribution-in-rows-expected.txt
@@ -1,9 +1,7 @@ Test for chromium bug : 252120. Content of the row spanning cell is flowing out of the cell boundries. Row spanning cell height is not set as per its content height or given height to this cells. - Test 1 - One row spanning cell present under the boundries of other row spanning cell and inner row spanning cell have lots of content. - row0 col0 rowspan=6 height=400px row0 col1 PASS row1 col1 @@ -34,7 +32,6 @@ row6 col0 PASS Test 2 - One row spanning cell present under the boundries of other row spanning cell and inner row spanning cell have its own height. - row0 col0 rowspan=6 height=600px row0 col1 PASS row1 col1 @@ -55,7 +52,6 @@ row6 col0 PASS Test 3 - 2 same row spanning cells with different heights. - row0 col0 rowspan=6 height=300px row0 col1 rowspan=6 height=500px FAIL: Expected 308 for height, but got 310. @@ -77,7 +73,6 @@ row6 col0 PASS Test 4 - some rows are common between 2 row spanning cells. - row0 col0 rowspan=6 height=400px row0 col1 PASS row1 col1 rowspan=6 height=800px @@ -100,7 +95,6 @@ row7 col0 PASS Test 5 - 2 spanning cells starts at different row index but end at same row index. - row0 col0 rowspan=6 height=400px row0 col1 PASS row1 col1 rowspan=6 height=800px @@ -123,7 +117,6 @@ row7 col0 PASS Test 6 - RowSpan and ColSpan. - row0 col0 row0 col1 - rowspan=3 colspan=2 row0 col2 PASS row1 col0 @@ -135,7 +128,6 @@ row4 col0 PASS Test 7 - Mix of baseline aligned and non-baseline aligned cells. - row0 col0 row0 col1 vertical-align=top row0 col2 vertical-align=bottom PASS row1 col0 @@ -162,7 +154,6 @@ row6 col0 PASS Test 8 - CSS Table. - row0 col0 row0 col1 row0 col2 row1 col0 row1 col1 row1 col2 row2 col0 @@ -175,7 +166,6 @@ row9 col0 row10 col0 Test 9 - Table Similar to CSS table with rowspan. - row0 col0 row0 col1 row0 col2 FAIL: Expected 21 for height, but got 19.
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/table-rowspan-height-distribution-in-rows-1-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/table/table-rowspan-height-distribution-in-rows-1-expected.txt index 37afdbf..d6568c97 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/table-rowspan-height-distribution-in-rows-1-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/table-rowspan-height-distribution-in-rows-1-expected.txt
@@ -1,9 +1,7 @@ Test for chromium bug : 78724. Extra logical height is not properly spread over the rows in a row-spanning cell. Rows in rowspan should get proportional height. - Test 1 - One rowSpan cell - row0 col0 PASS row1 col0 - rowspan=4 row1 col1 @@ -17,7 +15,6 @@ row5 col0 PASS Test 2 - One rowSpan cell and specified table width - row0 col0 - rowspan=5 row0 col1 PASS row1 col1 @@ -29,7 +26,6 @@ row4 col1 PASS Test 3 - One rowSpan cell and specified rowSpan cell height - row0 col0 PASS row1 col0 row1 col1 - rowspan=4 @@ -54,7 +50,6 @@ row5 col0 row5 col1 PASS Test 4 - One rowSpan cell and specified cells height - row0 col0 PASS row1 col0 row1 col1 - rowspan=4 @@ -74,7 +69,6 @@ row5 col0 row5 col1 PASS Test 5 - RowSpan and ColSpan. - row0 col0 row0 col1 - rowspan=3 colspan=2 row0 col2 PASS row1 col0 @@ -86,7 +80,6 @@ row4 col0 PASS Test 6 - Mix of baseline aligned and non-baseline aligned cells. - row0 col0 row0 col1 vertical-align=top row0 col2 vertical-align=bottom PASS row1 col0 @@ -113,7 +106,6 @@ row6 col0 PASS Test 7 - CSS Table. - row0 col0 row0 col1 row0 col2 row1 col0 row1 col1 row1 col2 row2 col0 @@ -126,7 +118,6 @@ row9 col0 row10 col0 Test 8 - Table Similar to CSS table with rowspan. - row0 col0 row0 col1 row0 col2 FAIL: Expected 21 for height, but got 19.
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/table-rowspan-height-distribution-in-rows-2-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/table/table-rowspan-height-distribution-in-rows-2-expected.txt index 98ad95f..d0b2aa4 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/table-rowspan-height-distribution-in-rows-2-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/table-rowspan-height-distribution-in-rows-2-expected.txt
@@ -1,9 +1,7 @@ Test for chromium bug : 254914. Height of fixed height cell is not proper when cell's row is under row spanning cell. Rows in rowspan should get proportional height. - Test 1 - One rowSpan cell - row0 col0 PASS row1 col0 - rowspan=4 row1 col1 @@ -17,7 +15,6 @@ row5 col0 PASS Test 2 - One rowSpan cell and specified table width - row0 col0 - rowspan=5 row0 col1 PASS row1 col1 @@ -29,7 +26,6 @@ row4 col1 PASS Test 3 - One rowSpan cell and specified rowSpan cell height - row0 col0 PASS row1 col0 row1 col1 - rowspan=4 height=300px @@ -54,7 +50,6 @@ row5 col0 row5 col1 PASS Test 4 - One rowSpan cell and one cell have fixed height. - row0 col0 PASS row1 col0 row1 col1 - rowspan=4 height=300px @@ -79,7 +74,6 @@ row5 col0 row5 col1 PASS Test 5 - One rowSpan cell and one cell have percent height. - row0 col0 PASS row1 col0 row1 col1 - rowspan=4 height=300px @@ -104,7 +98,6 @@ row5 col0 row5 col1 PASS Test 6 - One rowSpan cell, one cell have percent height and another one cell have fixed height. - row0 col0 PASS row1 col0 row1 col1 - rowspan=4 height=300px @@ -123,7 +116,6 @@ row5 col0 row5 col1 PASS Test 7 - One rowSpan cell and two cells have percent height but total percent is less than 100. - row0 col0 PASS row1 col0 row1 col1 - rowspan=4 height=300px @@ -158,7 +150,6 @@ row5 col0 row5 col1 PASS Test 8 - One rowSpan cell and three cells have percent height but total percent is more than 100. - row0 col0 PASS row1 col0 height=60% row1 col1 - rowspan=4 height=300px @@ -178,7 +169,6 @@ row5 col0 row5 col1 PASS Test 9 - One rowSpan cell and specified cells height. - row0 col0 PASS row1 col0 height=70px row1 col1 - rowspan=4 height=500px @@ -192,7 +182,6 @@ row5 col0 height=50px row5 col1 PASS Test 10 - RowSpan and ColSpan. - row0 col0 row0 col1 - rowspan=3 colspan=2 row0 col2 PASS row1 col0 @@ -204,7 +193,6 @@ row4 col0 PASS Test 11 - Mix of baseline aligned and non-baseline aligned cells. - row0 col0 row0 col1 vertical-align=top row0 col2 vertical-align=bottom PASS row1 col0 @@ -231,7 +219,6 @@ row6 col0 PASS Test 12 - CSS Table. - row0 col0 row0 col1 row0 col2 row1 col0 row1 col1 row1 col2 row2 col0 @@ -244,7 +231,6 @@ row9 col0 row10 col0 Test 13 - Table Similar to CSS table with rowspan. - row0 col0 row0 col1 row0 col2 FAIL: Expected 21 for height, but got 19.
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/table-all-rowspans-height-distribution-in-rows-except-overlapped-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/table/table-all-rowspans-height-distribution-in-rows-except-overlapped-expected.txt index 1999835..3bbe6245 100644 --- a/third_party/WebKit/LayoutTests/platform/win/fast/table/table-all-rowspans-height-distribution-in-rows-except-overlapped-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/table-all-rowspans-height-distribution-in-rows-except-overlapped-expected.txt
@@ -1,9 +1,7 @@ Test for chromium bug : 249600. Extra logical height is not properly spread over the rows in a row-spanning cell. Rows in rowspan should get proportional height. - Test 1 - Three rowSpan cells - row0 col0 PASS row1 col0 - rowspan=4 row1 col1 @@ -41,7 +39,6 @@ row17 col0 row17 col1 PASS Test 2 - Three rowSpan cell and specified table width - row0 col0 - rowspan=5 row0 col1 PASS row1 col1 @@ -77,7 +74,6 @@ row16 col0 row16 col1 PASS Test 3 - Continuous 3 rowSpan cells - row0 col0 PASS row1 col0 - rowspan=4 row1 col1 @@ -107,7 +103,6 @@ row13 col0 row13 col1 PASS Test 4 - Two rowSpan cells, 2 rows in first spanning cell have percent height and 2 rows in second spanning cell have fixed height - row0 col0 PASS row1 col0 - rowspan=4 row1 col1 @@ -135,7 +130,6 @@ row12 col0 PASS Test 5 - Two rowSpan cells, in first spanning cell, 2 rows have percent height and 2 rows have fixed height and in second spanning cell, 1 row have fixed height, 1 row have percent height and remaining are auto. - row0 col0 PASS row1 col0 - rowspan=4 row1 col1 @@ -163,7 +157,6 @@ row12 col0 PASS Test 6 - RowSpan and ColSpan. - row0 col0 row0 col1 - rowspan=3 colspan=2 row0 col2 PASS row1 col0 @@ -175,7 +168,6 @@ row4 col0 PASS Test 7 - Mix of baseline aligned and non-baseline aligned cells. - row0 col0 row0 col1 vertical-align=top row0 col2 vertical-align=bottom PASS row1 col0 @@ -191,7 +183,6 @@ row6 col0 PASS Test 8 - CSS Table. - row0 col0 row0 col1 row0 col2 row1 col0 row1 col1 row1 col2 row2 col0 @@ -204,7 +195,6 @@ row9 col0 row10 col0 Test 9 - Table Similar to CSS table with rowspan. - row0 col0 row0 col1 row0 col2 PASS row1 col1 row1 col2 row1 col3
diff --git a/third_party/WebKit/Source/bindings/tests/idls/core/TestObject.idl b/third_party/WebKit/Source/bindings/tests/idls/core/TestObject.idl index 11733b2f..4fe686c 100644 --- a/third_party/WebKit/Source/bindings/tests/idls/core/TestObject.idl +++ b/third_party/WebKit/Source/bindings/tests/idls/core/TestObject.idl
@@ -548,6 +548,6 @@ attribute TestInterfaceGarbageCollected testInterfaceGarbageCollectedAttribute; // [GarbageCollected] attribute TestInterfaceGarbageCollected? testInterfaceGarbageCollectedOrNullAttribute; // [GarbageCollected] - maplike<long, DOMStringOrDouble>; + maplike<[EnforceRange] long, DOMStringOrDouble>; [RuntimeEnabled=FeatureName, CallWith=ScriptState, RaisesException, ImplementedAs=myMaplikeClear] boolean clear(); };
diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp index fe2397cc..d19e0625 100644 --- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp +++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
@@ -9141,7 +9141,7 @@ } int32_t key; - key = NativeValueTraits<IDLLong>::NativeValue(info.GetIsolate(), info[0], exceptionState, kNormalConversion); + key = NativeValueTraits<IDLLong>::NativeValue(info.GetIsolate(), info[0], exceptionState, kEnforceRange); if (exceptionState.HadException()) return; @@ -9165,7 +9165,7 @@ } int32_t key; - key = NativeValueTraits<IDLLong>::NativeValue(info.GetIsolate(), info[0], exceptionState, kNormalConversion); + key = NativeValueTraits<IDLLong>::NativeValue(info.GetIsolate(), info[0], exceptionState, kEnforceRange); if (exceptionState.HadException()) return; @@ -9189,7 +9189,7 @@ } int32_t key; - key = NativeValueTraits<IDLLong>::NativeValue(info.GetIsolate(), info[0], exceptionState, kNormalConversion); + key = NativeValueTraits<IDLLong>::NativeValue(info.GetIsolate(), info[0], exceptionState, kEnforceRange); if (exceptionState.HadException()) return; @@ -9214,7 +9214,7 @@ int32_t key; StringOrDouble value; - key = NativeValueTraits<IDLLong>::NativeValue(info.GetIsolate(), info[0], exceptionState, kNormalConversion); + key = NativeValueTraits<IDLLong>::NativeValue(info.GetIsolate(), info[0], exceptionState, kEnforceRange); if (exceptionState.HadException()) return;
diff --git a/third_party/WebKit/Source/build/scripts/core/css/properties/templates/CSSPropertyAPI.h.tmpl b/third_party/WebKit/Source/build/scripts/core/css/properties/templates/CSSPropertyAPI.h.tmpl index f2e85283..d2daff0 100644 --- a/third_party/WebKit/Source/build/scripts/core/css/properties/templates/CSSPropertyAPI.h.tmpl +++ b/third_party/WebKit/Source/build/scripts/core/css/properties/templates/CSSPropertyAPI.h.tmpl
@@ -30,9 +30,7 @@ // Parses and consumes a longhand property value from the token range. // Returns nullptr if the input is invalid. - // TODO(bugsnash): remove CSSPropertyID arg from this and ParseShorthand - virtual const CSSValue* ParseSingleValue(CSSPropertyID, - CSSParserTokenRange&, + virtual const CSSValue* ParseSingleValue(CSSParserTokenRange&, const CSSParserContext&, const CSSParserLocalContext&) const { return nullptr; @@ -40,8 +38,7 @@ // Parses and consumes entire shorthand value from the token range and adds // all constituent parsed longhand properties to the 'properties' set. // Returns false if the input is invalid. - virtual bool ParseShorthand(CSSPropertyID, - bool important, + virtual bool ParseShorthand(bool important, CSSParserTokenRange&, const CSSParserContext&, const CSSParserLocalContext&,
diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp index c476e1cb..06ccc3ae 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
@@ -95,7 +95,7 @@ // variable ref parser below. if (CSSPropertyAPI::Get(property_id) .ParseShorthand( - property_id, important, range_, *context_, + important, range_, *context_, CSSParserLocalContext(isPropertyAlias(unresolved_property), property_id), *parsed_properties_))
diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParserHelpers.cpp b/third_party/WebKit/Source/core/css/parser/CSSPropertyParserHelpers.cpp index 05171e4..10050a5 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParserHelpers.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParserHelpers.cpp
@@ -1653,7 +1653,7 @@ const CSSPropertyAPI& api = CSSPropertyAPI::Get(property); const CSSValue* result = api.ParseSingleValue( - property, range, context, + range, context, CSSParserLocalContext(isPropertyAlias(unresolved_property), current_shorthand)); return result;
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAlignItems.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAlignItems.cpp index 59772e0..2424a35 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAlignItems.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAlignItems.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIAlignItems::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAlignOrJustifyContent.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAlignOrJustifyContent.cpp index 467b10f5..017f1be 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAlignOrJustifyContent.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAlignOrJustifyContent.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIAlignOrJustifyContent::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAlignSelf.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAlignSelf.cpp index 822247f..1c84a230 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAlignSelf.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAlignSelf.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIAlignSelf::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAnimationDirection.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAnimationDirection.cpp index b38d696..5dbb0f4 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAnimationDirection.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAnimationDirection.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIAnimationDirection::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAnimationFillMode.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAnimationFillMode.cpp index 04488d1..274a684 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAnimationFillMode.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAnimationFillMode.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIAnimationFillMode::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAnimationIterationCount.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAnimationIterationCount.cpp index 5ee78f4..c86d631 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAnimationIterationCount.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAnimationIterationCount.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIAnimationIterationCount::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAnimationName.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAnimationName.cpp index 3240c6d..f2c0935 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAnimationName.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAnimationName.cpp
@@ -12,7 +12,6 @@ namespace blink { const CSSValue* CSSPropertyAPIAnimationName::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext& local_context) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAnimationPlayState.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAnimationPlayState.cpp index e12978a..39f9d31 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAnimationPlayState.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAnimationPlayState.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIAnimationPlayState::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAutoOrString.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAutoOrString.cpp index 435e9d8..157d121 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAutoOrString.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIAutoOrString.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIAutoOrString::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackdropFilter.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackdropFilter.cpp index a80c89fc..87f8b58 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackdropFilter.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackdropFilter.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIBackdropFilter::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundAttachment.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundAttachment.cpp index 4698621..b68d10d 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundAttachment.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundAttachment.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIBackgroundAttachment::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundBlendMode.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundBlendMode.cpp index 43fc787..2d3653e9 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundBlendMode.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundBlendMode.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIBackgroundBlendMode::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundBox.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundBox.cpp index cf4551e..389efb9 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundBox.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundBox.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIBackgroundBox::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundColor.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundColor.cpp index 62c8ecf..d2151f8 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundColor.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundColor.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIBackgroundColor::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundOrMaskImage.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundOrMaskImage.cpp index f1a7d3fe..3943957 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundOrMaskImage.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundOrMaskImage.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIBackgroundOrMaskImage::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundOrMaskSize.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundOrMaskSize.cpp index f65101d..564e5b8 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundOrMaskSize.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBackgroundOrMaskSize.cpp
@@ -12,7 +12,6 @@ namespace blink { const CSSValue* CSSPropertyAPIBackgroundOrMaskSize::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext& local_context) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBaselineShift.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBaselineShift.cpp index 3cf0f30..79360c3 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBaselineShift.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBaselineShift.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIBaselineShift::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderColor.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderColor.cpp index 781b598..db67a62c 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderColor.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderColor.cpp
@@ -13,7 +13,6 @@ namespace blink { const CSSValue* CSSPropertyAPIBorderColor::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext& local_context) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderImageOutset.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderImageOutset.cpp index eaf1c754..adbd040 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderImageOutset.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderImageOutset.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIBorderImageOutset::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderImageRepeat.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderImageRepeat.cpp index 703c32f..7e4539e 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderImageRepeat.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderImageRepeat.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIBorderImageRepeat::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderImageSlice.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderImageSlice.cpp index 033f159..96b1f49a 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderImageSlice.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderImageSlice.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIBorderImageSlice::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderImageWidth.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderImageWidth.cpp index a0835c9d..5fd9dfe 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderImageWidth.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderImageWidth.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIBorderImageWidth::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderRadius.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderRadius.cpp index 9b56571..08c6c43f 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderRadius.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderRadius.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIBorderRadius::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderWidth.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderWidth.cpp index e5ab99d..81dd489 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderWidth.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBorderWidth.cpp
@@ -13,7 +13,6 @@ namespace blink { const CSSValue* CSSPropertyAPIBorderWidth::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext& local_context) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBoxShadow.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBoxShadow.cpp index f889a20..77888d91 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBoxShadow.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIBoxShadow.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIBoxShadow::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPICaretColor.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPICaretColor.cpp index bd88884a..8736974 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPICaretColor.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPICaretColor.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPICaretColor::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIClip.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIClip.cpp index 7d191dfc..564570a 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIClip.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIClip.cpp
@@ -24,7 +24,6 @@ } // namespace const CSSValue* CSSPropertyAPIClip::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIClipPath.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIClipPath.cpp index dad4f26..b37d6509 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIClipPath.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIClipPath.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIClipPath::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColor.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColor.cpp index b5703f8..608b9cc 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColor.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColor.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIColor::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColorNoQuirks.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColorNoQuirks.cpp index db53e517..5b8b5d1c 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColorNoQuirks.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColorNoQuirks.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIColorNoQuirks::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColumnCount.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColumnCount.cpp index d7a1a77..5a64355 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColumnCount.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColumnCount.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIColumnCount::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColumnGap.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColumnGap.cpp index ded916a..e9c461b 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColumnGap.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColumnGap.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIColumnGap::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColumnRuleWidth.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColumnRuleWidth.cpp index 0d78694..7711ea8b 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColumnRuleWidth.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColumnRuleWidth.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIColumnRuleWidth::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColumnSpan.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColumnSpan.cpp index abd33851..5ba51af 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColumnSpan.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColumnSpan.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIColumnSpan::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColumnWidth.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColumnWidth.cpp index 58162ea..9b652b70 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColumnWidth.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIColumnWidth.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIColumnWidth::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIContain.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIContain.cpp index 724bbfd..85d2ad2 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIContain.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIContain.cpp
@@ -12,7 +12,6 @@ // none | strict | content | [ layout || style || paint || size ] const CSSValue* CSSPropertyAPIContain::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIContent.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIContent.cpp index 765a491..fe7e16d 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIContent.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIContent.cpp
@@ -70,7 +70,6 @@ } // namespace const CSSValue* CSSPropertyAPIContent::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPICounterIncrement.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPICounterIncrement.cpp index 2dd81ab..b2537b7 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPICounterIncrement.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPICounterIncrement.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPICounterIncrement::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPICounterReset.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPICounterReset.cpp index bba86b0..0e7e36c 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPICounterReset.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPICounterReset.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPICounterReset::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPICursor.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPICursor.cpp index 985726f..2c22317 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPICursor.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPICursor.cpp
@@ -14,7 +14,6 @@ namespace blink { const CSSValue* CSSPropertyAPICursor::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPID.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPID.cpp index c37c07aa..b1422db4 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPID.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPID.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPID::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIDelay.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIDelay.cpp index 4b3c353..f165cc4 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIDelay.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIDelay.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIDelay::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIDuration.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIDuration.cpp index 6a75c4b..2f26d1f 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIDuration.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIDuration.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIDuration::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFillOrStrokeOpacity.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFillOrStrokeOpacity.cpp index 347c966..6ab90be 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFillOrStrokeOpacity.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFillOrStrokeOpacity.cpp
@@ -11,7 +11,6 @@ class CSSParserLocalContext; const CSSValue* CSSPropertyAPIFillOrStrokeOpacity::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFilter.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFilter.cpp index f8ac743..8526586 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFilter.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFilter.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIFilter::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFlexBasis.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFlexBasis.cpp index 593c6ad..9515e679 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFlexBasis.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFlexBasis.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIFlexBasis::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFlexGrowOrShrink.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFlexGrowOrShrink.cpp index f26dae19..593b018 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFlexGrowOrShrink.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFlexGrowOrShrink.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIFlexGrowOrShrink::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontFamily.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontFamily.cpp index 3590e97..d62554f 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontFamily.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontFamily.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIFontFamily::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontFeatureSettings.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontFeatureSettings.cpp index 2bfa0831..d8ce7ed 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontFeatureSettings.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontFeatureSettings.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIFontFeatureSettings::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontSize.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontSize.cpp index 6cd648b..82cd491 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontSize.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontSize.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIFontSize::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontSizeAdjust.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontSizeAdjust.cpp index 80ae0be..03a0740 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontSizeAdjust.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontSizeAdjust.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIFontSizeAdjust::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontStretch.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontStretch.cpp index ec11944..ebf80fd 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontStretch.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontStretch.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIFontStretch::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontStyle.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontStyle.cpp index 35b61680a..ccce007db 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontStyle.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontStyle.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIFontStyle::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontVariantCaps.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontVariantCaps.cpp index 13da0fa..abdc050 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontVariantCaps.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontVariantCaps.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIFontVariantCaps::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontVariantEastAsian.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontVariantEastAsian.cpp index fb4baba..4c5d62a 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontVariantEastAsian.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontVariantEastAsian.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIFontVariantEastAsian::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontVariantLigatures.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontVariantLigatures.cpp index 5de40fd8..a807b19 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontVariantLigatures.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontVariantLigatures.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIFontVariantLigatures::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontVariantNumeric.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontVariantNumeric.cpp index 0a905fdb..8afd4cf 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontVariantNumeric.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontVariantNumeric.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIFontVariantNumeric::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontVariationSettings.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontVariationSettings.cpp index 81d80fb..e387582 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontVariationSettings.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontVariationSettings.cpp
@@ -42,7 +42,6 @@ } // namespace const CSSValue* CSSPropertyAPIFontVariationSettings::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontWeight.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontWeight.cpp index e77ee965..76845e62 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontWeight.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIFontWeight.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIFontWeight::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridAutoFlow.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridAutoFlow.cpp index e146eeb..cb528e1 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridAutoFlow.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridAutoFlow.cpp
@@ -12,7 +12,6 @@ namespace blink { const CSSValue* CSSPropertyAPIGridAutoFlow::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridAutoLine.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridAutoLine.cpp index 21f9213..ad56b05 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridAutoLine.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridAutoLine.cpp
@@ -12,7 +12,6 @@ namespace blink { const CSSValue* CSSPropertyAPIGridAutoLine::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridGap.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridGap.cpp index 8d63e45..c224640 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridGap.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridGap.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIGridGap::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridLine.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridLine.cpp index 90f2c08c4..fd0a93708 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridLine.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridLine.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIGridLine::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridTemplateAreas.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridTemplateAreas.cpp index c8dda27..07badd65 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridTemplateAreas.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridTemplateAreas.cpp
@@ -16,7 +16,6 @@ namespace blink { const CSSValue* CSSPropertyAPIGridTemplateAreas::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridTemplateLine.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridTemplateLine.cpp index 2f05891..db0500f 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridTemplateLine.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIGridTemplateLine.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIGridTemplateLine::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIImageOrientation.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIImageOrientation.cpp index 7764603..55c7e91 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIImageOrientation.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIImageOrientation.cpp
@@ -12,7 +12,6 @@ namespace blink { const CSSValue* CSSPropertyAPIImageOrientation::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIImageSource.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIImageSource.cpp index 02da36d..9ba57b65 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIImageSource.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIImageSource.cpp
@@ -11,7 +11,6 @@ class CSSParserLocalContext; const CSSValue* CSSPropertyAPIImageSource::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIJustifyItems.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIJustifyItems.cpp index e6dcf071..ebce885 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIJustifyItems.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIJustifyItems.cpp
@@ -12,7 +12,6 @@ namespace blink { const CSSValue* CSSPropertyAPIJustifyItems::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIJustifySelf.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIJustifySelf.cpp index 6d2a40de..557eb68 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIJustifySelf.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIJustifySelf.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIJustifySelf::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPILength.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPILength.cpp index 7430d3a0..f2ccb7da 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPILength.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPILength.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPILength::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPILetterAndWordSpacing.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPILetterAndWordSpacing.cpp index 08c7ac7..eb6de1f 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPILetterAndWordSpacing.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPILetterAndWordSpacing.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPILetterAndWordSpacing::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPILineHeight.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPILineHeight.cpp index 54569ef..2ee16e5 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPILineHeight.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPILineHeight.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPILineHeight::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPILineHeightStep.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPILineHeightStep.cpp index 28064b0..6ca6e36 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPILineHeightStep.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPILineHeightStep.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPILineHeightStep::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIListStyleImage.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIListStyleImage.cpp index 7bf6784..96c9b1dd 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIListStyleImage.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIListStyleImage.cpp
@@ -11,7 +11,6 @@ class CSSParserLocalContext; const CSSValue* CSSPropertyAPIListStyleImage::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPILogicalWidthOrHeight.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPILogicalWidthOrHeight.cpp index c2bbeb2..2fdb85f 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPILogicalWidthOrHeight.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPILogicalWidthOrHeight.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPILogicalWidthOrHeight::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMargin.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMargin.cpp index 2bc309a..3a26328 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMargin.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMargin.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIMargin::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMarker.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMarker.cpp index 8becb64..7d64a550 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMarker.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMarker.cpp
@@ -12,7 +12,6 @@ const CSSValue* CSSPropertyAPIMarker::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMask.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMask.cpp index 067da08..1794bbd 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMask.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMask.cpp
@@ -12,7 +12,6 @@ const CSSValue* CSSPropertyAPIMask::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMaskSourceType.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMaskSourceType.cpp index 08fac95..b982621 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMaskSourceType.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMaskSourceType.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIMaskSourceType::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMaxWidthOrHeight.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMaxWidthOrHeight.cpp index 48583e1..98481977 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMaxWidthOrHeight.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMaxWidthOrHeight.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIMaxWidthOrHeight::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMethods.json5 b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMethods.json5 index 3ffeb8b6..9b0d43a 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMethods.json5 +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMethods.json5
@@ -22,12 +22,12 @@ { name: "ParseSingleValue", return_type: "const CSSValue*", - parameters: "(CSSPropertyID, CSSParserTokenRange&, const CSSParserContext&, const CSSParserLocalContext&)", + parameters: "(CSSParserTokenRange&, const CSSParserContext&, const CSSParserLocalContext&)", }, { name: "ParseShorthand", return_type: "bool", - parameters: "(CSSPropertyID, bool, CSSParserTokenRange&, const CSSParserContext&, const CSSParserLocalContext&, HeapVector<CSSProperty, 256>&)", + parameters: "(bool, CSSParserTokenRange&, const CSSParserContext&, const CSSParserLocalContext&, HeapVector<CSSProperty, 256>&)", }, ] }
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMinWidthOrHeight.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMinWidthOrHeight.cpp index 1e3f0d19..c1a65be 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMinWidthOrHeight.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIMinWidthOrHeight.cpp
@@ -11,7 +11,6 @@ class CSSParserLocalContext; const CSSValue* CSSPropertyAPIMinWidthOrHeight::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIObjectPosition.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIObjectPosition.cpp index 8feb02cf..cf19ac70 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIObjectPosition.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIObjectPosition.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIObjectPosition::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffset.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffset.cpp index 4e094e4..b0f3bfc 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffset.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffset.cpp
@@ -13,7 +13,6 @@ class CSSParserLocalContext; const CSSValue* CSSPropertyAPIOffset::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffsetAnchor.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffsetAnchor.cpp index 8f39a6f..e77133f 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffsetAnchor.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffsetAnchor.cpp
@@ -14,7 +14,6 @@ using namespace CSSPropertyParserHelpers; const CSSValue* CSSPropertyAPIOffsetAnchor::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffsetDistance.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffsetDistance.cpp index 13793e7..06f4f28 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffsetDistance.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffsetDistance.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIOffsetDistance::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffsetPath.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffsetPath.cpp index c2a6e29..6fce762 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffsetPath.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffsetPath.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIOffsetPath::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffsetPosition.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffsetPosition.cpp index 9a3145f..069274d 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffsetPosition.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffsetPosition.cpp
@@ -14,7 +14,6 @@ using namespace CSSPropertyParserHelpers; const CSSValue* CSSPropertyAPIOffsetPosition::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffsetRotate.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffsetRotate.cpp index 248ee44..db69ca3 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffsetRotate.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOffsetRotate.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIOffsetRotate::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOpacity.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOpacity.cpp index 3813cfd7..7ca3dd4 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOpacity.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOpacity.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIOpacity::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOrder.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOrder.cpp index a46efb5..3f2ec19d 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOrder.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOrder.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIOrder::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOrphansOrWidows.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOrphansOrWidows.cpp index a10046f0..fbcdf90 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOrphansOrWidows.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOrphansOrWidows.cpp
@@ -9,7 +9,6 @@ const CSSValue* CSSPropertyAPIOrphansOrWidows::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOutlineColor.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOutlineColor.cpp index ddd5de1..8d67f81 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOutlineColor.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOutlineColor.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIOutlineColor::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOutlineOffset.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOutlineOffset.cpp index dd81d2c..8288c96 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOutlineOffset.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOutlineOffset.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIOutlineOffset::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOutlineWidth.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOutlineWidth.cpp index 36dcc26..88f9f4aa 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOutlineWidth.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIOutlineWidth.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIOutlineWidth::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPadding.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPadding.cpp index c1ced47..675c142b9 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPadding.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPadding.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIPadding::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPage.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPage.cpp index 6e5bdbe..d06e7ea 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPage.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPage.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIPage::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPaintOrder.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPaintOrder.cpp index df0d669..24e2512 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPaintOrder.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPaintOrder.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIPaintOrder::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPaintStroke.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPaintStroke.cpp index 431a042..70576b4 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPaintStroke.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPaintStroke.cpp
@@ -13,7 +13,6 @@ namespace blink { const CSSValue* CSSPropertyAPIPaintStroke::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPerspective.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPerspective.cpp index 517b6fb..1b84030 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPerspective.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPerspective.cpp
@@ -12,7 +12,6 @@ namespace blink { const CSSValue* CSSPropertyAPIPerspective::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext& localContext) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPerspectiveOrigin.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPerspectiveOrigin.cpp index 9224207..c84153d9 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPerspectiveOrigin.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPerspectiveOrigin.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIPerspectiveOrigin::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPositionX.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPositionX.cpp index 68474c5..d2881b4 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPositionX.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPositionX.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIPositionX::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPositionY.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPositionY.cpp index 4ee8523..97a301d 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPositionY.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIPositionY.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIPositionY::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIQuotes.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIQuotes.cpp index 0b9ba63..a012b8b 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIQuotes.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIQuotes.cpp
@@ -12,7 +12,6 @@ namespace blink { const CSSValue* CSSPropertyAPIQuotes::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIRadius.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIRadius.cpp index fe356b7..08f76c03 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIRadius.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIRadius.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIRadius::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIRotate.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIRotate.cpp index 27a1143..f635ac6 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIRotate.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIRotate.cpp
@@ -12,7 +12,6 @@ namespace blink { const CSSValue* CSSPropertyAPIRotate::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIScale.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIScale.cpp index 4a2eb73..b1b450d 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIScale.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIScale.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIScale::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIScrollPadding.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIScrollPadding.cpp index 512742f..adbdc3e9b 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIScrollPadding.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIScrollPadding.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIScrollPadding::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIScrollSnapAlign.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIScrollSnapAlign.cpp index 35a87b1d..6b871d5 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIScrollSnapAlign.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIScrollSnapAlign.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIScrollSnapAlign::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIScrollSnapMargin.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIScrollSnapMargin.cpp index c242a7d..9525026 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIScrollSnapMargin.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIScrollSnapMargin.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIScrollSnapMargin::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIScrollSnapType.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIScrollSnapType.cpp index ebe22021..a6ad19fd8 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIScrollSnapType.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIScrollSnapType.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIScrollSnapType::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIShapeImageThreshold.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIShapeImageThreshold.cpp index 481302f..7daf613 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIShapeImageThreshold.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIShapeImageThreshold.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIShapeImageThreshold::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIShapeMargin.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIShapeMargin.cpp index 3492c11..60fdef42 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIShapeMargin.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIShapeMargin.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIShapeMargin::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIShapeOutside.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIShapeOutside.cpp index f98d18e..96a197fe 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIShapeOutside.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIShapeOutside.cpp
@@ -14,7 +14,6 @@ using namespace CSSPropertyParserHelpers; const CSSValue* CSSPropertyAPIShapeOutside::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPISize.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPISize.cpp index 0d4f0af..e78f92f 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPISize.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPISize.cpp
@@ -17,7 +17,6 @@ } const CSSValue* CSSPropertyAPISize::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIStrokeDasharray.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIStrokeDasharray.cpp index 4192afc..2e47beb 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIStrokeDasharray.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIStrokeDasharray.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIStrokeDasharray::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIStrokeDashoffsetOrStrokeWidth.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIStrokeDashoffsetOrStrokeWidth.cpp index 82bbf34..0664d69 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIStrokeDashoffsetOrStrokeWidth.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIStrokeDashoffsetOrStrokeWidth.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIStrokeDashoffsetOrStrokeWidth::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIStrokeMiterlimit.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIStrokeMiterlimit.cpp index a819bd1..3db898d 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIStrokeMiterlimit.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIStrokeMiterlimit.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIStrokeMiterlimit::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITabSize.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITabSize.cpp index 1faf6f0..6fdd1c5 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITabSize.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITabSize.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPITabSize::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextDecorationColor.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextDecorationColor.cpp index c6bc17e7..0963a479 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextDecorationColor.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextDecorationColor.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPITextDecorationColor::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextDecorationLine.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextDecorationLine.cpp index 74c93f7..e36dfb3 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextDecorationLine.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextDecorationLine.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPITextDecorationLine::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextDecorationSkip.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextDecorationSkip.cpp index 89d42e6..502f25d 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextDecorationSkip.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextDecorationSkip.cpp
@@ -12,7 +12,6 @@ namespace blink { const CSSValue* CSSPropertyAPITextDecorationSkip::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextIndent.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextIndent.cpp index 906c50f..f21e601 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextIndent.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextIndent.cpp
@@ -12,7 +12,6 @@ namespace blink { const CSSValue* CSSPropertyAPITextIndent::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextShadow.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextShadow.cpp index a36b5cbd..6889fa64 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextShadow.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextShadow.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPITextShadow::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextSizeAdjust.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextSizeAdjust.cpp index 9b711d2..77832e2 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextSizeAdjust.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextSizeAdjust.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPITextSizeAdjust::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextUnderlinePosition.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextUnderlinePosition.cpp index dd180a05..8c559c3d 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextUnderlinePosition.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITextUnderlinePosition.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPITextUnderlinePosition::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITimingFunction.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITimingFunction.cpp index b99de92c..c462d319 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITimingFunction.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITimingFunction.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPITimingFunction::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITouchAction.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITouchAction.cpp index 0dd051c..dccd9b3 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITouchAction.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITouchAction.cpp
@@ -35,7 +35,6 @@ } // namespace const CSSValue* CSSPropertyAPITouchAction::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITransform.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITransform.cpp index e7b604b..a069050 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITransform.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITransform.cpp
@@ -12,7 +12,6 @@ namespace blink { const CSSValue* CSSPropertyAPITransform::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext& local_context) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITransformOrigin.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITransformOrigin.cpp index 070eee2..831aa38d 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITransformOrigin.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITransformOrigin.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPITransformOrigin::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITransitionProperty.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITransitionProperty.cpp index e3bc056..f500e974 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITransitionProperty.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITransitionProperty.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPITransitionProperty::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITranslate.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITranslate.cpp index 68e7972a..016e32c 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITranslate.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITranslate.cpp
@@ -12,7 +12,6 @@ namespace blink { const CSSValue* CSSPropertyAPITranslate::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIVerticalAlign.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIVerticalAlign.cpp index 7813a4d..3c592f0 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIVerticalAlign.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIVerticalAlign.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIVerticalAlign::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBorderColor.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBorderColor.cpp index 8dc4303..d953dc2 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBorderColor.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBorderColor.cpp
@@ -12,7 +12,6 @@ class CSSParserLocalContext; const CSSValue* CSSPropertyAPIWebkitBorderColor::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBorderImage.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBorderImage.cpp index d245030..c9f867f 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBorderImage.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBorderImage.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWebkitBorderImage::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBorderSpacing.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBorderSpacing.cpp index 079ac41e..31dcbb2 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBorderSpacing.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBorderSpacing.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWebkitBorderSpacing::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBorderWidth.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBorderWidth.cpp index f2ac007e..9e4acb9 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBorderWidth.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBorderWidth.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWebkitBorderWidth::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBoxFlex.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBoxFlex.cpp index 4318f91..04a36fe 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBoxFlex.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBoxFlex.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWebkitBoxFlex::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBoxFlexGroup.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBoxFlexGroup.cpp index 9ea02c3..893b6166 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBoxFlexGroup.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBoxFlexGroup.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWebkitBoxFlexGroup::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBoxOrdinalGroup.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBoxOrdinalGroup.cpp index 5a97f16..af8c71b 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBoxOrdinalGroup.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBoxOrdinalGroup.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWebkitBoxOrdinalGroup::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBoxReflect.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBoxReflect.cpp index 9451a1a5..3420eff 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBoxReflect.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitBoxReflect.cpp
@@ -45,7 +45,6 @@ } // namespace const CSSValue* CSSPropertyAPIWebkitBoxReflect::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitClip.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitClip.cpp index 3eedb74f..e55fbbc 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitClip.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitClip.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWebkitClip::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitColorNoQuirks.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitColorNoQuirks.cpp index 663daa5..24d8235 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitColorNoQuirks.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitColorNoQuirks.cpp
@@ -12,7 +12,6 @@ class CSSParserLocalContext; const CSSValue* CSSPropertyAPIWebkitColorNoQuirks::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitFontSizeDelta.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitFontSizeDelta.cpp index eb6f2e0f..aded8e0 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitFontSizeDelta.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitFontSizeDelta.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWebkitFontSizeDelta::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitHighlight.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitHighlight.cpp index e96823b..22539dc 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitHighlight.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitHighlight.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWebkitHighlight::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitLineClamp.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitLineClamp.cpp index bb3f2dc..d87d98c 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitLineClamp.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitLineClamp.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWebkitLineClamp::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitMargin.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitMargin.cpp index 42a8b58f..e8e27c2 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitMargin.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitMargin.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWebkitMargin::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitMaskComposite.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitMaskComposite.cpp index 8729c927..b2066906 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitMaskComposite.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitMaskComposite.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWebkitMaskComposite::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitMaxLogicalWidthOrHeight.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitMaxLogicalWidthOrHeight.cpp index 97b22285..9554479 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitMaxLogicalWidthOrHeight.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitMaxLogicalWidthOrHeight.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWebkitMaxLogicalWidthOrHeight::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitOrigin.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitOrigin.cpp index f8f3305..b6582d39 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitOrigin.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitOrigin.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWebkitOrigin::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitOriginX.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitOriginX.cpp index d2eae3b..1ade14f 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitOriginX.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitOriginX.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWebkitOriginX::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitOriginY.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitOriginY.cpp index b1fced74..4bd06aa 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitOriginY.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitOriginY.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWebkitOriginY::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitPadding.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitPadding.cpp index 28e98b8..6403cb3 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitPadding.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitPadding.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWebkitPadding::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTextDecorationsInEffect.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTextDecorationsInEffect.cpp index c6237d72..7e3dc92 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTextDecorationsInEffect.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTextDecorationsInEffect.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWebkitTextDecorationsInEffect::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext&, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTextEmphasisPosition.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTextEmphasisPosition.cpp index 2049174..7889e0d 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTextEmphasisPosition.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTextEmphasisPosition.cpp
@@ -14,7 +14,6 @@ // [ over | under ] && [ right | left ]? // If [ right | left ] is omitted, it defaults to right. const CSSValue* CSSPropertyAPIWebkitTextEmphasisPosition::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTextEmphasisStyle.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTextEmphasisStyle.cpp index f3948bd..52bc558 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTextEmphasisStyle.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTextEmphasisStyle.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWebkitTextEmphasisStyle::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTextStrokeColor.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTextStrokeColor.cpp index 63623553..2f79af7 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTextStrokeColor.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTextStrokeColor.cpp
@@ -12,7 +12,6 @@ class CSSParserLocalContext; const CSSValue* CSSPropertyAPIWebkitTextStrokeColor::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTextStrokeWidth.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTextStrokeWidth.cpp index e21663d2..92160b352 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTextStrokeWidth.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTextStrokeWidth.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWebkitTextStrokeWidth::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTransformOriginZ.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTransformOriginZ.cpp index b61f668..f070948f 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTransformOriginZ.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWebkitTransformOriginZ.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWebkitTransformOriginZ::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWidthOrHeight.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWidthOrHeight.cpp index 9ae2a83..1b17fa94 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWidthOrHeight.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWidthOrHeight.cpp
@@ -10,7 +10,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWidthOrHeight::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWillChange.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWillChange.cpp index 60fb8fdd3..501a87a 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWillChange.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIWillChange.cpp
@@ -12,7 +12,6 @@ namespace blink { const CSSValue* CSSPropertyAPIWillChange::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIZIndex.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIZIndex.cpp index 65b07abf..e47cb94e 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIZIndex.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIZIndex.cpp
@@ -9,7 +9,6 @@ namespace blink { const CSSValue* CSSPropertyAPIZIndex::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIZoom.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIZoom.cpp index d9862fa..e36cd2e 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIZoom.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPIZoom.cpp
@@ -11,7 +11,6 @@ namespace blink { const CSSValue* CSSPropertyAPIZoom::ParseSingleValue( - CSSPropertyID, CSSParserTokenRange& range, const CSSParserContext& context, const CSSParserLocalContext&) const {
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIAnimation.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIAnimation.cpp index 02d8824..be7a324 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIAnimation.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIAnimation.cpp
@@ -58,7 +58,6 @@ } // namespace bool CSSShorthandPropertyAPIAnimation::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBackground.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBackground.cpp index d636bafa..73cd133 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBackground.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBackground.cpp
@@ -68,7 +68,6 @@ // (ii). we split parsing logic of background and -webkit-mask into // different APIs. bool CSSShorthandPropertyAPIBackground::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBackgroundPosition.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBackgroundPosition.cpp index a1e8e39..42ce3fe 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBackgroundPosition.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBackgroundPosition.cpp
@@ -11,7 +11,6 @@ namespace blink { bool CSSShorthandPropertyAPIBackgroundPosition::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBackgroundRepeat.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBackgroundRepeat.cpp index 8f08b34..ed978a9a 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBackgroundRepeat.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBackgroundRepeat.cpp
@@ -13,7 +13,6 @@ namespace blink { bool CSSShorthandPropertyAPIBackgroundRepeat::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorder.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorder.cpp index bcac364..0bcca28 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorder.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorder.cpp
@@ -11,7 +11,6 @@ namespace blink { bool CSSShorthandPropertyAPIBorder::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderBottom.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderBottom.cpp index e038ccd..fd9c89a 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderBottom.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderBottom.cpp
@@ -9,7 +9,6 @@ namespace blink { bool CSSShorthandPropertyAPIBorderBottom::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderColor.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderColor.cpp index bbe0b279c..f2818502 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderColor.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderColor.cpp
@@ -10,7 +10,6 @@ namespace blink { bool CSSShorthandPropertyAPIBorderColor::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderImage.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderImage.cpp index 4346b12..3dbc06b 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderImage.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderImage.cpp
@@ -12,7 +12,6 @@ namespace blink { bool CSSShorthandPropertyAPIBorderImage::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderLeft.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderLeft.cpp index 8b49f5e..f8bc0e1 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderLeft.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderLeft.cpp
@@ -9,7 +9,6 @@ namespace blink { bool CSSShorthandPropertyAPIBorderLeft::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderRadius.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderRadius.cpp index 7e45732..03f23e5b 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderRadius.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderRadius.cpp
@@ -13,7 +13,6 @@ namespace blink { bool CSSShorthandPropertyAPIBorderRadius::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderRight.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderRight.cpp index ce9b23e..f67fdbb 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderRight.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderRight.cpp
@@ -9,7 +9,6 @@ namespace blink { bool CSSShorthandPropertyAPIBorderRight::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderSpacing.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderSpacing.cpp index 512d108..95f6241c 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderSpacing.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderSpacing.cpp
@@ -10,7 +10,6 @@ namespace blink { bool CSSShorthandPropertyAPIBorderSpacing::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderStyle.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderStyle.cpp index f921b7e1..b2cf9197 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderStyle.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderStyle.cpp
@@ -10,7 +10,6 @@ namespace blink { bool CSSShorthandPropertyAPIBorderStyle::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderTop.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderTop.cpp index d8d70d0..be778af2 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderTop.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderTop.cpp
@@ -9,7 +9,6 @@ namespace blink { bool CSSShorthandPropertyAPIBorderTop::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderWidth.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderWidth.cpp index 289ab02..8b9af71 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderWidth.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIBorderWidth.cpp
@@ -10,7 +10,6 @@ namespace blink { bool CSSShorthandPropertyAPIBorderWidth::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIColumnRule.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIColumnRule.cpp index c0b165bf..2462453 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIColumnRule.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIColumnRule.cpp
@@ -9,7 +9,6 @@ namespace blink { bool CSSShorthandPropertyAPIColumnRule::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIColumns.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIColumns.cpp index d4c4016..903b1ba 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIColumns.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIColumns.cpp
@@ -12,7 +12,6 @@ namespace blink { bool CSSShorthandPropertyAPIColumns::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext&,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIFlex.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIFlex.cpp index f17c9ba..d2a7b63 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIFlex.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIFlex.cpp
@@ -12,7 +12,6 @@ namespace blink { bool CSSShorthandPropertyAPIFlex::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIFlexFlow.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIFlexFlow.cpp index 668b137..efb0467e 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIFlexFlow.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIFlexFlow.cpp
@@ -9,7 +9,6 @@ namespace blink { bool CSSShorthandPropertyAPIFlexFlow::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIFont.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIFont.cpp index 0d162ef..4639e037 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIFont.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIFont.cpp
@@ -222,7 +222,6 @@ } // namespace bool CSSShorthandPropertyAPIFont::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIFontVariant.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIFontVariant.cpp index 84e5092..c5f3fe4 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIFontVariant.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIFontVariant.cpp
@@ -13,7 +13,6 @@ namespace blink { bool CSSShorthandPropertyAPIFontVariant::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext&,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGrid.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGrid.cpp index 5d8db469..6ea9a829 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGrid.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGrid.cpp
@@ -39,7 +39,6 @@ } // namespace bool CSSShorthandPropertyAPIGrid::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGridArea.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGridArea.cpp index b0f2a27..3e54e9f 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGridArea.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGridArea.cpp
@@ -12,7 +12,6 @@ namespace blink { bool CSSShorthandPropertyAPIGridArea::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext&,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGridColumn.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGridColumn.cpp index 77be40a..1601e594 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGridColumn.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGridColumn.cpp
@@ -12,7 +12,6 @@ namespace blink { bool CSSShorthandPropertyAPIGridColumn::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext&,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGridGap.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGridGap.cpp index fcf2b34e..76c06cd 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGridGap.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGridGap.cpp
@@ -12,7 +12,6 @@ namespace blink { bool CSSShorthandPropertyAPIGridGap::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGridRow.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGridRow.cpp index 7aae954..e150d79 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGridRow.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGridRow.cpp
@@ -12,7 +12,6 @@ namespace blink { bool CSSShorthandPropertyAPIGridRow::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext&,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGridTemplate.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGridTemplate.cpp index 609e2a8..085796d1 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGridTemplate.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIGridTemplate.cpp
@@ -11,7 +11,6 @@ namespace blink { bool CSSShorthandPropertyAPIGridTemplate::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIListStyle.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIListStyle.cpp index 5b6b52b..8a64d8d 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIListStyle.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIListStyle.cpp
@@ -9,7 +9,6 @@ namespace blink { bool CSSShorthandPropertyAPIListStyle::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIMargin.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIMargin.cpp index 3fb15a9..7b6bc0fc 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIMargin.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIMargin.cpp
@@ -10,7 +10,6 @@ namespace blink { bool CSSShorthandPropertyAPIMargin::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIMarker.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIMarker.cpp index 74eaeae..571bbea 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIMarker.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIMarker.cpp
@@ -9,7 +9,6 @@ namespace blink { bool CSSShorthandPropertyAPIMarker::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIOffset.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIOffset.cpp index ea67a17..9d199fa 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIOffset.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIOffset.cpp
@@ -15,7 +15,6 @@ namespace blink { bool CSSShorthandPropertyAPIOffset::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context, @@ -27,7 +26,7 @@ // no functionality. const CSSValue* offset_position = GetCSSPropertyOffsetPositionAPI().ParseSingleValue( - CSSPropertyInvalid, range, context, CSSParserLocalContext()); + range, context, CSSParserLocalContext()); const CSSValue* offset_path = CSSPropertyOffsetPathUtils::ConsumeOffsetPath(range, context); const CSSValue* offset_distance = nullptr; @@ -45,7 +44,7 @@ const CSSValue* offset_anchor = nullptr; if (CSSPropertyParserHelpers::ConsumeSlashIncludingWhitespace(range)) { offset_anchor = GetCSSPropertyOffsetAnchorAPI().ParseSingleValue( - CSSPropertyInvalid, range, context, CSSParserLocalContext()); + range, context, CSSParserLocalContext()); if (!offset_anchor) return false; }
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIOutline.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIOutline.cpp index be04a60..76a5555b 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIOutline.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIOutline.cpp
@@ -9,7 +9,6 @@ namespace blink { bool CSSShorthandPropertyAPIOutline::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIOverflow.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIOverflow.cpp index cec95f34..bb39f478 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIOverflow.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIOverflow.cpp
@@ -12,7 +12,6 @@ namespace blink { bool CSSShorthandPropertyAPIOverflow::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPadding.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPadding.cpp index f1a22f93..9bdf35f 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPadding.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPadding.cpp
@@ -10,7 +10,6 @@ namespace blink { bool CSSShorthandPropertyAPIPadding::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPageBreakAfter.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPageBreakAfter.cpp index 18428fd..b6434c5 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPageBreakAfter.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPageBreakAfter.cpp
@@ -10,7 +10,6 @@ namespace blink { bool CSSShorthandPropertyAPIPageBreakAfter::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext&,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPageBreakBefore.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPageBreakBefore.cpp index 47047c5..0b045e70 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPageBreakBefore.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPageBreakBefore.cpp
@@ -10,7 +10,6 @@ namespace blink { bool CSSShorthandPropertyAPIPageBreakBefore::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext&,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPageBreakInside.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPageBreakInside.cpp index ccbbb28..f0e5e6bc 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPageBreakInside.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPageBreakInside.cpp
@@ -10,7 +10,6 @@ namespace blink { bool CSSShorthandPropertyAPIPageBreakInside::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext&,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPlaceContent.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPlaceContent.cpp index 4babcdf..320c467 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPlaceContent.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPlaceContent.cpp
@@ -13,7 +13,6 @@ namespace blink { bool CSSShorthandPropertyAPIPlaceContent::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext&,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPlaceItems.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPlaceItems.cpp index 31d601db..ce5a1a181 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPlaceItems.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPlaceItems.cpp
@@ -13,7 +13,6 @@ namespace blink { bool CSSShorthandPropertyAPIPlaceItems::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext&,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPlaceSelf.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPlaceSelf.cpp index f43f9d8b..ae58633 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPlaceSelf.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIPlaceSelf.cpp
@@ -13,7 +13,6 @@ namespace blink { bool CSSShorthandPropertyAPIPlaceSelf::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext&,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollBoundaryBehavior.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollBoundaryBehavior.cpp index ff0c3d8..acdea73 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollBoundaryBehavior.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollBoundaryBehavior.cpp
@@ -10,7 +10,6 @@ namespace blink { bool CSSShorthandPropertyAPIScrollBoundaryBehavior::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollPadding.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollPadding.cpp index 839bccc..62dc3fc 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollPadding.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollPadding.cpp
@@ -10,7 +10,6 @@ namespace blink { bool CSSShorthandPropertyAPIScrollPadding::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollPaddingBlock.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollPaddingBlock.cpp index 4cb29216..33448205 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollPaddingBlock.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollPaddingBlock.cpp
@@ -10,7 +10,6 @@ namespace blink { bool CSSShorthandPropertyAPIScrollPaddingBlock::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollPaddingInline.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollPaddingInline.cpp index eb4c9185..b53ee1b 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollPaddingInline.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollPaddingInline.cpp
@@ -10,7 +10,6 @@ namespace blink { bool CSSShorthandPropertyAPIScrollPaddingInline::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollSnapMargin.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollSnapMargin.cpp index e3fc81c..0ba18c0 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollSnapMargin.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollSnapMargin.cpp
@@ -10,7 +10,6 @@ namespace blink { bool CSSShorthandPropertyAPIScrollSnapMargin::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollSnapMarginBlock.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollSnapMarginBlock.cpp index be30dff6..a240fbee 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollSnapMarginBlock.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollSnapMarginBlock.cpp
@@ -10,7 +10,6 @@ namespace blink { bool CSSShorthandPropertyAPIScrollSnapMarginBlock::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollSnapMarginInline.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollSnapMarginInline.cpp index fe8d6fb..347b42d 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollSnapMarginInline.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIScrollSnapMarginInline.cpp
@@ -10,7 +10,6 @@ namespace blink { bool CSSShorthandPropertyAPIScrollSnapMarginInline::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPITextDecoration.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPITextDecoration.cpp index d42a0c4..af68d52 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPITextDecoration.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPITextDecoration.cpp
@@ -10,7 +10,6 @@ namespace blink { bool CSSShorthandPropertyAPITextDecoration::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPITransition.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPITransition.cpp index 2005b06..ade3b90 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPITransition.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPITransition.cpp
@@ -42,7 +42,6 @@ } // namespace bool CSSShorthandPropertyAPITransition::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitBorderAfter.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitBorderAfter.cpp index dce5e64..55fd5f5 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitBorderAfter.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitBorderAfter.cpp
@@ -9,7 +9,6 @@ namespace blink { bool CSSShorthandPropertyAPIWebkitBorderAfter::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitBorderBefore.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitBorderBefore.cpp index 116d2a7..aa144e904 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitBorderBefore.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitBorderBefore.cpp
@@ -9,7 +9,6 @@ namespace blink { bool CSSShorthandPropertyAPIWebkitBorderBefore::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitBorderEnd.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitBorderEnd.cpp index ff19884..784a3e5 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitBorderEnd.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitBorderEnd.cpp
@@ -9,7 +9,6 @@ namespace blink { bool CSSShorthandPropertyAPIWebkitBorderEnd::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitBorderStart.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitBorderStart.cpp index 9e529de..7692d4b2 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitBorderStart.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitBorderStart.cpp
@@ -9,7 +9,6 @@ namespace blink { bool CSSShorthandPropertyAPIWebkitBorderStart::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitColumnBreakAfter.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitColumnBreakAfter.cpp index 627b921c..5c1bc87 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitColumnBreakAfter.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitColumnBreakAfter.cpp
@@ -10,7 +10,6 @@ namespace blink { bool CSSShorthandPropertyAPIWebkitColumnBreakAfter::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext&,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitColumnBreakBefore.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitColumnBreakBefore.cpp index 9cbe824..9e617063 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitColumnBreakBefore.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitColumnBreakBefore.cpp
@@ -10,7 +10,6 @@ namespace blink { bool CSSShorthandPropertyAPIWebkitColumnBreakBefore::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext&,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitColumnBreakInside.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitColumnBreakInside.cpp index f737ee5..6633e9d 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitColumnBreakInside.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitColumnBreakInside.cpp
@@ -10,7 +10,6 @@ namespace blink { bool CSSShorthandPropertyAPIWebkitColumnBreakInside::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext&,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitMarginCollapse.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitMarginCollapse.cpp index bcf295a7..6807120 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitMarginCollapse.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitMarginCollapse.cpp
@@ -12,7 +12,6 @@ namespace blink { bool CSSShorthandPropertyAPIWebkitMarginCollapse::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitMaskBoxImage.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitMaskBoxImage.cpp index cca5f6959..e995340 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitMaskBoxImage.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitMaskBoxImage.cpp
@@ -12,7 +12,6 @@ namespace blink { bool CSSShorthandPropertyAPIWebkitMaskBoxImage::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitMaskPosition.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitMaskPosition.cpp index e426849..d13bec3 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitMaskPosition.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitMaskPosition.cpp
@@ -11,7 +11,6 @@ namespace blink { bool CSSShorthandPropertyAPIWebkitMaskPosition::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitMaskRepeat.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitMaskRepeat.cpp index 73a1eed..1c0f9d4 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitMaskRepeat.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitMaskRepeat.cpp
@@ -13,7 +13,6 @@ namespace blink { bool CSSShorthandPropertyAPIWebkitMaskRepeat::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitTextEmphasis.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitTextEmphasis.cpp index a60bd17..9e289ba 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitTextEmphasis.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitTextEmphasis.cpp
@@ -9,7 +9,6 @@ namespace blink { bool CSSShorthandPropertyAPIWebkitTextEmphasis::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitTextStroke.cpp b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitTextStroke.cpp index faf4cc1..799e94e1 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitTextStroke.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIWebkitTextStroke.cpp
@@ -9,7 +9,6 @@ namespace blink { bool CSSShorthandPropertyAPIWebkitTextStroke::ParseShorthand( - CSSPropertyID, bool important, CSSParserTokenRange& range, const CSSParserContext& context,
diff --git a/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp b/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp index 83fb0e2..87e8aad 100644 --- a/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp +++ b/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp
@@ -657,8 +657,7 @@ return true; if (node->HasTagName(h1Tag) || node->HasTagName(h2Tag) || - node->HasTagName(h3Tag) || node->HasTagName(h4Tag) || - node->HasTagName(h5Tag) || node->HasTagName(h6Tag)) { + node->HasTagName(h3Tag)) { const ComputedStyle* style = r->Style(); if (style) { int bottom_margin = ToLayoutBox(r)->CollapsedMarginAfter().ToInt();
diff --git a/third_party/WebKit/Source/core/exported/WebPluginContainerImpl.cpp b/third_party/WebKit/Source/core/exported/WebPluginContainerImpl.cpp index 1cf2120..4bc312b 100644 --- a/third_party/WebKit/Source/core/exported/WebPluginContainerImpl.cpp +++ b/third_party/WebKit/Source/core/exported/WebPluginContainerImpl.cpp
@@ -203,7 +203,9 @@ (layout_object->BorderLeft() + layout_object->PaddingLeft()).ToInt(), (layout_object->BorderTop() + layout_object->PaddingTop()).ToInt()); - layout_object->InvalidatePaintRectangle(LayoutRect(dirty_rect)); + pending_invalidation_rect_.Unite(dirty_rect); + + layout_object->SetMayNeedPaintInvalidation(); } void WebPluginContainerImpl::SetFocused(bool focused, WebFocusType focus_type) { @@ -1012,6 +1014,19 @@ frame->GetPage()->GetFocusController().SetFocusedElement(element_, frame); } +void WebPluginContainerImpl::IssuePaintInvalidations() { + if (pending_invalidation_rect_.IsEmpty()) + return; + + LayoutBox* layout_object = ToLayoutBox(element_->GetLayoutObject()); + if (!layout_object) + return; + + layout_object->InvalidatePaintRectangle( + LayoutRect(pending_invalidation_rect_)); + pending_invalidation_rect_ = IntRect(); +} + void WebPluginContainerImpl::ComputeClipRectsForPlugin( const HTMLFrameOwnerElement* owner_element, IntRect& window_rect,
diff --git a/third_party/WebKit/Source/core/exported/WebPluginContainerImpl.h b/third_party/WebKit/Source/core/exported/WebPluginContainerImpl.h index a57e7fe..3776b539 100644 --- a/third_party/WebKit/Source/core/exported/WebPluginContainerImpl.h +++ b/third_party/WebKit/Source/core/exported/WebPluginContainerImpl.h
@@ -92,6 +92,7 @@ bool CanProcessDrag() const override; bool WantsWheelEvents() override; void UpdateAllLifecyclePhases() override; + void InvalidatePaint() override { IssuePaintInvalidations(); } void InvalidateRect(const IntRect&); void SetFocused(bool, WebFocusType) override; void HandleEvent(Event*) override; @@ -220,6 +221,8 @@ void FocusPlugin(); + void IssuePaintInvalidations(); + void CalculateGeometry(IntRect& window_rect, IntRect& clip_rect, IntRect& unobscured_rect); @@ -230,6 +233,7 @@ WebPlugin* web_plugin_; WebLayer* web_layer_; IntRect frame_rect_; + IntRect pending_invalidation_rect_; TouchEventRequestType touch_event_request_type_; bool wants_wheel_events_; bool self_visible_;
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp index c84f66b..d1b5ac1bf 100644 --- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp +++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
@@ -1128,15 +1128,11 @@ return IntSize(); } -void LayoutObject::InvalidatePaintRectangle(const LayoutRect& dirty_rect) { - if (dirty_rect.IsEmpty()) - return; - - auto& rare_paint_data = EnsureRarePaintData(); - rare_paint_data.SetPartialInvalidationRect( - UnionRect(dirty_rect, rare_paint_data.PartialInvalidationRect())); - - SetMayNeedPaintInvalidationWithoutGeometryChange(); +LayoutRect LayoutObject::InvalidatePaintRectangle( + const LayoutRect& dirty_rect, + DisplayItemClient* display_item_client) const { + return ObjectPaintInvalidator(*this).InvalidatePaintRectangle( + dirty_rect, display_item_client); } LayoutRect LayoutObject::SelectionRectInViewCoordinates() const { @@ -3374,8 +3370,6 @@ #if DCHECK_IS_ON() DCHECK(!ShouldCheckForPaintInvalidation() || PaintInvalidationStateIsDirty()); #endif - if (rare_paint_data_) - rare_paint_data_->SetPartialInvalidationRect(LayoutRect()); ClearShouldDoFullPaintInvalidation(); bitfields_.SetMayNeedPaintInvalidation(false); bitfields_.SetMayNeedPaintInvalidationSubtree(false);
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.h b/third_party/WebKit/Source/core/layout/LayoutObject.h index 85709b192..52edf5cc 100644 --- a/third_party/WebKit/Source/core/layout/LayoutObject.h +++ b/third_party/WebKit/Source/core/layout/LayoutObject.h
@@ -1364,7 +1364,12 @@ // Invalidate the paint of a specific subrectangle within a given object. The // rect is in the object's coordinate space. - void InvalidatePaintRectangle(const LayoutRect&); + // If a DisplayItemClient is specified, that client is invalidated rather than + // |this|. + // Returns the visual rect that was invalidated (i.e, invalidation in the + // space of the GraphicsLayer backing this LayoutObject). + LayoutRect InvalidatePaintRectangle(const LayoutRect&, + DisplayItemClient* = nullptr) const; void SetShouldDoFullPaintInvalidationIncludingNonCompositingDescendants(); @@ -1886,10 +1891,6 @@ return rare_paint_data_ ? rare_paint_data_->SelectionVisualRect() : LayoutRect(); } - LayoutRect PartialInvalidationRect() const { - return rare_paint_data_ ? rare_paint_data_->PartialInvalidationRect() - : LayoutRect(); - } protected: enum LayoutObjectType {
diff --git a/third_party/WebKit/Source/core/paint/HTMLCanvasPaintInvalidator.cpp b/third_party/WebKit/Source/core/paint/HTMLCanvasPaintInvalidator.cpp index 8c49a4a9..a1b6443 100644 --- a/third_party/WebKit/Source/core/paint/HTMLCanvasPaintInvalidator.cpp +++ b/third_party/WebKit/Source/core/paint/HTMLCanvasPaintInvalidator.cpp
@@ -12,11 +12,17 @@ namespace blink { PaintInvalidationReason HTMLCanvasPaintInvalidator::InvalidatePaint() { - auto* element = toHTMLCanvasElement(html_canvas_.GetNode()); - if (element->IsDirty()) - element->DoDeferredPaintInvalidation(); + PaintInvalidationReason reason = + BoxPaintInvalidator(html_canvas_, context_).InvalidatePaint(); - return BoxPaintInvalidator(html_canvas_, context_).InvalidatePaint(); + HTMLCanvasElement* element = toHTMLCanvasElement(html_canvas_.GetNode()); + if (element->IsDirty()) { + element->DoDeferredPaintInvalidation(); + if (reason < PaintInvalidationReason::kRectangle) + reason = PaintInvalidationReason::kRectangle; + } + + return reason; } } // namespace blink
diff --git a/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.cpp b/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.cpp index 3f8ae83..93c7be0 100644 --- a/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.cpp +++ b/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.cpp
@@ -353,6 +353,42 @@ } } +LayoutRect ObjectPaintInvalidator::InvalidatePaintRectangle( + const LayoutRect& dirty_rect, + DisplayItemClient* display_item_client) { + CHECK(object_.IsRooted()); + + if (dirty_rect.IsEmpty()) + return LayoutRect(); + + if (object_.View()->GetDocument().Printing() && + !RuntimeEnabledFeatures::PrintBrowserEnabled()) + return LayoutRect(); // Don't invalidate paints if we're printing. + + const LayoutBoxModelObject& paint_invalidation_container = + object_.ContainerForPaintInvalidation(); + LayoutRect dirty_rect_on_backing = dirty_rect; + PaintLayer::MapRectToPaintInvalidationBacking( + object_, paint_invalidation_container, dirty_rect_on_backing); + dirty_rect_on_backing.Move(object_.ScrollAdjustmentForPaintInvalidation( + paint_invalidation_container)); + // TODO(crbug.com/732612): Implement rectangle raster invalidation for SPv2. + if (!RuntimeEnabledFeatures::SlimmingPaintV2Enabled()) { + InvalidatePaintUsingContainer(paint_invalidation_container, + dirty_rect_on_backing, + PaintInvalidationReason::kRectangle); + } + SlowSetPaintingLayerNeedsRepaint(); + if (display_item_client) { + InvalidateDisplayItemClient(*display_item_client, + PaintInvalidationReason::kRectangle); + } else { + object_.InvalidateDisplayItemClients(PaintInvalidationReason::kRectangle); + } + + return dirty_rect_on_backing; +} + void ObjectPaintInvalidator::SlowSetPaintingLayerNeedsRepaint() { if (PaintLayer* painting_layer = object_.PaintingLayer()) painting_layer->SetNeedsRepaint(); @@ -498,7 +534,7 @@ } DISABLE_CFI_PERF -void ObjectPaintInvalidatorWithContext::InvalidateSelection( +void ObjectPaintInvalidatorWithContext::InvalidateSelectionIfNeeded( PaintInvalidationReason reason) { // Update selection rect when we are doing full invalidation with geometry // change (in case that the object is moved, composite status changed, etc.) @@ -536,32 +572,6 @@ } DISABLE_CFI_PERF -void ObjectPaintInvalidatorWithContext::InvalidatePartialRect( - PaintInvalidationReason reason) { - if (IsImmediateFullPaintInvalidationReason(reason)) - return; - - auto rect = object_.PartialInvalidationRect(); - if (rect.IsEmpty()) - return; - - if (reason == PaintInvalidationReason::kNone) { - context_.painting_layer->SetNeedsRepaint(); - object_.InvalidateDisplayItemClients(PaintInvalidationReason::kRectangle); - } - - // TODO(crbug.com/732612): Implement rectangle raster invalidation for SPv2. - if (RuntimeEnabledFeatures::SlimmingPaintV2Enabled()) - return; - - context_.MapLocalRectToVisualRectInBacking(object_, rect); - if (rect.IsEmpty()) - return; - InvalidatePaintRectangleWithContext(rect, - PaintInvalidationReason::kRectangle); -} - -DISABLE_CFI_PERF PaintInvalidationReason ObjectPaintInvalidatorWithContext::InvalidatePaintWithComputedReason( PaintInvalidationReason reason) { @@ -571,9 +581,7 @@ // We need to invalidate the selection before checking for whether we are // doing a full invalidation. This is because we need to update the previous // selection rect regardless. - InvalidateSelection(reason); - - InvalidatePartialRect(reason); + InvalidateSelectionIfNeeded(reason); switch (reason) { case PaintInvalidationReason::kNone:
diff --git a/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.h b/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.h index ac6029f6..c378560c 100644 --- a/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.h +++ b/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.h
@@ -60,6 +60,13 @@ const LayoutRect&, PaintInvalidationReason); + // Invalidate the paint of a specific subrectangle within a given object. The + // rect is in the object's coordinate space. If a DisplayItemClient is + // specified, that client is invalidated rather than |m_object|. + // Returns the visual rect that was invalidated (i.e, invalidation in the + // space of the GraphicsLayer backing this LayoutObject). + LayoutRect InvalidatePaintRectangle(const LayoutRect&, DisplayItemClient*); + void InvalidatePaintIncludingNonCompositingDescendants(); void InvalidatePaintIncludingNonSelfPaintingLayerDescendants( const LayoutBoxModelObject& paint_invalidation_container); @@ -102,8 +109,7 @@ PaintInvalidationReason); private: - void InvalidateSelection(PaintInvalidationReason); - void InvalidatePartialRect(PaintInvalidationReason); + void InvalidateSelectionIfNeeded(PaintInvalidationReason); bool ParentFullyInvalidatedOnSameBacking(); const PaintInvalidatorContext& context_;
diff --git a/third_party/WebKit/Source/core/paint/PaintInvalidator.cpp b/third_party/WebKit/Source/core/paint/PaintInvalidator.cpp index 8b8095a..9f04dd5 100644 --- a/third_party/WebKit/Source/core/paint/PaintInvalidator.cpp +++ b/third_party/WebKit/Source/core/paint/PaintInvalidator.cpp
@@ -153,6 +153,7 @@ void PaintInvalidatorContext::MapLocalRectToVisualRectInBacking( const LayoutObject& object, LayoutRect& rect) const { + DCHECK(NeedsVisualRectUpdate(object)); rect = PaintInvalidator::MapLocalRectToVisualRectInBacking<LayoutRect, LayoutPoint>( object, rect, *this); @@ -161,7 +162,6 @@ LayoutRect PaintInvalidator::ComputeVisualRectInBacking( const LayoutObject& object, const PaintInvalidatorContext& context) { - DCHECK(context.NeedsVisualRectUpdate(object)); if (object.IsSVGChild()) { FloatRect local_rect = SVGLayoutSupport::LocalVisualRect(object); return MapLocalRectToVisualRectInBacking<FloatRect, FloatPoint>(
diff --git a/third_party/WebKit/Source/core/paint/RarePaintData.h b/third_party/WebKit/Source/core/paint/RarePaintData.h index 3a3d8e50..9f73951 100644 --- a/third_party/WebKit/Source/core/paint/RarePaintData.h +++ b/third_party/WebKit/Source/core/paint/RarePaintData.h
@@ -47,13 +47,6 @@ selection_visual_rect_ = r; } - LayoutRect PartialInvalidationRect() const { - return partial_invalidation_rect_; - } - void SetPartialInvalidationRect(const LayoutRect& r) { - partial_invalidation_rect_ = r; - } - private: // The PaintLayer associated with this LayoutBoxModelObject. This can be null // depending on the return value of LayoutBoxModelObject::layerTypeRequired(). @@ -65,7 +58,6 @@ LayoutPoint location_in_backing_; LayoutRect selection_visual_rect_; - LayoutRect partial_invalidation_rect_; }; } // namespace blink
diff --git a/third_party/WebKit/Source/platform/loader/fetch/Resource.cpp b/third_party/WebKit/Source/platform/loader/fetch/Resource.cpp index 5c58ec0..4352014 100644 --- a/third_party/WebKit/Source/platform/loader/fetch/Resource.cpp +++ b/third_party/WebKit/Source/platform/loader/fetch/Resource.cpp
@@ -325,6 +325,11 @@ } void Resource::CheckResourceIntegrity() { + // Skip the check and reuse the previous check result, especially on + // successful revalidation. + if (IntegrityDisposition() != ResourceIntegrityDisposition::kNotChecked) + return; + // Loading error occurred? Then result is uncheckable. integrity_report_info_.Clear(); if (ErrorOccurred()) { @@ -1070,6 +1075,8 @@ SECURITY_CHECK(redirect_chain_.IsEmpty()); ClearData(); cache_handler_.Clear(); + integrity_disposition_ = ResourceIntegrityDisposition::kNotChecked; + integrity_report_info_.Clear(); DestroyDecodedDataForFailedRevalidation(); is_revalidating_ = false; }
diff --git a/tools/idl_parser/idl_parser.py b/tools/idl_parser/idl_parser.py index 89187bd4..caa0011 100755 --- a/tools/idl_parser/idl_parser.py +++ b/tools/idl_parser/idl_parser.py
@@ -746,7 +746,7 @@ p[0] = p[1] def p_MaplikeRest(self, p): - """MaplikeRest : MAPLIKE '<' Type ',' Type '>' ';'""" + """MaplikeRest : MAPLIKE '<' TypeWithExtendedAttributes ',' TypeWithExtendedAttributes '>' ';'""" childlist = ListFromConcat(p[3], p[5]) p[0] = self.BuildProduction('Maplike', p, 2, childlist)
diff --git a/tools/idl_parser/test_parser/interface_web.idl b/tools/idl_parser/test_parser/interface_web.idl index e67fe2f4..02645ed 100644 --- a/tools/idl_parser/test_parser/interface_web.idl +++ b/tools/idl_parser/test_parser/interface_web.idl
@@ -355,10 +355,20 @@ * PrimitiveType(double) * Type() * PrimitiveType(boolean) + * Maplike() + * Type() + * PrimitiveType(long) + * ExtAttributes() + * ExtAttribute(Clamp) + * Type() + * StringType(DOMString) + * ExtAttributes() + * ExtAttribute(XAttr) */ interface MyIfaceMaplike { readonly maplike<long, DOMString>; maplike<double, boolean>; + maplike<[Clamp] long, [XAttr] DOMString>; }; /** TREE
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml index 8bd2614a..d00ed9b1 100644 --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml
@@ -23540,6 +23540,7 @@ <int value="-680589442" label="MacRTL:disabled"/> <int value="-667517406" label="overscroll-history-navigation"/> <int value="-666508951" label="CrOSContainer:enabled"/> + <int value="-663476391" label="enable-pixel-canvas-recording:enabled"/> <int value="-661978438" label="enable-data-reduction-proxy-lo-fi"/> <int value="-660160292" label="enable-apps-show-on-first-paint"/> <int value="-650504533" label="enable-speculative-launch-service-worker"/> @@ -23775,6 +23776,7 @@ <int value="44088203" label="ExpensiveBackgroundTimerThrottling:enabled"/> <int value="48159177" label="reduced-referrer-granularity"/> <int value="51793504" label="protect-sync-credential-on-reauth:disabled"/> + <int value="52368742" label="enable-pixel-canvas-recording:disabled"/> <int value="56723110" label="enable-webfonts-intervention"/> <int value="57639188" label="SoundContentSetting:disabled"/> <int value="57791920" label="MemoryCoordinator:enabled"/>
diff --git a/ui/app_list/views/apps_grid_view.cc b/ui/app_list/views/apps_grid_view.cc index fe341eb..3b26f71 100644 --- a/ui/app_list/views/apps_grid_view.cc +++ b/ui/app_list/views/apps_grid_view.cc
@@ -2532,23 +2532,20 @@ int col = ClampToRange((point.x() - bounds.x()) / total_tile_size.width(), 0, cols_ - 1); int row = rows_per_page_; - if (is_fullscreen_app_list_enabled_ && current_page == 0) { - row = ClampToRange((point.y() - bounds.y()) / total_tile_size.height(), 0, - rows_per_page_ - 2); - } else { - row = ClampToRange((point.y() - bounds.y()) / total_tile_size.height(), 0, - rows_per_page_ - 1); - } + bool show_suggested_apps = + is_fullscreen_app_list_enabled_ && current_page == 0; + row = ClampToRange((point.y() - bounds.y()) / total_tile_size.height(), 0, + rows_per_page_ - (show_suggested_apps ? 2 : 1)); return Index(current_page, row * cols_ + col); } gfx::Size AppsGridView::GetTileGridSize() const { gfx::Rect bounds = GetExpectedTileBounds(0, 0); const int current_page = pagination_model_.selected_page(); - if (is_fullscreen_app_list_enabled_ && current_page == 0) - bounds.Union(GetExpectedTileBounds(rows_per_page_ - 2, cols_ - 1)); - else - bounds.Union(GetExpectedTileBounds(rows_per_page_ - 1, cols_ - 1)); + bool show_suggested_apps = + is_fullscreen_app_list_enabled_ && current_page == 0; + bounds.Union(GetExpectedTileBounds( + rows_per_page_ - (show_suggested_apps ? 2 : 1), cols_ - 1)); bounds.Inset(0, -GetHeightOnTopOfAllAppsTiles(current_page), 0, 0); bounds.Inset(GetTilePadding()); return bounds.size();
diff --git a/ui/base/dragdrop/os_exchange_data_provider_mac.h b/ui/base/dragdrop/os_exchange_data_provider_mac.h index 4250f92..7ee25905 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_mac.h +++ b/ui/base/dragdrop/os_exchange_data_provider_mac.h
@@ -57,6 +57,10 @@ // Returns the data for the specified type in the pasteboard. NSData* GetNSDataForType(NSString* type) const; + // Returns the union of SupportedPasteboardTypes() and the types in the + // current pasteboard. + NSArray* GetAvailableTypes() const; + // Creates an OSExchangeData object from the given NSPasteboard object. static std::unique_ptr<OSExchangeData> CreateDataFromPasteboard( NSPasteboard* pasteboard);
diff --git a/ui/base/dragdrop/os_exchange_data_provider_mac.mm b/ui/base/dragdrop/os_exchange_data_provider_mac.mm index 2014408..a2ab4b7 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_mac.mm +++ b/ui/base/dragdrop/os_exchange_data_provider_mac.mm
@@ -193,6 +193,14 @@ return [pasteboard_->get() dataForType:type]; } +NSArray* OSExchangeDataProviderMac::GetAvailableTypes() const { + NSSet* supportedTypes = [NSSet setWithArray:SupportedPasteboardTypes()]; + NSMutableSet* availableTypes = + [NSMutableSet setWithArray:[pasteboard_->get() types]]; + [availableTypes unionSet:supportedTypes]; + return [availableTypes allObjects]; +} + // static std::unique_ptr<OSExchangeData> OSExchangeDataProviderMac::CreateDataFromPasteboard(NSPasteboard* pasteboard) {
diff --git a/ui/compositor/compositor_switches.cc b/ui/compositor/compositor_switches.cc index 4bc0094..f09ec54 100644 --- a/ui/compositor/compositor_switches.cc +++ b/ui/compositor/compositor_switches.cc
@@ -31,15 +31,26 @@ const char kUISlowAnimations[] = "ui-slow-animations"; -// If enabled, all draw commands recorded on canvas are done in pixel aligned -// measurements. This also enables scaling of all elements in views and layers -// to be done via corner points. See https://goo.gl/Dqig5s -const char kEnablePixelCanvasRecording[] = "enable-pixel-canvas-recording"; - const char kDisableVsyncForTests[] = "disable-vsync-for-tests"; } // namespace switches +namespace features { + +// If enabled, all draw commands recorded on canvas are done in pixel aligned +// measurements. This also enables scaling of all elements in views and layers +// to be done via corner points. See https://crbug.com/720596 for details. +const base::Feature kEnablePixelCanvasRecording { + "enable-pixel-canvas-recording", +#if defined(OS_CHROMEOS) + base::FEATURE_ENABLED_BY_DEFAULT +#else + base::FEATURE_DISABLED_BY_DEFAULT +#endif +}; + +} // namespace features + namespace ui { bool IsUIZeroCopyEnabled() { @@ -54,8 +65,7 @@ } bool IsPixelCanvasRecordingEnabled() { - return base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnablePixelCanvasRecording); + return base::FeatureList::IsEnabled(features::kEnablePixelCanvasRecording); } } // namespace ui
diff --git a/ui/compositor/compositor_switches.h b/ui/compositor/compositor_switches.h index 43e167dd..2f02b8e0 100644 --- a/ui/compositor/compositor_switches.h +++ b/ui/compositor/compositor_switches.h
@@ -5,6 +5,7 @@ #ifndef UI_COMPOSITOR_COMPOSITOR_SWITCHES_H_ #define UI_COMPOSITOR_COMPOSITOR_SWITCHES_H_ +#include "base/feature_list.h" #include "ui/compositor/compositor_export.h" namespace switches { @@ -17,11 +18,16 @@ COMPOSITOR_EXPORT extern const char kUIDisableZeroCopy[]; COMPOSITOR_EXPORT extern const char kUIShowPaintRects[]; COMPOSITOR_EXPORT extern const char kUISlowAnimations[]; -COMPOSITOR_EXPORT extern const char kEnablePixelCanvasRecording[]; COMPOSITOR_EXPORT extern const char kDisableVsyncForTests[]; } // namespace switches +namespace features { + +COMPOSITOR_EXPORT extern const base::Feature kEnablePixelCanvasRecording; + +} // namespace features + namespace ui { bool IsUIZeroCopyEnabled();
diff --git a/ui/file_manager/file_manager/foreground/js/file_transfer_controller.js b/ui/file_manager/file_manager/foreground/js/file_transfer_controller.js index d4c2d372..0b2838f 100644 --- a/ui/file_manager/file_manager/foreground/js/file_transfer_controller.js +++ b/ui/file_manager/file_manager/foreground/js/file_transfer_controller.js
@@ -919,8 +919,8 @@ return container; } - // Option 2. Thumbnail image available, then render it without - // a label. + // Option 2. Thumbnail image available from preloadedThumbnailImagePromise_, + // then render it without a label. if (this.preloadedThumbnailImagePromise_ && this.preloadedThumbnailImagePromise_.value) { var thumbnailImage = this.preloadedThumbnailImagePromise_.value; @@ -951,7 +951,24 @@ return container; } - // Option 3. Thumbnail not available. Render an icon and a label. + // Option 3. Thumbnail image available from file grid / list, render it + // without a label. + // Because of Option 1, there is only exactly one item selected. + var index = this.selectionHandler_.selection.indexes[0]; + // We only need one of the thumbnails. + var thumbnail = this.listContainer_.currentView.getThumbnail(index); + if (thumbnail) { + var canvas = document.createElement('canvas'); + canvas.width = FileTransferController.DRAG_THUMBNAIL_SIZE_; + canvas.height = FileTransferController.DRAG_THUMBNAIL_SIZE_; + canvas.style.backgroundImage = thumbnail.style.backgroundImage; + canvas.style.backgroundSize = 'cover'; + canvas.classList.add('for-image'); + contents.appendChild(canvas); + return container; + } + + // Option 4. Thumbnail not available. Render an icon and a label. var entry = this.selectionHandler_.selection.entries[0]; var icon = this.document_.createElement('div'); icon.className = 'detail-icon';
diff --git a/ui/file_manager/file_manager/foreground/js/ui/file_grid.js b/ui/file_manager/file_manager/foreground/js/ui/file_grid.js index bd78382..c8861a7 100644 --- a/ui/file_manager/file_manager/foreground/js/ui/file_grid.js +++ b/ui/file_manager/file_manager/foreground/js/ui/file_grid.js
@@ -136,6 +136,25 @@ }; /** + * Returns the element containing the thumbnail of a certain list item as + * background image. + * @param {number} index The index of the item containing the desired thumbnail. + * @return {?Element} The element containing the thumbnail, or null, if an error + * occurred. + */ +FileGrid.prototype.getThumbnail = function(index) { + var listItem = this.getListItemByIndex(index); + if (!listItem) { + return null; + } + var container = listItem.querySelector('.img-container'); + if (!container) { + return null; + } + return container.querySelector('.thumbnail'); +}; + +/** * Handles thumbnail loaded event. * @param {!Event} event An event. * @private
diff --git a/ui/file_manager/file_manager/foreground/js/ui/file_table.js b/ui/file_manager/file_manager/foreground/js/ui/file_table.js index ca45275..ed50999 100644 --- a/ui/file_manager/file_manager/foreground/js/ui/file_table.js +++ b/ui/file_manager/file_manager/foreground/js/ui/file_table.js
@@ -522,6 +522,25 @@ }; /** + * Returns the element containing the thumbnail of a certain list item as + * background image. + * @param {number} index The index of the item containing the desired thumbnail. + * @return {?Element} The element containing the thumbnail, or null, if an error + * occurred. + */ +FileTable.prototype.getThumbnail = function(index) { + var listItem = this.getListItemByIndex(index); + if (!listItem) { + return null; + } + var container = listItem.querySelector('.detail-thumbnail'); + if (!container) { + return null; + } + return container.querySelector('.thumbnail'); +}; + +/** * Handles thumbnail loaded event. * @param {!Event} event An event. * @private
diff --git a/ui/gfx/interpolated_transform.cc b/ui/gfx/interpolated_transform.cc index 8cf04d25..e8b6fec 100644 --- a/ui/gfx/interpolated_transform.cc +++ b/ui/gfx/interpolated_transform.cc
@@ -8,12 +8,9 @@ #include "base/memory/ptr_util.h" -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif - #include "base/logging.h" #include "ui/gfx/animation/tween.h" +#include "ui/gfx/geometry/safe_integer_conversions.h" namespace { @@ -38,9 +35,7 @@ SkMatrix44& m = transform.matrix(); float degrees_by_ninety = degrees / 90.0f; - int n = static_cast<int>(degrees_by_ninety > 0 - ? floor(degrees_by_ninety + 0.5f) - : ceil(degrees_by_ninety - 0.5f)); + int n = gfx::ToRoundedInt(degrees_by_ninety); n %= 4; if (n < 0)
diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc index f8999eb..c3cf898 100644 --- a/ui/gfx/render_text.cc +++ b/ui/gfx/render_text.cc
@@ -67,16 +67,13 @@ // re-calculation of baseline. const int kInvalidBaseline = INT_MAX; -int round(float value) { - return static_cast<int>(floor(value + 0.5f)); -} - // Given |font| and |display_width|, returns the width of the fade gradient. int CalculateFadeGradientWidth(const FontList& font_list, int display_width) { // Fade in/out about 3 characters of the beginning/end of the string. // Use a 1/3 of the display width if the display width is very short. const int narrow_width = font_list.GetExpectedTextWidth(3); - const int gradient_width = std::min(narrow_width, round(display_width / 3.f)); + const int gradient_width = + std::min(narrow_width, gfx::ToRoundedInt(display_width / 3.f)); DCHECK_GE(gradient_width, 0); return gradient_width; } @@ -122,8 +119,10 @@ const float width_fraction = text_rect.width() / static_cast<float>(font_list.GetExpectedTextWidth(4)); const SkAlpha kAlphaAtZeroWidth = 51; - const SkAlpha alpha = (width_fraction < 1) ? - static_cast<SkAlpha>(round((1 - width_fraction) * kAlphaAtZeroWidth)) : 0; + const SkAlpha alpha = + (width_fraction < 1) + ? gfx::ToRoundedInt((1 - width_fraction) * kAlphaAtZeroWidth) + : 0; const SkColor fade_color = SkColorSetA(color, alpha); std::vector<SkScalar> positions;
diff --git a/ui/gfx/render_text_harfbuzz.cc b/ui/gfx/render_text_harfbuzz.cc index ffbb3b1..1bc7a8a 100644 --- a/ui/gfx/render_text_harfbuzz.cc +++ b/ui/gfx/render_text_harfbuzz.cc
@@ -1638,7 +1638,7 @@ : HarfBuzzUnitsToFloat(hb_positions[i].x_advance); // Round run widths if subpixel positioning is off to match native behavior. if (!run->render_params.subpixel_positioning) - run->width = std::floor(run->width + 0.5f); + run->width = std::round(run->width); } hb_buffer_destroy(buffer);
diff --git a/ui/gfx/transform.cc b/ui/gfx/transform.cc index 6e6aa91..d3c7ac39 100644 --- a/ui/gfx/transform.cc +++ b/ui/gfx/transform.cc
@@ -40,12 +40,6 @@ return std::abs(x - SkDoubleToMScalar(1.0)) <= tolerance; } -static float Round(float f) { - if (f == 0.f) - return f; - return (f > 0.f) ? std::floor(f + 0.5f) : std::ceil(f - 0.5f); -} - } // namespace Transform::Transform(SkMScalar col1row1, @@ -533,8 +527,10 @@ } void Transform::RoundTranslationComponents() { - matrix_.set(0, 3, Round(matrix_.get(0, 3))); - matrix_.set(1, 3, Round(matrix_.get(1, 3))); + // TODO(pkasting): Use SkMScalarRound() when + // https://bugs.chromium.org/p/skia/issues/detail?id=6852 is fixed. + matrix_.set(0, 3, std::round(matrix_.get(0, 3))); + matrix_.set(1, 3, std::round(matrix_.get(1, 3))); } void Transform::TransformPointInternal(const SkMatrix44& xform,
diff --git a/ui/views/cocoa/bridged_content_view.mm b/ui/views/cocoa/bridged_content_view.mm index a06eed11..191212f9 100644 --- a/ui/views/cocoa/bridged_content_view.mm +++ b/ui/views/cocoa/bridged_content_view.mm
@@ -779,6 +779,12 @@ return client ? client->DragUpdate(sender) : ui::DragDropTypes::DRAG_NONE; } +- (void)draggingExited:(id<NSDraggingInfo>)sender { + views::DragDropClientMac* client = [self dragDropClient]; + if (client) + client->DragExit(); +} + - (BOOL)performDragOperation:(id<NSDraggingInfo>)sender { views::DragDropClientMac* client = [self dragDropClient]; return client && client->Drop(sender) != NSDragOperationNone;
diff --git a/ui/views/cocoa/drag_drop_client_mac.h b/ui/views/cocoa/drag_drop_client_mac.h index 1b72505..2e11299 100644 --- a/ui/views/cocoa/drag_drop_client_mac.h +++ b/ui/views/cocoa/drag_drop_client_mac.h
@@ -59,6 +59,9 @@ // Called when the drag and drop session has ended. void EndDrag(); + // Called when mouse leaves the drop area. + void DragExit(); + DropHelper* drop_helper() { return &drop_helper_; } private: @@ -82,6 +85,9 @@ // The closure for the drag and drop's run loop. base::Closure quit_closure_; + // Whether |this| is the source of current dragging session. + bool is_drag_source_; + DISALLOW_COPY_AND_ASSIGN(DragDropClientMac); };
diff --git a/ui/views/cocoa/drag_drop_client_mac.mm b/ui/views/cocoa/drag_drop_client_mac.mm index 9dda333..ce3f37b 100644 --- a/ui/views/cocoa/drag_drop_client_mac.mm +++ b/ui/views/cocoa/drag_drop_client_mac.mm
@@ -62,7 +62,8 @@ : drop_helper_(root_view), operation_(0), bridge_(bridge), - quit_closure_(base::Closure()) { + quit_closure_(base::Closure()), + is_drag_source_(false) { DCHECK(bridge); } @@ -75,6 +76,7 @@ ui::DragDropTypes::DragEventSource source) { data_source_.reset([[CocoaDragDropDataProvider alloc] initWithData:data]); operation_ = operation; + is_drag_source_ = true; const ui::OSExchangeDataProviderMac& provider = static_cast<const ui::OSExchangeDataProviderMac&>(data.provider()); @@ -104,8 +106,7 @@ base::scoped_nsobject<NSPasteboardItem> item([[NSPasteboardItem alloc] init]); [item setDataProvider:data_source_.get() - forTypes:ui::OSExchangeDataProviderMac:: - SupportedPasteboardTypes()]; + forTypes:provider.GetAvailableTypes()]; base::scoped_nsobject<NSDraggingItem> drag_item( [[NSDraggingItem alloc] initWithPasteboardWriter:item.get()]); @@ -130,10 +131,6 @@ } NSDragOperation DragDropClientMac::DragUpdate(id<NSDraggingInfo> sender) { - int drag_operation = ui::DragDropTypes::DRAG_NONE; - - // Since dragging from non MacView sources does not generate OSExchangeData, - // we need to generate one based on the provided pasteboard. if (!data_source_.get()) { data_source_.reset([[CocoaDragDropDataProvider alloc] initWithPasteboard:[sender draggingPasteboard]]); @@ -141,23 +138,26 @@ [sender draggingSourceOperationMask]); } - drag_operation = drop_helper_.OnDragOver( + int drag_operation = drop_helper_.OnDragOver( *[data_source_ data], LocationInView([sender draggingLocation]), operation_); return ui::DragDropTypes::DragOperationToNSDragOperation(drag_operation); } NSDragOperation DragDropClientMac::Drop(id<NSDraggingInfo> sender) { + // OnDrop may delete |this|, so clear |data_source_| first. + base::scoped_nsobject<CocoaDragDropDataProvider> data_source( + std::move(data_source_)); + int drag_operation = drop_helper_.OnDrop( - *[data_source_ data], LocationInView([sender draggingLocation]), + *[data_source data], LocationInView([sender draggingLocation]), operation_); - data_source_.reset(); - operation_ = 0; return ui::DragDropTypes::DragOperationToNSDragOperation(drag_operation); } void DragDropClientMac::EndDrag() { data_source_.reset(); + is_drag_source_ = false; // Allow a test to invoke EndDrag() without spinning the nested run loop. if (!quit_closure_.is_null()) { @@ -166,6 +166,12 @@ } } +void DragDropClientMac::DragExit() { + drop_helper_.OnDragExit(); + if (!is_drag_source_) + data_source_.reset(); +} + gfx::Point DragDropClientMac::LocationInView(NSPoint point) const { return gfx::Point(point.x, NSHeight([bridge_->ns_window() frame]) - point.y); }
diff --git a/ui/views/cocoa/drag_drop_client_mac_unittest.mm b/ui/views/cocoa/drag_drop_client_mac_unittest.mm index 939e427..5498995 100644 --- a/ui/views/cocoa/drag_drop_client_mac_unittest.mm +++ b/ui/views/cocoa/drag_drop_client_mac_unittest.mm
@@ -196,7 +196,8 @@ } void TearDown() override { - widget_->CloseNow(); + if (widget_) + widget_->CloseNow(); WidgetTest::TearDown(); } @@ -296,5 +297,39 @@ EXPECT_EQ(Drop(), NSDragOperationMove); } +// View object that will close Widget on drop. +class DragDropCloseView : public DragDropView { + public: + DragDropCloseView() {} + + // View: + int OnPerformDrop(const ui::DropTargetEvent& event) override { + GetWidget()->CloseNow(); + return ui::DragDropTypes::DRAG_MOVE; + } + + private: + DISALLOW_COPY_AND_ASSIGN(DragDropCloseView); +}; + +// Tests that closing Widget on OnPerformDrop does not crash. +TEST_F(DragDropClientMacTest, CloseWidgetOnDrop) { + OSExchangeData data; + const base::string16& text = ASCIIToUTF16("text"); + data.SetString(text); + SetData(data); + + target_ = new DragDropCloseView(); + widget_->GetContentsView()->AddChildView(target_); + target_->SetBoundsRect(gfx::Rect(0, 0, 100, 100)); + target_->set_formats(ui::OSExchangeData::STRING | ui::OSExchangeData::URL); + + EXPECT_EQ(DragUpdate(nil), NSDragOperationCopy); + EXPECT_EQ(Drop(), NSDragOperationMove); + + // OnPerformDrop() will have deleted the widget. + widget_ = nullptr; +} + } // namespace test } // namespace views
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc index 3dcb6b0..be83afca0 100644 --- a/ui/views/view_unittest.cc +++ b/ui/views/view_unittest.cc
@@ -18,6 +18,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "base/test/scoped_feature_list.h" #include "build/build_config.h" #include "cc/paint/display_item_list.h" #include "ui/base/accelerators/accelerator.h" @@ -3774,6 +3775,7 @@ } void SetUp() override { + SetUpPixelCanvas(); ViewTest::SetUp(); widget_ = new Widget; Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP); @@ -3790,12 +3792,18 @@ Widget* widget() { return widget_; } + virtual void SetUpPixelCanvas() { + scoped_feature_list_.InitAndDisableFeature( + features::kEnablePixelCanvasRecording); + } + protected: // Accessors to View internals. void SchedulePaintOnParent(View* view) { view->SchedulePaintOnParent(); } private: Widget* widget_; + base::test::ScopedFeatureList scoped_feature_list_; }; @@ -4484,13 +4492,15 @@ ~ViewLayerPixelCanvasTest() override {} - void SetUp() override { - // Enable pixel canvas - base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); - cmd_line->AppendSwitch(switches::kEnablePixelCanvasRecording); - - ViewLayerTest::SetUp(); + void SetUpPixelCanvas() override { + scoped_feature_list_.InitAndEnableFeature( + features::kEnablePixelCanvasRecording); } + + private: + base::test::ScopedFeatureList scoped_feature_list_; + + DISALLOW_COPY_AND_ASSIGN(ViewLayerPixelCanvasTest); }; TEST_F(ViewLayerPixelCanvasTest, SnapLayerToPixel) {