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

Side by Side Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Issue 1743803002: Rename enums/functions that collide in chromium style in core/style/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-8
Patch Set: get-names-9: rebase Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/platform/text/TextRun.h ('k') | 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 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 1334 matching lines...) Expand 10 before | Expand all | Expand 10 after
1345 WebPluginContainerImpl* pluginContainer = node.isNull() ? pluginContainerFro mFrame(frame()) : toWebPluginContainerImpl(node.pluginContainer()); 1345 WebPluginContainerImpl* pluginContainer = node.isNull() ? pluginContainerFro mFrame(frame()) : toWebPluginContainerImpl(node.pluginContainer());
1346 1346
1347 if (!pluginContainer || !pluginContainer->supportsPaginatedPrint()) 1347 if (!pluginContainer || !pluginContainer->supportsPaginatedPrint())
1348 return false; 1348 return false;
1349 1349
1350 return pluginContainer->getPrintPresetOptionsFromDocument(presetOptions); 1350 return pluginContainer->getPrintPresetOptionsFromDocument(presetOptions);
1351 } 1351 }
1352 1352
1353 bool WebLocalFrameImpl::hasCustomPageSizeStyle(int pageIndex) 1353 bool WebLocalFrameImpl::hasCustomPageSizeStyle(int pageIndex)
1354 { 1354 {
1355 return frame()->document()->styleForPage(pageIndex)->pageSizeType() != PAGE_ SIZE_AUTO; 1355 return frame()->document()->styleForPage(pageIndex)->getPageSizeType() != PA GE_SIZE_AUTO;
1356 } 1356 }
1357 1357
1358 bool WebLocalFrameImpl::isPageBoxVisible(int pageIndex) 1358 bool WebLocalFrameImpl::isPageBoxVisible(int pageIndex)
1359 { 1359 {
1360 return frame()->document()->isPageBoxVisible(pageIndex); 1360 return frame()->document()->isPageBoxVisible(pageIndex);
1361 } 1361 }
1362 1362
1363 void WebLocalFrameImpl::pageSizeAndMarginsInPixels(int pageIndex, WebSize& pageS ize, int& marginTop, int& marginRight, int& marginBottom, int& marginLeft) 1363 void WebLocalFrameImpl::pageSizeAndMarginsInPixels(int pageIndex, WebSize& pageS ize, int& marginTop, int& marginRight, int& marginBottom, int& marginLeft)
1364 { 1364 {
1365 IntSize size = pageSize; 1365 IntSize size = pageSize;
(...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after
2197 return WebSandboxFlags::None; 2197 return WebSandboxFlags::None;
2198 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2198 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2199 } 2199 }
2200 2200
2201 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) 2201 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags)
2202 { 2202 {
2203 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); 2203 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
2204 } 2204 }
2205 2205
2206 } // namespace blink 2206 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/text/TextRun.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698