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

Side by Side Diff: Source/core/html/shadow/SliderThumbElement.cpp

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated change after Doug's review. Created 5 years, 10 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 | « Source/core/html/forms/InputType.cpp ('k') | Source/core/layout/LayoutMedia.cpp » ('j') | 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) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2010 Google Inc. All rights reserved. 3 * Copyright (C) 2010 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "core/page/EventHandler.h" 47 #include "core/page/EventHandler.h"
48 #include "core/rendering/RenderFlexibleBox.h" 48 #include "core/rendering/RenderFlexibleBox.h"
49 49
50 namespace blink { 50 namespace blink {
51 51
52 using namespace HTMLNames; 52 using namespace HTMLNames;
53 53
54 inline static bool hasVerticalAppearance(HTMLInputElement* input) 54 inline static bool hasVerticalAppearance(HTMLInputElement* input)
55 { 55 {
56 ASSERT(input->renderer()); 56 ASSERT(input->renderer());
57 LayoutStyle* sliderStyle = input->renderer()->style(); 57 const LayoutStyle& sliderStyle = input->renderer()->styleRef();
58 58
59 return sliderStyle->appearance() == SliderVerticalPart; 59 return sliderStyle.appearance() == SliderVerticalPart;
60 } 60 }
61 61
62 inline SliderThumbElement::SliderThumbElement(Document& document) 62 inline SliderThumbElement::SliderThumbElement(Document& document)
63 : HTMLDivElement(document) 63 : HTMLDivElement(document)
64 , m_inDragMode(false) 64 , m_inDragMode(false)
65 { 65 {
66 } 66 }
67 67
68 PassRefPtrWillBeRawPtr<SliderThumbElement> SliderThumbElement::create(Document& document) 68 PassRefPtrWillBeRawPtr<SliderThumbElement> SliderThumbElement::create(Document& document)
69 { 69 {
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 DEFINE_STATIC_LOCAL(const AtomicString, mediaSliderThumb, ("-webkit-media-sl ider-thumb", AtomicString::ConstructFromLiteral)); 276 DEFINE_STATIC_LOCAL(const AtomicString, mediaSliderThumb, ("-webkit-media-sl ider-thumb", AtomicString::ConstructFromLiteral));
277 return mediaSliderThumb; 277 return mediaSliderThumb;
278 } 278 }
279 279
280 const AtomicString& SliderThumbElement::shadowPseudoId() const 280 const AtomicString& SliderThumbElement::shadowPseudoId() const
281 { 281 {
282 HTMLInputElement* input = hostInput(); 282 HTMLInputElement* input = hostInput();
283 if (!input || !input->renderer()) 283 if (!input || !input->renderer())
284 return sliderThumbShadowPartId(); 284 return sliderThumbShadowPartId();
285 285
286 LayoutStyle* sliderStyle = input->renderer()->style(); 286 const LayoutStyle& sliderStyle = input->renderer()->styleRef();
287 switch (sliderStyle->appearance()) { 287 switch (sliderStyle.appearance()) {
288 case MediaSliderPart: 288 case MediaSliderPart:
289 case MediaSliderThumbPart: 289 case MediaSliderThumbPart:
290 case MediaVolumeSliderPart: 290 case MediaVolumeSliderPart:
291 case MediaVolumeSliderThumbPart: 291 case MediaVolumeSliderThumbPart:
292 case MediaFullScreenVolumeSliderPart: 292 case MediaFullScreenVolumeSliderPart:
293 case MediaFullScreenVolumeSliderThumbPart: 293 case MediaFullScreenVolumeSliderThumbPart:
294 return mediaSliderThumbShadowPartId(); 294 return mediaSliderThumbShadowPartId();
295 default: 295 default:
296 return sliderThumbShadowPartId(); 296 return sliderThumbShadowPartId();
297 } 297 }
(...skipping 14 matching lines...) Expand all
312 } 312 }
313 313
314 const AtomicString& SliderContainerElement::shadowPseudoId() const 314 const AtomicString& SliderContainerElement::shadowPseudoId() const
315 { 315 {
316 DEFINE_STATIC_LOCAL(const AtomicString, mediaSliderContainer, ("-webkit-medi a-slider-container", AtomicString::ConstructFromLiteral)); 316 DEFINE_STATIC_LOCAL(const AtomicString, mediaSliderContainer, ("-webkit-medi a-slider-container", AtomicString::ConstructFromLiteral));
317 DEFINE_STATIC_LOCAL(const AtomicString, sliderContainer, ("-webkit-slider-co ntainer", AtomicString::ConstructFromLiteral)); 317 DEFINE_STATIC_LOCAL(const AtomicString, sliderContainer, ("-webkit-slider-co ntainer", AtomicString::ConstructFromLiteral));
318 318
319 if (!shadowHost() || !shadowHost()->renderer()) 319 if (!shadowHost() || !shadowHost()->renderer())
320 return sliderContainer; 320 return sliderContainer;
321 321
322 LayoutStyle* sliderStyle = shadowHost()->renderer()->style(); 322 const LayoutStyle& sliderStyle = shadowHost()->renderer()->styleRef();
323 switch (sliderStyle->appearance()) { 323 switch (sliderStyle.appearance()) {
324 case MediaSliderPart: 324 case MediaSliderPart:
325 case MediaSliderThumbPart: 325 case MediaSliderThumbPart:
326 case MediaVolumeSliderPart: 326 case MediaVolumeSliderPart:
327 case MediaVolumeSliderThumbPart: 327 case MediaVolumeSliderThumbPart:
328 case MediaFullScreenVolumeSliderPart: 328 case MediaFullScreenVolumeSliderPart:
329 case MediaFullScreenVolumeSliderThumbPart: 329 case MediaFullScreenVolumeSliderThumbPart:
330 return mediaSliderContainer; 330 return mediaSliderContainer;
331 default: 331 default:
332 return sliderContainer; 332 return sliderContainer;
333 } 333 }
334 } 334 }
335 335
336 } 336 }
OLDNEW
« no previous file with comments | « Source/core/html/forms/InputType.cpp ('k') | Source/core/layout/LayoutMedia.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698