Move Color.*, DashArray and DrawLooper to Source/platform/

Move Color.*, DashArray and DrawLooper to Source/platform/

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=160838

[rwlbuis, 2013-10-25 15:16:19]

More groundwork, I need to move Color before GraphicsContext and such important
classes can be moved.

[abarth-chromium, 2013-10-25 15:24:17]

LGTM with a couple comments below.

https://codereview.chromium.org/42313002/diff/330001/Source/core/core_derived...
File Source/core/core_derived_sources.gyp (right):

https://codereview.chromium.org/42313002/diff/330001/Source/core/core_derived...
Source/core/core_derived_sources.gyp:641: },
This looks like a bad merge.  You don't need to add this here.

https://codereview.chromium.org/42313002/diff/330001/Source/platform/HashTools.h
File Source/platform/HashTools.h (right):

https://codereview.chromium.org/42313002/diff/330001/Source/platform/HashTool...
Source/platform/HashTools.h:42: const Value* findValue(register const char* str,
register unsigned len);
These don't need to be exported?

https://codereview.chromium.org/42313002/diff/330001/Source/platform/platform...
File Source/platform/platform_derived_sources.gyp (right):

https://codereview.chromium.org/42313002/diff/330001/Source/platform/platform...
Source/platform/platform_derived_sources.gyp:35: '../core/core.gypi',
This is a bad dependency.  You should move the gperf_exe and related variables
from core.gypi to scripts.gypi.

https://codereview.chromium.org/42313002/diff/330001/Source/platform/platform...
Source/platform/platform_derived_sources.gyp:62: {
bad indent

[rwlbuis, 2013-10-25 15:44:27]

Fix the comments.

https://codereview.chromium.org/42313002/diff/330001/Source/core/core_derived...
File Source/core/core_derived_sources.gyp (right):

https://codereview.chromium.org/42313002/diff/330001/Source/core/core_derived...
Source/core/core_derived_sources.gyp:641: },
On 2013/10/25 15:24:18, abarth wrote:
> This looks like a bad merge.  You don't need to add this here.

Done.

https://codereview.chromium.org/42313002/diff/330001/Source/platform/HashTools.h
File Source/platform/HashTools.h (right):

https://codereview.chromium.org/42313002/diff/330001/Source/platform/HashTool...
Source/platform/HashTools.h:42: const Value* findValue(register const char* str,
register unsigned len);
On 2013/10/25 15:24:18, abarth wrote:
> These don't need to be exported?

Likely two of those, you are right. findColor is only used in platform/.

https://codereview.chromium.org/42313002/diff/330001/Source/platform/platform...
File Source/platform/platform_derived_sources.gyp (right):

https://codereview.chromium.org/42313002/diff/330001/Source/platform/platform...
Source/platform/platform_derived_sources.gyp:35: '../core/core.gypi',
On 2013/10/25 15:24:18, abarth wrote:
> This is a bad dependency.  You should move the gperf_exe and related variables
> from core.gypi to scripts.gypi.

Done.

https://codereview.chromium.org/42313002/diff/330001/Source/platform/platform...
Source/platform/platform_derived_sources.gyp:62: {
On 2013/10/25 15:24:18, abarth wrote:
> bad indent

Done.

[abarth-chromium, 2013-10-25 16:16:37]

one more nit:

https://codereview.chromium.org/42313002/diff/410001/Source/core/core.gypi
File Source/core/core.gypi (right):

https://codereview.chromium.org/42313002/diff/410001/Source/core/core.gypi#ne...
Source/core/core.gypi:3633: ],
You should probably move this whole block.  Now you've got multiple definitions
of perl_exe, for example.  You can add more includes of scripts.gypi if you need
to.

[rwlbuis, 2013-10-25 17:39:47]

Fix nit :)

https://codereview.chromium.org/42313002/diff/410001/Source/core/core.gypi
File Source/core/core.gypi (right):

https://codereview.chromium.org/42313002/diff/410001/Source/core/core.gypi#ne...
Source/core/core.gypi:3633: ],
On 2013/10/25 16:16:38, abarth wrote:
> You should probably move this whole block.  Now you've got multiple
definitions
> of perl_exe, for example.  You can add more includes of scripts.gypi if you
need
> to.

Done.

[abarth-chromium, 2013-10-25 20:14:46]

LGTM

[commit-bot: I haz the power, 2013-10-25 20:15:25]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rob.buis@samsung.com/42313002/460001

[commit-bot: I haz the power, 2013-10-25 20:15:57]

Failed to apply patch for Source/platform/blink_platform.gyp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/platform/blink_platform.gyp
  Hunk #1 FAILED at 91.
  1 out of 1 hunk FAILED -- saving rejects to file
Source/platform/blink_platform.gyp.rej

Patch:       Source/platform/blink_platform.gyp
Index: Source/platform/blink_platform.gyp
diff --git a/Source/platform/blink_platform.gyp
b/Source/platform/blink_platform.gyp
index
e373c90c002b753d4f4bbb0af3f4da35d7b61f31..7e10a92ca5dc3c0e6a4a604ee2fcaa9a3424c354
100644
--- a/Source/platform/blink_platform.gyp
+++ b/Source/platform/blink_platform.gyp
@@ -91,6 +91,7 @@
 
       # Additional .cpp files from
platform_derived_sources.gyp:make_platform_derived_sources actions.
       '<(SHARED_INTERMEDIATE_DIR)/blink/FontFamilyNames.cpp',
+      '<(SHARED_INTERMEDIATE_DIR)/blink/ColorData.cpp',
     ],
     # Disable c4267 warnings until we fix size_t to int truncations.
     # Disable c4724 warnings which is generated in VS2012 due to improper

[commit-bot: I haz the power, 2013-10-25 21:15:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rob.buis@samsung.com/42313002/530001

[commit-bot: I haz the power, 2013-10-25 21:15:29]

Failed to apply patch for Source/core/page/EventHandler.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/page/EventHandler.cpp
  Hunk #1 FAILED at 293.
  Hunk #2 FAILED at 327.
  Hunk #3 FAILED at 1120.
  Hunk #4 FAILED at 1272.
  Hunk #5 FAILED at 1372.
  Hunk #6 FAILED at 1550.
  Hunk #7 FAILED at 1694.
  Hunk #8 FAILED at 2454.
  Hunk #9 FAILED at 2943.
  9 out of 9 hunks FAILED -- saving rejects to file
Source/core/page/EventHandler.cpp.rej

Patch:       Source/core/page/EventHandler.cpp
Index: Source/core/page/EventHandler.cpp
diff --git a/Source/core/page/EventHandler.cpp
b/Source/core/page/EventHandler.cpp
index
8ec32b9fb5634a1c467f93ffcc1ab70649af1dd5..e1764dd196dce17e745732a8e504cb499ca60272
100644
--- a/Source/core/page/EventHandler.cpp
+++ b/Source/core/page/EventHandler.cpp
@@ -293,7 +293,7 @@ EventHandler::EventHandler(Frame* frame)
     , m_mouseDownWasInSubframe(false)
     , m_fakeMouseMoveEventTimer(this,
&EventHandler::fakeMouseMoveEventTimerFired)
     , m_svgPan(false)
-    , m_resizeLayer(0)
+    , m_resizeScrollableArea(0)
     , m_eventHandlerWillResetCapturingMouseEventsNode(0)
     , m_clickCount(0)
     , m_shouldOnlyFireDragOverEvent(false)
@@ -327,7 +327,7 @@ void EventHandler::clear()
     m_hoverTimer.stop();
     m_cursorUpdateTimer.stop();
     m_fakeMouseMoveEventTimer.stop();
-    m_resizeLayer = 0;
+    m_resizeScrollableArea = 0;
     m_nodeUnderMouse = 0;
     m_lastNodeUnderMouse = 0;
     m_instanceUnderMouse = 0;
@@ -1120,7 +1120,7 @@ void EventHandler::updateCursor()
 
 OptionalCursor EventHandler::selectCursor(const HitTestResult& result, bool
shiftKey)
 {
-    if (m_resizeLayer && m_resizeLayer->inResizeMode())
+    if (m_resizeScrollableArea && m_resizeScrollableArea->inResizeMode())
         return NoCursorChange;
 
     Page* page = m_frame->page();
@@ -1272,7 +1272,7 @@ OptionalCursor EventHandler::selectAutoCursor(const
HitTestResult& result, Node*
     if (renderer) {
         if (RenderLayer* layer = renderer->enclosingLayer()) {
             if (FrameView* view = m_frame->view())
-                inResizer =
layer->isPointInResizeControl(result.roundedPointInMainFrame(),
ResizerForPointer);
+                inResizer = layer->scrollableArea() &&
layer->scrollableArea()->isPointInResizeControl(result.roundedPointInMainFrame(),
ResizerForPointer);
         }
     }
 
@@ -1372,9 +1372,9 @@ bool EventHandler::handleMousePressEvent(const
PlatformMouseEvent& mouseEvent)
     if (FrameView* view = m_frame->view()) {
         RenderLayer* layer = m_clickNode->renderer() ?
m_clickNode->renderer()->enclosingLayer() : 0;
         IntPoint p = view->windowToContents(mouseEvent.position());
-        if (layer && layer->isPointInResizeControl(p, ResizerForPointer)) {
-            layer->setInResizeMode(true);
-            m_resizeLayer = layer;
+        if (layer && layer->scrollableArea() &&
layer->scrollableArea()->isPointInResizeControl(p, ResizerForPointer)) {
+            m_resizeScrollableArea = layer->scrollableArea();
+            m_resizeScrollableArea->setInResizeMode(true);
             m_offsetFromResizeCorner = layer->offsetFromResizeCorner(p);
             invalidateClick();
             return true;
@@ -1550,8 +1550,8 @@ bool EventHandler::handleMouseMoveOrLeaveEvent(const
PlatformMouseEvent& mouseEv
 
     Scrollbar* scrollbar = 0;
 
-    if (m_resizeLayer && m_resizeLayer->inResizeMode())
-        m_resizeLayer->resize(mouseEvent, m_offsetFromResizeCorner);
+    if (m_resizeScrollableArea && m_resizeScrollableArea->inResizeMode())
+        m_resizeScrollableArea->resize(mouseEvent, m_offsetFromResizeCorner);
     else {
         if (FrameView* view = m_frame->view())
             scrollbar = view->scrollbarAtPoint(mouseEvent.position());
@@ -1694,9 +1694,9 @@ bool EventHandler::handleMouseReleaseEvent(const
PlatformMouseEvent& mouseEvent)
 
     bool swallowClickEvent = m_clickCount > 0 && !contextMenuEvent &&
mouseIsReleasedOnPressedElement(mev.targetNode(), m_clickNode.get()) &&
!dispatchMouseEvent(EventTypeNames::click, mev.targetNode(), true, m_clickCount,
mouseEvent, true);
 
-    if (m_resizeLayer) {
-        m_resizeLayer->setInResizeMode(false);
-        m_resizeLayer = 0;
+    if (m_resizeScrollableArea) {
+        m_resizeScrollableArea->setInResizeMode(false);
+        m_resizeScrollableArea = 0;
     }
 
     bool swallowMouseReleaseEvent = false;
@@ -2454,22 +2454,22 @@ bool EventHandler::handleScrollGestureOnResizer(Node*
eventTarget, const Platfor
     if (gestureEvent.type() == PlatformEvent::GestureScrollBegin) {
         RenderLayer* layer = eventTarget->renderer() ?
eventTarget->renderer()->enclosingLayer() : 0;
         IntPoint p =
m_frame->view()->windowToContents(gestureEvent.position());
-        if (layer && layer->isPointInResizeControl(p, ResizerForTouch)) {
-            layer->setInResizeMode(true);
-            m_resizeLayer = layer;
+        if (layer && layer->scrollableArea() &&
layer->scrollableArea()->isPointInResizeControl(p, ResizerForTouch)) {
+            m_resizeScrollableArea = layer->scrollableArea();
+            m_resizeScrollableArea->setInResizeMode(true);
             m_offsetFromResizeCorner = layer->offsetFromResizeCorner(p);
             return true;
         }
     } else if (gestureEvent.type() == PlatformEvent::GestureScrollUpdate ||
                gestureEvent.type() ==
PlatformEvent::GestureScrollUpdateWithoutPropagation) {
-        if (m_resizeLayer && m_resizeLayer->inResizeMode()) {
-            m_resizeLayer->resize(gestureEvent, m_offsetFromResizeCorner);
+        if (m_resizeScrollableArea && m_resizeScrollableArea->inResizeMode()) {
+            m_resizeScrollableArea->resize(gestureEvent,
m_offsetFromResizeCorner);
             return true;
         }
     } else if (gestureEvent.type() == PlatformEvent::GestureScrollEnd) {
-        if (m_resizeLayer && m_resizeLayer->inResizeMode()) {
-            m_resizeLayer->setInResizeMode(false);
-            m_resizeLayer = 0;
+        if (m_resizeScrollableArea && m_resizeScrollableArea->inResizeMode()) {
+            m_resizeScrollableArea->setInResizeMode(false);
+            m_resizeScrollableArea = 0;
             return false;
         }
     }
@@ -2943,10 +2943,10 @@ void
EventHandler::setResizingFrameSet(HTMLFrameSetElement* frameSet)
     m_frameSetBeingResized = frameSet;
 }
 
-void EventHandler::resizeLayerDestroyed()
+void EventHandler::resizeScrollableAreaDestroyed()
 {
-    ASSERT(m_resizeLayer);
-    m_resizeLayer = 0;
+    ASSERT(m_resizeScrollableArea);
+    m_resizeScrollableArea = 0;
 }
 
 void EventHandler::hoverTimerFired(Timer<EventHandler>*)

[commit-bot: I haz the power, 2013-10-25 21:43:39]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rob.buis@samsung.com/42313002/600001

[commit-bot: I haz the power, 2013-10-25 22:09:31]

Sorry for I got bad news for ya.
Compile failed with a clobber build on linux_blink.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_blin...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-10-25 22:51:04]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rob.buis@samsung.com/42313002/740001

[commit-bot: I haz the power, 2013-10-25 23:42:20]

Sorry for I got bad news for ya.
Compile failed with a clobber build on win_layout.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_layout...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-10-27 16:50:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rob.buis@samsung.com/42313002/850001

[commit-bot: I haz the power, 2013-10-27 17:52:12]

Sorry for I got bad news for ya.
Compile failed with a clobber build on win_layout.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_layout...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[rwlbuis, 2013-10-28 14:34:58]

Simply moving HashTools.h caused a problem I had not foreseen, the declaration
of findProperty was in platform while the implementation was generated in core!
Windows did not like this.

My fix is to not move HashTools.h (yet), but just the ColorData specific part
and put it in Color.h, note it does need exporting. I think this deserves
another review since it is about how we best organize platform/, I am open for
other suggestions as well.

[abarth-chromium, 2013-10-29 03:39:40]

lgtm

[commit-bot: I haz the power, 2013-10-29 03:42:48]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rob.buis@samsung.com/42313002/970001

[commit-bot: I haz the power, 2013-10-29 03:43:21]

Failed to apply patch for Source/core/platform/graphics/ShadowBlur.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  can't find file to patch at input line 6
  Perhaps you used the wrong -p or --strip option?
  The text leading up to this was:
  --------------------------
  |Index: Source/core/platform/graphics/ShadowBlur.h
  |diff --git a/Source/core/platform/graphics/ShadowBlur.h
b/Source/core/platform/graphics/ShadowBlur.h
  |index
a93eb022bf8d37a69387a56077dd6aa87fa43d41..cc5cb6bb47c5400725625f03aed4104e49c2f970
100644
  |--- a/Source/core/platform/graphics/ShadowBlur.h
  |+++ b/Source/core/platform/graphics/ShadowBlur.h
  --------------------------
  No file to patch.  Skipping patch.
  1 out of 1 hunk ignored

Patch:       Source/core/platform/graphics/ShadowBlur.h
Index: Source/core/platform/graphics/ShadowBlur.h
diff --git a/Source/core/platform/graphics/ShadowBlur.h
b/Source/core/platform/graphics/ShadowBlur.h
index
a93eb022bf8d37a69387a56077dd6aa87fa43d41..cc5cb6bb47c5400725625f03aed4104e49c2f970
100644
--- a/Source/core/platform/graphics/ShadowBlur.h
+++ b/Source/core/platform/graphics/ShadowBlur.h
@@ -29,8 +29,8 @@
 #ifndef ShadowBlur_h
 #define ShadowBlur_h
 
-#include "core/platform/graphics/Color.h"
 #include "platform/geometry/FloatSize.h"
+#include "platform/graphics/Color.h"
 
 #include "wtf/Noncopyable.h"

[commit-bot: I haz the power, 2013-10-29 13:50:34]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rob.buis@samsung.com/42313002/1030001

[commit-bot: I haz the power, 2013-10-29 14:18:39]

Sorry for I got bad news for ya.
Compile failed with a clobber build on mac_blink_rel.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_blink_...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-10-29 14:33:36]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rob.buis@samsung.com/42313002/1200001

[commit-bot: I haz the power, 2013-10-29 15:51:53]

Change committed as 160838