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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 1366893002: Make window.scroll properties relative to the layout viewport. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: "worked on review comments" Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 1036 matching lines...) Expand 10 before | Expand all | Expand 10 after
1047 prefs.image_color_profiles_enabled); 1047 prefs.image_color_profiles_enabled);
1048 settings->setShouldRespectImageOrientation( 1048 settings->setShouldRespectImageOrientation(
1049 prefs.should_respect_image_orientation); 1049 prefs.should_respect_image_orientation);
1050 1050
1051 settings->setUnsafePluginPastingEnabled(false); 1051 settings->setUnsafePluginPastingEnabled(false);
1052 settings->setEditingBehavior( 1052 settings->setEditingBehavior(
1053 static_cast<WebSettings::EditingBehavior>(prefs.editing_behavior)); 1053 static_cast<WebSettings::EditingBehavior>(prefs.editing_behavior));
1054 1054
1055 settings->setSupportsMultipleWindows(prefs.supports_multiple_windows); 1055 settings->setSupportsMultipleWindows(prefs.supports_multiple_windows);
1056 1056
1057 settings->setInertVisualViewport(prefs.inert_visual_viewport);
1058
1057 // TODO(bokan): Remove once Blink side is gone. 1059 // TODO(bokan): Remove once Blink side is gone.
1058 settings->setInvertViewportScrollOrder(true); 1060 settings->setInvertViewportScrollOrder(true);
1059 1061
1060 settings->setViewportEnabled(prefs.viewport_enabled); 1062 settings->setViewportEnabled(prefs.viewport_enabled);
1061 settings->setLoadWithOverviewMode(prefs.initialize_at_minimum_page_scale); 1063 settings->setLoadWithOverviewMode(prefs.initialize_at_minimum_page_scale);
1062 settings->setViewportMetaEnabled(prefs.viewport_meta_enabled); 1064 settings->setViewportMetaEnabled(prefs.viewport_meta_enabled);
1063 settings->setMainFrameResizesAreOrientationChanges( 1065 settings->setMainFrameResizesAreOrientationChanges(
1064 prefs.main_frame_resizes_are_orientation_changes); 1066 prefs.main_frame_resizes_are_orientation_changes);
1065 1067
1066 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled); 1068 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled);
(...skipping 2674 matching lines...) Expand 10 before | Expand all | Expand 10 after
3741 std::vector<gfx::Size> sizes; 3743 std::vector<gfx::Size> sizes;
3742 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 3744 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
3743 if (!url.isEmpty()) 3745 if (!url.isEmpty())
3744 urls.push_back( 3746 urls.push_back(
3745 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 3747 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
3746 } 3748 }
3747 SendUpdateFaviconURL(urls); 3749 SendUpdateFaviconURL(urls);
3748 } 3750 }
3749 3751
3750 } // namespace content 3752 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698