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

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

Issue 2670643004: Rename EDisplay values with k prefix. (Closed)
Patch Set: Rebase Created 3 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/modules/accessibility/AXObject.cpp ('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 // Copyright (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 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 "web/PopupMenuImpl.h" 5 #include "web/PopupMenuImpl.h"
6 6
7 #include "core/HTMLNames.h" 7 #include "core/HTMLNames.h"
8 #include "core/css/CSSFontSelector.h" 8 #include "core/css/CSSFontSelector.h"
9 #include "core/dom/ElementTraversal.h" 9 #include "core/dom/ElementTraversal.h"
10 #include "core/dom/NodeComputedStyle.h" 10 #include "core/dom/NodeComputedStyle.h"
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 void PopupMenuImpl::addElementStyle(ItemIterationContext& context, 309 void PopupMenuImpl::addElementStyle(ItemIterationContext& context,
310 HTMLElement& element) { 310 HTMLElement& element) {
311 const ComputedStyle* style = m_ownerElement->itemComputedStyle(element); 311 const ComputedStyle* style = m_ownerElement->itemComputedStyle(element);
312 DCHECK(style); 312 DCHECK(style);
313 SharedBuffer* data = context.m_buffer; 313 SharedBuffer* data = context.m_buffer;
314 // TODO(tkent): We generate unnecessary "style: {\n},\n" even if no 314 // TODO(tkent): We generate unnecessary "style: {\n},\n" even if no
315 // additional style. 315 // additional style.
316 PagePopupClient::addString("style: {\n", data); 316 PagePopupClient::addString("style: {\n", data);
317 if (style->visibility() == EVisibility::kHidden) 317 if (style->visibility() == EVisibility::kHidden)
318 addProperty("visibility", String("hidden"), data); 318 addProperty("visibility", String("hidden"), data);
319 if (style->display() == EDisplay::None) 319 if (style->display() == EDisplay::kNone)
320 addProperty("display", String("none"), data); 320 addProperty("display", String("none"), data);
321 const ComputedStyle& baseStyle = context.baseStyle(); 321 const ComputedStyle& baseStyle = context.baseStyle();
322 if (baseStyle.direction() != style->direction()) { 322 if (baseStyle.direction() != style->direction()) {
323 addProperty( 323 addProperty(
324 "direction", 324 "direction",
325 String(style->direction() == TextDirection::kRtl ? "rtl" : "ltr"), 325 String(style->direction() == TextDirection::kRtl ? "rtl" : "ltr"),
326 data); 326 data);
327 } 327 }
328 if (isOverride(style->getUnicodeBidi())) 328 if (isOverride(style->getUnicodeBidi()))
329 addProperty("unicodeBidi", String("bidi-override"), data); 329 addProperty("unicodeBidi", String("bidi-override"), data);
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 } 555 }
556 556
557 void PopupMenuImpl::disconnectClient() { 557 void PopupMenuImpl::disconnectClient() {
558 m_ownerElement = nullptr; 558 m_ownerElement = nullptr;
559 // Cannot be done during finalization, so instead done when the 559 // Cannot be done during finalization, so instead done when the
560 // layout object is destroyed and disconnected. 560 // layout object is destroyed and disconnected.
561 dispose(); 561 dispose();
562 } 562 }
563 563
564 } // namespace blink 564 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/accessibility/AXObject.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698