Merge from Chromium at DEPS revision r210036
This commit was generated by merge_to_master.py.
Change-Id: Ib2112ed87a48d7a6d9c0563ba71850716d1475ef
diff --git a/Source/core/html/shadow/ClearButtonElement.cpp b/Source/core/html/shadow/ClearButtonElement.cpp
index 58acf52..3ac4628 100644
--- a/Source/core/html/shadow/ClearButtonElement.cpp
+++ b/Source/core/html/shadow/ClearButtonElement.cpp
@@ -85,7 +85,7 @@
return;
}
- if (event->type() == eventNames().mousedownEvent && event->isMouseEvent() && static_cast<MouseEvent*>(event)->button() == LeftButton) {
+ if (event->type() == eventNames().mousedownEvent && event->isMouseEvent() && toMouseEvent(event)->button() == LeftButton) {
if (renderer() && renderer()->visibleToHitTesting()) {
if (Frame* frame = document()->frame()) {
frame->eventHandler()->setCapturingMouseEventsNode(this);
@@ -95,7 +95,7 @@
m_clearButtonOwner->focusAndSelectClearButtonOwner();
event->setDefaultHandled();
}
- if (event->type() == eventNames().mouseupEvent && event->isMouseEvent() && static_cast<MouseEvent*>(event)->button() == LeftButton) {
+ if (event->type() == eventNames().mouseupEvent && event->isMouseEvent() && toMouseEvent(event)->button() == LeftButton) {
if (m_capturing) {
if (Frame* frame = document()->frame()) {
frame->eventHandler()->setCapturingMouseEventsNode(0);
diff --git a/Source/core/html/shadow/DateTimeEditElement.cpp b/Source/core/html/shadow/DateTimeEditElement.cpp
index 07b774d..6194d2c 100644
--- a/Source/core/html/shadow/DateTimeEditElement.cpp
+++ b/Source/core/html/shadow/DateTimeEditElement.cpp
@@ -28,22 +28,18 @@
#include "core/html/shadow/DateTimeEditElement.h"
#include "HTMLNames.h"
-#include "core/dom/KeyboardEvent.h"
#include "core/dom/MouseEvent.h"
#include "core/dom/Text.h"
#include "core/html/DateTimeFieldsState.h"
#include "core/html/shadow/DateTimeFieldElements.h"
-#include "core/html/shadow/DateTimeSymbolicFieldElement.h"
#include "core/html/shadow/ShadowElementNames.h"
-#include "core/page/EventHandler.h"
#include "core/platform/DateComponents.h"
#include "core/platform/graphics/FontCache.h"
#include "core/platform/text/DateTimeFormat.h"
#include "core/platform/text/PlatformLocale.h"
#include "core/rendering/style/RenderStyle.h"
#include "core/rendering/style/StyleInheritedData.h"
-#include <wtf/DateMath.h>
-#include <wtf/text/StringBuilder.h>
+#include "wtf/DateMath.h"
namespace WebCore {
diff --git a/Source/core/html/shadow/DateTimeFieldElement.cpp b/Source/core/html/shadow/DateTimeFieldElement.cpp
index db8f421..a53010a 100644
--- a/Source/core/html/shadow/DateTimeFieldElement.cpp
+++ b/Source/core/html/shadow/DateTimeFieldElement.cpp
@@ -57,7 +57,7 @@
didFocus();
if (event->isKeyboardEvent()) {
- KeyboardEvent* keyboardEvent = static_cast<KeyboardEvent*>(event);
+ KeyboardEvent* keyboardEvent = toKeyboardEvent(event);
if (!isDisabled() && !isFieldOwnerDisabled() && !isFieldOwnerReadOnly()) {
handleKeyboardEvent(keyboardEvent);
if (keyboardEvent->defaultHandled())
diff --git a/Source/core/html/shadow/DetailsMarkerControl.cpp b/Source/core/html/shadow/DetailsMarkerControl.cpp
index 84fa604..3d139df 100644
--- a/Source/core/html/shadow/DetailsMarkerControl.cpp
+++ b/Source/core/html/shadow/DetailsMarkerControl.cpp
@@ -44,9 +44,9 @@
{
}
-RenderObject* DetailsMarkerControl::createRenderer(RenderArena* arena, RenderStyle*)
+RenderObject* DetailsMarkerControl::createRenderer(RenderStyle*)
{
- return new (arena) RenderDetailsMarker(this);
+ return new (document()->renderArena()) RenderDetailsMarker(this);
}
bool DetailsMarkerControl::rendererIsNeeded(const NodeRenderingContext& context)
diff --git a/Source/core/html/shadow/DetailsMarkerControl.h b/Source/core/html/shadow/DetailsMarkerControl.h
index 9cd6e66..168491f 100644
--- a/Source/core/html/shadow/DetailsMarkerControl.h
+++ b/Source/core/html/shadow/DetailsMarkerControl.h
@@ -44,7 +44,7 @@
static PassRefPtr<DetailsMarkerControl> create(Document*);
private:
- virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
+ virtual RenderObject* createRenderer(RenderStyle*);
virtual bool rendererIsNeeded(const NodeRenderingContext&);
HTMLSummaryElement* summaryElement();
diff --git a/Source/core/html/shadow/HTMLContentElement.cpp b/Source/core/html/shadow/HTMLContentElement.cpp
index 514855d..79d4f95 100644
--- a/Source/core/html/shadow/HTMLContentElement.cpp
+++ b/Source/core/html/shadow/HTMLContentElement.cpp
@@ -31,7 +31,6 @@
#include "core/css/CSSParser.h"
#include "core/dom/QualifiedName.h"
#include "core/dom/shadow/ShadowRoot.h"
-#include <wtf/StdLibExtras.h>
namespace WebCore {
diff --git a/Source/core/html/shadow/HTMLContentElement.h b/Source/core/html/shadow/HTMLContentElement.h
index 6f30076..a7864a2 100644
--- a/Source/core/html/shadow/HTMLContentElement.h
+++ b/Source/core/html/shadow/HTMLContentElement.h
@@ -33,7 +33,6 @@
#include "core/css/CSSSelectorList.h"
#include "core/dom/shadow/InsertionPoint.h"
-#include <wtf/Forward.h>
namespace WebCore {
diff --git a/Source/core/html/shadow/HTMLShadowElement.cpp b/Source/core/html/shadow/HTMLShadowElement.cpp
index 3c69757..71f8ef0 100644
--- a/Source/core/html/shadow/HTMLShadowElement.cpp
+++ b/Source/core/html/shadow/HTMLShadowElement.cpp
@@ -33,7 +33,6 @@
#include "HTMLNames.h"
#include "core/dom/shadow/ShadowRoot.h"
-#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/Source/core/html/shadow/MediaControlElementTypes.cpp b/Source/core/html/shadow/MediaControlElementTypes.cpp
index bd2f257..c012642 100644
--- a/Source/core/html/shadow/MediaControlElementTypes.cpp
+++ b/Source/core/html/shadow/MediaControlElementTypes.cpp
@@ -167,7 +167,7 @@
void MediaControlVolumeSliderElement::defaultEventHandler(Event* event)
{
// Left button is 0. Rejects mouse events not from left button.
- if (event->isMouseEvent() && static_cast<MouseEvent*>(event)->button())
+ if (event->isMouseEvent() && toMouseEvent(event)->button())
return;
if (!attached())
diff --git a/Source/core/html/shadow/MediaControlElements.cpp b/Source/core/html/shadow/MediaControlElements.cpp
index 243144a..8e22f60 100644
--- a/Source/core/html/shadow/MediaControlElements.cpp
+++ b/Source/core/html/shadow/MediaControlElements.cpp
@@ -32,7 +32,6 @@
#include "core/html/shadow/MediaControlElements.h"
#include "core/dom/EventNames.h"
-#include "core/dom/EventTarget.h"
#include "core/dom/ExceptionCodePlaceholder.h"
#include "core/dom/FullscreenController.h"
#include "core/dom/MouseEvent.h"
@@ -40,21 +39,14 @@
#include "core/html/HTMLVideoElement.h"
#include "core/html/shadow/MediaControls.h"
#include "core/html/track/TextTrack.h"
-#include "core/html/track/TextTrackList.h"
-#include "core/html/track/TextTrackRegionList.h"
#include "core/page/EventHandler.h"
#include "core/page/Frame.h"
#include "core/page/Page.h"
-#include "core/page/PageGroup.h"
#include "core/page/Settings.h"
-#include "core/platform/LocalizedStrings.h"
-#include "core/platform/graphics/GraphicsContext.h"
-#include "core/rendering/RenderLayer.h"
#include "core/rendering/RenderMediaControlElements.h"
#include "core/rendering/RenderSlider.h"
#include "core/rendering/RenderTheme.h"
#include "core/rendering/RenderVideo.h"
-#include "core/rendering/RenderView.h"
namespace WebCore {
@@ -224,7 +216,7 @@
MediaControlDivElement::defaultEventHandler(event);
if (event->isMouseEvent()) {
- LayoutPoint location = static_cast<MouseEvent*>(event)->absoluteLocation();
+ LayoutPoint location = toMouseEvent(event)->absoluteLocation();
if (event->type() == eventNames().mousedownEvent && event->target() == this) {
startDrag(location);
event->setDefaultHandled();
@@ -490,7 +482,7 @@
void MediaControlTimelineElement::defaultEventHandler(Event* event)
{
// Left button is 0. Rejects mouse events not from left button.
- if (event->isMouseEvent() && static_cast<MouseEvent*>(event)->button())
+ if (event->isMouseEvent() && toMouseEvent(event)->button())
return;
if (!attached())
@@ -672,9 +664,9 @@
return element.release();
}
-RenderObject* MediaControlTextTrackContainerElement::createRenderer(RenderArena* arena, RenderStyle*)
+RenderObject* MediaControlTextTrackContainerElement::createRenderer(RenderStyle*)
{
- return new (arena) RenderTextTrackContainerElement(this);
+ return new (document()->renderArena()) RenderTextTrackContainerElement(this);
}
const AtomicString& MediaControlTextTrackContainerElement::textTrackContainerElementShadowPseudoId()
@@ -757,7 +749,7 @@
// WebVTT region whose region identifier is identical to cue's text
// track cue region identifier, run the following substeps:
#endif
- if (displayBox->hasChildNodes() && !contains(static_cast<Node*>(displayBox.get())))
+ if (displayBox->hasChildNodes() && !contains(displayBox.get()))
// Note: the display tree of a cue is removed when the active flag of the cue is unset.
appendChild(displayBox, ASSERT_NO_EXCEPTION, AttachNow);
#if ENABLE(WEBVTT_REGIONS)
diff --git a/Source/core/html/shadow/MediaControlElements.h b/Source/core/html/shadow/MediaControlElements.h
index 7a4f3b7..712ccbb 100644
--- a/Source/core/html/shadow/MediaControlElements.h
+++ b/Source/core/html/shadow/MediaControlElements.h
@@ -259,7 +259,7 @@
explicit MediaControlTextTrackContainerElement(Document*);
virtual const AtomicString& shadowPseudoId() const OVERRIDE;
- virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
+ virtual RenderObject* createRenderer(RenderStyle*);
IntRect m_videoDisplaySize;
float m_fontSize;
diff --git a/Source/core/html/shadow/MediaControls.cpp b/Source/core/html/shadow/MediaControls.cpp
index 37a0418..4e3ff07 100644
--- a/Source/core/html/shadow/MediaControls.cpp
+++ b/Source/core/html/shadow/MediaControls.cpp
@@ -342,7 +342,7 @@
{
if (!event->isMouseEvent())
return false;
- EventTarget* relatedTarget = static_cast<MouseEvent*>(event)->relatedTarget();
+ EventTarget* relatedTarget = toMouseEvent(event)->relatedTarget();
if (!relatedTarget)
return false;
return contains(relatedTarget->toNode());
diff --git a/Source/core/html/shadow/MediaControls.h b/Source/core/html/shadow/MediaControls.h
index b83157f..cb65516 100644
--- a/Source/core/html/shadow/MediaControls.h
+++ b/Source/core/html/shadow/MediaControls.h
@@ -27,18 +27,11 @@
#ifndef MediaControls_h
#define MediaControls_h
-#include "HTMLNames.h"
#include "core/dom/MouseEvent.h"
-#include "core/dom/Text.h"
#include "core/html/HTMLDivElement.h"
-#include "core/html/HTMLMediaElement.h"
#include "core/html/shadow/MediaControlElements.h"
-#include "core/page/Chrome.h"
#include "core/page/Page.h"
#include "core/rendering/RenderTheme.h"
-#include <wtf/RefPtr.h>
-
-#include "core/html/track/TextTrackCue.h"
namespace WebCore {
diff --git a/Source/core/html/shadow/MeterShadowElement.cpp b/Source/core/html/shadow/MeterShadowElement.cpp
index 482c4eb..df0220b 100644
--- a/Source/core/html/shadow/MeterShadowElement.cpp
+++ b/Source/core/html/shadow/MeterShadowElement.cpp
@@ -79,9 +79,9 @@
return render && !render->theme()->supportsMeter(render->style()->appearance()) && HTMLDivElement::rendererIsNeeded(context);
}
-RenderObject* MeterInnerElement::createRenderer(RenderArena* arena, RenderStyle*)
+RenderObject* MeterInnerElement::createRenderer(RenderStyle*)
{
- return new (arena) RenderMeter(this);
+ return new (document()->renderArena()) RenderMeter(this);
}
inline MeterBarElement::MeterBarElement(Document* document)
diff --git a/Source/core/html/shadow/MeterShadowElement.h b/Source/core/html/shadow/MeterShadowElement.h
index e076515..a7b644c 100644
--- a/Source/core/html/shadow/MeterShadowElement.h
+++ b/Source/core/html/shadow/MeterShadowElement.h
@@ -55,7 +55,7 @@
private:
MeterInnerElement(Document*);
virtual bool rendererIsNeeded(const NodeRenderingContext&) OVERRIDE;
- virtual RenderObject* createRenderer(RenderArena*, RenderStyle*) OVERRIDE;
+ virtual RenderObject* createRenderer(RenderStyle*) OVERRIDE;
};
class MeterBarElement FINAL : public MeterShadowElement {
diff --git a/Source/core/html/shadow/PickerIndicatorElement.cpp b/Source/core/html/shadow/PickerIndicatorElement.cpp
index 37531e4..3fedf69 100644
--- a/Source/core/html/shadow/PickerIndicatorElement.cpp
+++ b/Source/core/html/shadow/PickerIndicatorElement.cpp
@@ -64,9 +64,9 @@
ASSERT(!m_chooser);
}
-RenderObject* PickerIndicatorElement::createRenderer(RenderArena* arena, RenderStyle*)
+RenderObject* PickerIndicatorElement::createRenderer(RenderStyle*)
{
- return new (arena) RenderDetailsMarker(this);
+ return new (document()->renderArena()) RenderDetailsMarker(this);
}
void PickerIndicatorElement::defaultEventHandler(Event* event)
diff --git a/Source/core/html/shadow/PickerIndicatorElement.h b/Source/core/html/shadow/PickerIndicatorElement.h
index 496d151..29aff6e 100644
--- a/Source/core/html/shadow/PickerIndicatorElement.h
+++ b/Source/core/html/shadow/PickerIndicatorElement.h
@@ -35,7 +35,6 @@
#include "core/html/HTMLDivElement.h"
#include "core/platform/DateTimeChooser.h"
#include "core/platform/DateTimeChooserClient.h"
-#include <wtf/OwnPtr.h>
namespace WebCore {
@@ -67,7 +66,7 @@
private:
PickerIndicatorElement(Document*, PickerIndicatorOwner&);
- virtual RenderObject* createRenderer(RenderArena*, RenderStyle*) OVERRIDE;
+ virtual RenderObject* createRenderer(RenderStyle*) OVERRIDE;
virtual void defaultEventHandler(Event*) OVERRIDE;
virtual void detach(const AttachContext& = AttachContext()) OVERRIDE;
virtual bool isPickerIndicatorElement() const OVERRIDE;
diff --git a/Source/core/html/shadow/ProgressShadowElement.cpp b/Source/core/html/shadow/ProgressShadowElement.cpp
index f7fdc8a..6411544 100644
--- a/Source/core/html/shadow/ProgressShadowElement.cpp
+++ b/Source/core/html/shadow/ProgressShadowElement.cpp
@@ -70,9 +70,9 @@
return element.release();
}
-RenderObject* ProgressInnerElement::createRenderer(RenderArena* arena, RenderStyle*)
+RenderObject* ProgressInnerElement::createRenderer(RenderStyle*)
{
- return new (arena) RenderProgress(this);
+ return new (document()->renderArena()) RenderProgress(this);
}
bool ProgressInnerElement::rendererIsNeeded(const NodeRenderingContext& context)
diff --git a/Source/core/html/shadow/ProgressShadowElement.h b/Source/core/html/shadow/ProgressShadowElement.h
index db6e4d2..68b5f64 100644
--- a/Source/core/html/shadow/ProgressShadowElement.h
+++ b/Source/core/html/shadow/ProgressShadowElement.h
@@ -54,7 +54,7 @@
static PassRefPtr<ProgressInnerElement> create(Document*);
private:
- virtual RenderObject* createRenderer(RenderArena*, RenderStyle*) OVERRIDE;
+ virtual RenderObject* createRenderer(RenderStyle*) OVERRIDE;
virtual bool rendererIsNeeded(const NodeRenderingContext&);
};
diff --git a/Source/core/html/shadow/SliderThumbElement.cpp b/Source/core/html/shadow/SliderThumbElement.cpp
index 3579d9a..24d35eb 100644
--- a/Source/core/html/shadow/SliderThumbElement.cpp
+++ b/Source/core/html/shadow/SliderThumbElement.cpp
@@ -44,7 +44,6 @@
#include "core/rendering/RenderFlexibleBox.h"
#include "core/rendering/RenderSlider.h"
#include "core/rendering/RenderTheme.h"
-#include <wtf/MathExtras.h>
using namespace std;
@@ -220,9 +219,9 @@
renderer()->setNeedsLayout(true);
}
-RenderObject* SliderThumbElement::createRenderer(RenderArena* arena, RenderStyle*)
+RenderObject* SliderThumbElement::createRenderer(RenderStyle*)
{
- return new (arena) RenderSliderThumb(this);
+ return new (document()->renderArena()) RenderSliderThumb(this);
}
bool SliderThumbElement::isDisabledFormControl() const
@@ -348,7 +347,7 @@
return;
}
- MouseEvent* mouseEvent = static_cast<MouseEvent*>(event);
+ MouseEvent* mouseEvent = toMouseEvent(event);
bool isLeftButton = mouseEvent->button() == LeftButton;
const AtomicString& eventType = event->type();
@@ -448,9 +447,9 @@
return adoptRef(new SliderContainerElement(document));
}
-RenderObject* SliderContainerElement::createRenderer(RenderArena* arena, RenderStyle*)
+RenderObject* SliderContainerElement::createRenderer(RenderStyle*)
{
- return new (arena) RenderSliderContainer(this);
+ return new (document()->renderArena()) RenderSliderContainer(this);
}
const AtomicString& SliderContainerElement::shadowPseudoId() const
diff --git a/Source/core/html/shadow/SliderThumbElement.h b/Source/core/html/shadow/SliderThumbElement.h
index 983d44b..e6ddcf7 100644
--- a/Source/core/html/shadow/SliderThumbElement.h
+++ b/Source/core/html/shadow/SliderThumbElement.h
@@ -34,10 +34,8 @@
#include "HTMLNames.h"
#include "core/html/HTMLDivElement.h"
-#include "core/platform/graphics/FloatPoint.h"
#include "core/rendering/RenderBlock.h"
-#include "core/rendering/style/RenderStyleConstants.h"
-#include <wtf/Forward.h>
+#include "wtf/Forward.h"
namespace WebCore {
@@ -63,7 +61,7 @@
private:
SliderThumbElement(Document*);
- virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
+ virtual RenderObject* createRenderer(RenderStyle*);
virtual PassRefPtr<Element> cloneElementWithoutAttributesAndChildren();
virtual bool isDisabledFormControl() const OVERRIDE;
virtual bool matchesReadOnlyPseudoClass() const OVERRIDE;
@@ -121,7 +119,7 @@
private:
SliderContainerElement(Document*);
- virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
+ virtual RenderObject* createRenderer(RenderStyle*);
virtual const AtomicString& shadowPseudoId() const;
};
diff --git a/Source/core/html/shadow/SpinButtonElement.cpp b/Source/core/html/shadow/SpinButtonElement.cpp
index f82212f..17c1d41 100644
--- a/Source/core/html/shadow/SpinButtonElement.cpp
+++ b/Source/core/html/shadow/SpinButtonElement.cpp
@@ -88,7 +88,7 @@
return;
}
- MouseEvent* mouseEvent = static_cast<MouseEvent*>(event);
+ MouseEvent* mouseEvent = toMouseEvent(event);
IntPoint local = roundedIntPoint(box->absoluteToLocal(mouseEvent->absoluteLocation(), UseTransforms));
if (mouseEvent->type() == eventNames().mousedownEvent && mouseEvent->button() == LeftButton) {
if (box->pixelSnappedBorderBoxRect().contains(local)) {
diff --git a/Source/core/html/shadow/TextControlInnerElements.cpp b/Source/core/html/shadow/TextControlInnerElements.cpp
index 0eb551d..def5731 100644
--- a/Source/core/html/shadow/TextControlInnerElements.cpp
+++ b/Source/core/html/shadow/TextControlInnerElements.cpp
@@ -29,23 +29,19 @@
#include "HTMLNames.h"
#include "bindings/v8/ScriptController.h"
-#include "core/dom/BeforeTextInsertedEvent.h"
#include "core/dom/Document.h"
#include "core/dom/EventNames.h"
#include "core/dom/MouseEvent.h"
#include "core/dom/TextEvent.h"
#include "core/dom/TextEventInputType.h"
#include "core/html/HTMLInputElement.h"
-#include "core/html/HTMLTextAreaElement.h"
#include "core/page/EventHandler.h"
#include "core/page/Frame.h"
-#include "core/page/Page.h"
#include "core/page/SpeechInput.h"
#include "core/page/SpeechInputEvent.h"
#include "core/rendering/RenderSearchField.h"
#include "core/rendering/RenderTextControl.h"
#include "core/rendering/RenderView.h"
-#include "core/rendering/style/StyleInheritedData.h"
namespace WebCore {
@@ -61,9 +57,9 @@
return adoptRef(new TextControlInnerContainer(document));
}
-RenderObject* TextControlInnerContainer::createRenderer(RenderArena* arena, RenderStyle*)
+RenderObject* TextControlInnerContainer::createRenderer(RenderStyle*)
{
- return new (arena) RenderTextControlInnerContainer(this);
+ return new (document()->renderArena()) RenderTextControlInnerContainer(this);
}
TextControlInnerElement::TextControlInnerElement(Document* document)
@@ -115,9 +111,9 @@
HTMLDivElement::defaultEventHandler(event);
}
-RenderObject* TextControlInnerTextElement::createRenderer(RenderArena* arena, RenderStyle*)
+RenderObject* TextControlInnerTextElement::createRenderer(RenderStyle*)
{
- return new (arena) RenderTextControlInnerBlock(this);
+ return new (document()->renderArena()) RenderTextControlInnerBlock(this);
}
PassRefPtr<RenderStyle> TextControlInnerTextElement::customStyleForRenderer()
@@ -157,7 +153,7 @@
{
// On mousedown, focus the search field
HTMLInputElement* input = toHTMLInputElement(shadowHost());
- if (input && event->type() == eventNames().mousedownEvent && event->isMouseEvent() && static_cast<MouseEvent*>(event)->button() == LeftButton) {
+ if (input && event->type() == eventNames().mousedownEvent && event->isMouseEvent() && toMouseEvent(event)->button() == LeftButton) {
input->focus();
input->select();
RenderSearchField* renderer = toRenderSearchField(input->renderer());
@@ -208,7 +204,7 @@
return;
}
- if (event->type() == eventNames().mousedownEvent && event->isMouseEvent() && static_cast<MouseEvent*>(event)->button() == LeftButton) {
+ if (event->type() == eventNames().mousedownEvent && event->isMouseEvent() && toMouseEvent(event)->button() == LeftButton) {
if (renderer() && renderer()->visibleToHitTesting()) {
if (Frame* frame = document()->frame()) {
frame->eventHandler()->setCapturingMouseEventsNode(this);
@@ -219,7 +215,7 @@
input->select();
event->setDefaultHandled();
}
- if (event->type() == eventNames().mouseupEvent && event->isMouseEvent() && static_cast<MouseEvent*>(event)->button() == LeftButton) {
+ if (event->type() == eventNames().mouseupEvent && event->isMouseEvent() && toMouseEvent(event)->button() == LeftButton) {
if (m_capturing) {
if (Frame* frame = document()->frame()) {
frame->eventHandler()->setCapturingMouseEventsNode(0);
@@ -296,7 +292,7 @@
}
// On mouse down, select the text and set focus.
- if (event->type() == eventNames().mousedownEvent && event->isMouseEvent() && static_cast<MouseEvent*>(event)->button() == LeftButton) {
+ if (event->type() == eventNames().mousedownEvent && event->isMouseEvent() && toMouseEvent(event)->button() == LeftButton) {
if (renderer() && renderer()->visibleToHitTesting()) {
if (Frame* frame = document()->frame()) {
frame->eventHandler()->setCapturingMouseEventsNode(this);
@@ -309,7 +305,7 @@
event->setDefaultHandled();
}
// On mouse up, release capture cleanly.
- if (event->type() == eventNames().mouseupEvent && event->isMouseEvent() && static_cast<MouseEvent*>(event)->button() == LeftButton) {
+ if (event->type() == eventNames().mouseupEvent && event->isMouseEvent() && toMouseEvent(event)->button() == LeftButton) {
if (m_capturing && renderer() && renderer()->visibleToHitTesting()) {
if (Frame* frame = document()->frame()) {
frame->eventHandler()->setCapturingMouseEventsNode(0);
diff --git a/Source/core/html/shadow/TextControlInnerElements.h b/Source/core/html/shadow/TextControlInnerElements.h
index 78ad561..2bb6e24 100644
--- a/Source/core/html/shadow/TextControlInnerElements.h
+++ b/Source/core/html/shadow/TextControlInnerElements.h
@@ -40,7 +40,7 @@
static PassRefPtr<TextControlInnerContainer> create(Document*);
protected:
TextControlInnerContainer(Document*);
- virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
+ virtual RenderObject* createRenderer(RenderStyle*);
};
class TextControlInnerElement FINAL : public HTMLDivElement {
@@ -63,7 +63,7 @@
private:
TextControlInnerTextElement(Document*);
- virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
+ virtual RenderObject* createRenderer(RenderStyle*);
virtual PassRefPtr<RenderStyle> customStyleForRenderer() OVERRIDE;
virtual bool isMouseFocusable() const { return false; }
};
diff --git a/Source/core/html/shadow/TextFieldDecorationElement.cpp b/Source/core/html/shadow/TextFieldDecorationElement.cpp
index f281d43..5020fc7 100644
--- a/Source/core/html/shadow/TextFieldDecorationElement.cpp
+++ b/Source/core/html/shadow/TextFieldDecorationElement.cpp
@@ -111,10 +111,10 @@
ASSERT(existingRoot);
RefPtr<HTMLDivElement> box = HTMLDivElement::create(input->document());
decorationRoot->appendChild(box);
- box->setInlineStyleProperty(CSSPropertyDisplay, CSSValueWebkitFlex);
- box->setInlineStyleProperty(CSSPropertyWebkitAlignItems, CSSValueCenter);
+ box->setInlineStyleProperty(CSSPropertyDisplay, CSSValueFlex);
+ box->setInlineStyleProperty(CSSPropertyAlignItems, CSSValueCenter);
ASSERT(existingRoot->childNodeCount() == 1);
- toHTMLElement(existingRoot->firstChild())->setInlineStyleProperty(CSSPropertyWebkitFlexGrow, 1.0, CSSPrimitiveValue::CSS_NUMBER);
+ toHTMLElement(existingRoot->firstChild())->setInlineStyleProperty(CSSPropertyFlexGrow, 1.0, CSSPrimitiveValue::CSS_NUMBER);
box->appendChild(HTMLShadowElement::create(HTMLNames::shadowTag, input->document()));
setInlineStyleProperty(CSSPropertyDisplay, visible ? CSSValueBlock : CSSValueNone);
box->appendChild(this);
@@ -162,9 +162,9 @@
return style.release();
}
-RenderObject* TextFieldDecorationElement::createRenderer(RenderArena* arena, RenderStyle*)
+RenderObject* TextFieldDecorationElement::createRenderer(RenderStyle*)
{
- RenderImage* image = new (arena) RenderImage(this);
+ RenderImage* image = new (document()->renderArena()) RenderImage(this);
image->setImageResource(RenderImageResource::create());
return image;
}
diff --git a/Source/core/html/shadow/TextFieldDecorationElement.h b/Source/core/html/shadow/TextFieldDecorationElement.h
index 5222044..e4cd73b 100644
--- a/Source/core/html/shadow/TextFieldDecorationElement.h
+++ b/Source/core/html/shadow/TextFieldDecorationElement.h
@@ -79,7 +79,7 @@
TextFieldDecorationElement(Document*, TextFieldDecorator*);
virtual bool isTextFieldDecoration() const OVERRIDE;
virtual PassRefPtr<RenderStyle> customStyleForRenderer() OVERRIDE;
- virtual RenderObject* createRenderer(RenderArena*, RenderStyle*) OVERRIDE;
+ virtual RenderObject* createRenderer(RenderStyle*) OVERRIDE;
virtual void attach(const AttachContext& = AttachContext()) OVERRIDE;
virtual void detach(const AttachContext& = AttachContext()) OVERRIDE;
virtual bool isMouseFocusable() const OVERRIDE;