Merge WebKit at r65615 : Initial merge by git.

Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79

1 files changed, 71 insertions, 16 deletions

diff --git a/WebKit/efl/DefaultTheme/widget/scrollbar/scrollbar.edc b/WebKit/efl/DefaultTheme/widget/scrollbar/scrollbar.edc
index 4f59784..b4eead0 100644
--- a/WebKit/efl/DefaultTheme/widget/scrollbar/scrollbar.edc
+++ b/WebKit/efl/DefaultTheme/widget/scrollbar/scrollbar.edc
@@ -1,7 +1,5 @@
 /*
     Copyright (C) 2008,2009 INdT - Instituto Nokia de Tecnologia
-    Copyright (C) 2009,2010 ProFUSION embedded systems
-    Copyright (C) 2009,2010 Samsung Electronics
 
     This file is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -22,7 +20,7 @@
 group {
     name: "scrollbar.vertical";
 
-    min: 10 0; /* if > 0, this is the minimum size that will be allocated.
+    min: 0 0;  /* if > 0, this is the minimum size that will be allocated.
                 * If wants to draw on top, just overflow usign edje's rel1/rel2
                 */
 
@@ -85,20 +83,26 @@ group {
             description {
                min: 10 0;
                max: 10 999999;
+               align: 1.0 0.5;
                state: "default" 0.0;
                color: 255 255 255 0;
             }
          }
+
          part {
             name: "rect.clipper";
             type: RECT;
             description {
                state: "default" 0.0;
                color: 255 255 255 255;
+               rel1.to: "rect.base";
+               rel2.to: "rect.base";
             }
             description {
                state: "hidden" 0.0;
-               color: 255 255 255 128;
+               color: 255 255 255 64;
+               rel1.to: "rect.base";
+               rel2.to: "rect.base";
             }
          }
 
@@ -109,11 +113,31 @@ group {
             clip_to: "rect.clipper";
             description {
                state: "default" 0.0;
+               min: 1 30;
+               max: 1 999999;
+               align: 0.5 0.5;
                image {
                   normal: "widget/scrollbar/scrollbar_v.png";
-                  border: 0 0 6 6;
+                  border: 0 0 15 15;
+                  middle: SOLID;
                }
-           }
+               rel1.to: "rect.base";
+               rel2.to: "rect.base";
+            }
+         }
+
+         part {
+            name: "rect.knobarea";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               min: 5 5;
+               max: 5 999999;
+               align: 0.5 0.5;
+               rel1.to: "rect.base";
+               rel2.to: "rect.base";
+            }
          }
 
          part {
@@ -124,15 +148,17 @@ group {
             dragable {
                 x: 0 0 0;
                 y: 1 1 0;
-                confine: "rect.base";
+                confine: "rect.knobarea";
             }
             description {
                state: "default" 0.0;
-               min: 10 10;
-               max: 10 999999;
+               min: 5 5;
+               max: 5 999999;
+               align: 0.5 0.5;
                image {
                   normal: "widget/scrollbar/scrollbar_knob_v.png";
-                  border: 0 0 6 6;
+                  border: 3 3 3 3;
+                  middle: SOLID;
                }
             }
          }
@@ -171,7 +197,7 @@ group {
 group {
     name: "scrollbar.horizontal";
 
-    min: 0 10; /* if > 0, this is the minimum size that will be allocated.
+    min: 0 0;  /* if > 0, this is the minimum size that will be allocated.
                 * If wants to draw on top, just overflow usign edje's rel1/rel2
                 */
 
@@ -235,19 +261,25 @@ group {
                state: "default" 0.0;
                min: 0 10;
                max: 999999 10;
+               align: 0.5 1.0;
                color: 255 255 255 0;
             }
          }
+
          part {
             name: "rect.clipper";
             type: RECT;
             description {
                state: "default" 0.0;
                color: 255 255 255 255;
+               rel1.to: "rect.base";
+               rel2.to: "rect.base";
             }
             description {
                state: "hidden" 0.0;
-               color: 255 255 255 128;
+               color: 255 255 255 64;
+               rel1.to: "rect.base";
+               rel2.to: "rect.base";
             }
          }
 
@@ -258,13 +290,34 @@ group {
             clip_to: "rect.clipper";
             description {
                state: "default" 0.0;
+               min: 30 1;
+               max: 999999 1;
+               align: 0.5 0.5;
                image {
                   normal: "widget/scrollbar/scrollbar_h.png";
-                  border: 6 6 0 0;
+                  border: 15 15 0 0;
+                  middle: SOLID;
                }
+               rel1.to: "rect.base";
+               rel2.to: "rect.base";
            }
          }
 
+
+         part {
+            name: "rect.knobarea";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               min: 5 5;
+               max: 999999 5;
+               align: 0.5 0.5;
+               rel1.to: "rect.base";
+               rel2.to: "rect.base";
+            }
+         }
+
          part {
             name: "img.knob";
             type: IMAGE;
@@ -273,14 +326,16 @@ group {
             dragable {
                 x: 1 1 0;
                 y: 0 0 0;
-                confine: "rect.base";
+                confine: "rect.knobarea";
             }
             description {
                state: "default" 0.0;
-               min: 10 10;
+               min: 5 5;
+               max: 999999 5;
                image {
                   normal: "widget/scrollbar/scrollbar_knob_h.png";
-                  border: 6 6 0 0;
+                  border: 3 3 3 3;
+                  middle: SOLID;
                }
             }
          }