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

Side by Side Diff: webkit/glue/webpreferences.cc

Issue 11884025: Copy-paste preserves <embed> tags containing active content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "webkit/glue/webpreferences.h" 5 #include "webkit/glue/webpreferences.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi er.h" 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi er.h"
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 WebSize(default_tile_width, default_tile_height)); 464 WebSize(default_tile_width, default_tile_height));
465 settings->setMaxUntiledLayerSize( 465 settings->setMaxUntiledLayerSize(
466 WebSize(max_untiled_layer_width, max_untiled_layer_height)); 466 WebSize(max_untiled_layer_width, max_untiled_layer_height));
467 467
468 settings->setFixedPositionCreatesStackingContext( 468 settings->setFixedPositionCreatesStackingContext(
469 fixed_position_creates_stacking_context); 469 fixed_position_creates_stacking_context);
470 470
471 settings->setDeferredImageDecodingEnabled(deferred_image_decoding_enabled); 471 settings->setDeferredImageDecodingEnabled(deferred_image_decoding_enabled);
472 settings->setShouldRespectImageOrientation(should_respect_image_orientation); 472 settings->setShouldRespectImageOrientation(should_respect_image_orientation);
473 473
474 settings->setUnsafePluginPastingEnabled(false);
474 settings->setEditingBehavior( 475 settings->setEditingBehavior(
475 static_cast<WebSettings::EditingBehavior>(editing_behavior)); 476 static_cast<WebSettings::EditingBehavior>(editing_behavior));
476 477
477 settings->setSupportsMultipleWindows(supports_multiple_windows); 478 settings->setSupportsMultipleWindows(supports_multiple_windows);
478 479
479 settings->setViewportEnabled(viewport_enabled); 480 settings->setViewportEnabled(viewport_enabled);
480 481
481 #if defined(OS_ANDROID) 482 #if defined(OS_ANDROID)
482 settings->setAllowCustomScrollbarInMainFrame(false); 483 settings->setAllowCustomScrollbarInMainFrame(false);
483 settings->setTextAutosizingEnabled(text_autosizing_enabled); 484 settings->setTextAutosizingEnabled(text_autosizing_enabled);
(...skipping 14 matching lines...) Expand all
498 mismatching_enums) 499 mismatching_enums)
499 500
500 COMPILE_ASSERT_MATCHING_ENUMS( 501 COMPILE_ASSERT_MATCHING_ENUMS(
501 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); 502 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac);
502 COMPILE_ASSERT_MATCHING_ENUMS( 503 COMPILE_ASSERT_MATCHING_ENUMS(
503 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); 504 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin);
504 COMPILE_ASSERT_MATCHING_ENUMS( 505 COMPILE_ASSERT_MATCHING_ENUMS(
505 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); 506 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix);
506 507
507 } // namespace webkit_glue 508 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698