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

Side by Side Diff: Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp

Issue 12320020: Merge 142755 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 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
« no previous file with comments | « Source/WebCore/page/DOMWindow.cpp ('k') | Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.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 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2006 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. 3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
4 * Copyright (C) 2008 Kenneth Rohde Christiansen 4 * Copyright (C) 2008 Kenneth Rohde Christiansen
5 * Copyright (C) 2008 Diego Gonzalez 5 * Copyright (C) 2008 Diego Gonzalez
6 * Copyright (C) 2009-2010 ProFUSION embedded systems 6 * Copyright (C) 2009-2010 ProFUSION embedded systems
7 * Copyright (C) 2009-2012 Samsung Electronics 7 * Copyright (C) 2009-2012 Samsung Electronics
8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
9 * 9 *
10 * All rights reserved. 10 * All rights reserved.
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 int x, y, width, height; 121 int x, y, width, height;
122 122
123 Ecore_Evas* ee = ecore_evas_ecore_evas_get(evas_object_evas_get(m_view)); 123 Ecore_Evas* ee = ecore_evas_ecore_evas_get(evas_object_evas_get(m_view));
124 ecore_evas_request_geometry_get(ee, &x, &y, &width, &height); 124 ecore_evas_request_geometry_get(ee, &x, &y, &width, &height);
125 125
126 return FloatRect(x, y, width, height); 126 return FloatRect(x, y, width, height);
127 } 127 }
128 128
129 void ChromeClientEfl::setWindowRect(const FloatRect& rect) 129 void ChromeClientEfl::setWindowRect(const FloatRect& rect)
130 { 130 {
131 if (!ewk_view_setting_enable_auto_resize_window_get(m_view)) 131 if (!ewk_view_setting_enable_auto_resize_window_get(m_view) || rect.isEmpty( ))
132 return; 132 return;
133 133
134 Ecore_Evas* ee = ecore_evas_ecore_evas_get(evas_object_evas_get(m_view)); 134 Ecore_Evas* ee = ecore_evas_ecore_evas_get(evas_object_evas_get(m_view));
135 ecore_evas_move_resize(ee, rect.x(), rect.y(), rect.width(), rect.height()); 135 ecore_evas_move_resize(ee, rect.x(), rect.y(), rect.width(), rect.height());
136 } 136 }
137 137
138 FloatRect ChromeClientEfl::pageRect() 138 FloatRect ChromeClientEfl::pageRect()
139 { 139 {
140 return ewk_view_page_rect_get(m_view); 140 return ewk_view_page_rect_get(m_view);
141 } 141 }
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
663 WebCore::FloatRect rect = ewk_view_page_rect_get(m_view); 663 WebCore::FloatRect rect = ewk_view_page_rect_get(m_view);
664 const Evas_Object* frame = ewk_view_frame_main_get(m_view); 664 const Evas_Object* frame = ewk_view_frame_main_get(m_view);
665 665
666 int x, y; 666 int x, y;
667 ewk_frame_scroll_pos_get(frame, &x, &y); 667 ewk_frame_scroll_pos_get(frame, &x, &y);
668 return IntRect(x, y, rect.width(), rect.height()); 668 return IntRect(x, y, rect.width(), rect.height());
669 } 669 }
670 #endif 670 #endif
671 671
672 } 672 }
OLDNEW
« no previous file with comments | « Source/WebCore/page/DOMWindow.cpp ('k') | Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698