| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2008, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2008, 2010 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 | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 } | 78 } |
| 79 | 79 |
| 80 PassRefPtr<ComputedStyle> EditingViewPortElement::customStyleForLayoutObject() | 80 PassRefPtr<ComputedStyle> EditingViewPortElement::customStyleForLayoutObject() |
| 81 { | 81 { |
| 82 // FXIME: Move these styles to html.css. | 82 // FXIME: Move these styles to html.css. |
| 83 | 83 |
| 84 RefPtr<ComputedStyle> style = ComputedStyle::create(); | 84 RefPtr<ComputedStyle> style = ComputedStyle::create(); |
| 85 style->inheritFrom(shadowHost()->computedStyleRef()); | 85 style->inheritFrom(shadowHost()->computedStyleRef()); |
| 86 | 86 |
| 87 style->setFlexGrow(1); | 87 style->setFlexGrow(1); |
| 88 style->setMinWidth(Length(0, Fixed)); |
| 88 style->setDisplay(BLOCK); | 89 style->setDisplay(BLOCK); |
| 89 style->setDirection(LTR); | 90 style->setDirection(LTR); |
| 90 | 91 |
| 91 // We don't want the shadow dom to be editable, so we set this block to | 92 // We don't want the shadow dom to be editable, so we set this block to |
| 92 // read-only in case the input itself is editable. | 93 // read-only in case the input itself is editable. |
| 93 style->setUserModify(READ_ONLY); | 94 style->setUserModify(READ_ONLY); |
| 94 style->setUnique(); | 95 style->setUnique(); |
| 95 | 96 |
| 96 return style.release(); | 97 return style.release(); |
| 97 } | 98 } |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 bool SearchFieldCancelButtonElement::willRespondToMouseClickEvents() | 244 bool SearchFieldCancelButtonElement::willRespondToMouseClickEvents() |
| 244 { | 245 { |
| 245 const HTMLInputElement* input = toHTMLInputElement(shadowHost()); | 246 const HTMLInputElement* input = toHTMLInputElement(shadowHost()); |
| 246 if (input && !input->isDisabledOrReadOnly()) | 247 if (input && !input->isDisabledOrReadOnly()) |
| 247 return true; | 248 return true; |
| 248 | 249 |
| 249 return HTMLDivElement::willRespondToMouseClickEvents(); | 250 return HTMLDivElement::willRespondToMouseClickEvents(); |
| 250 } | 251 } |
| 251 | 252 |
| 252 } | 253 } |
| OLD | NEW |