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

Side by Side Diff: webkit/glue/glue_util.cc

Issue 46094: Fix our handling of mixed SSL / non-SSL content.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "base/compiler_specific.h" 6 #include "base/compiler_specific.h"
7 7
8 #include "webkit/glue/glue_util.h" 8 #include "webkit/glue/glue_util.h"
9 9
10 #include <string> 10 #include <string>
11 11
12 MSVC_PUSH_WARNING_LEVEL(0); 12 MSVC_PUSH_WARNING_LEVEL(0);
13 #include "CString.h" 13 #include "CString.h"
14 #include "Frame.h"
14 #include "IntRect.h" 15 #include "IntRect.h"
15 #include "PlatformString.h" 16 #include "PlatformString.h"
16 #include "KURL.h" 17 #include "KURL.h"
17 MSVC_POP_WARNING(); 18 MSVC_POP_WARNING();
18 19
19 #include "WebString.h" 20 #include "WebString.h"
20 21
21 #undef LOG 22 #undef LOG
22 #include "base/compiler_specific.h" 23 #include "base/compiler_specific.h"
23 #include "base/gfx/rect.h" 24 #include "base/gfx/rect.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 137
137 gfx::Rect FromIntRect(const WebCore::IntRect& r) { 138 gfx::Rect FromIntRect(const WebCore::IntRect& r) {
138 return gfx::Rect(r.x(), r.y(), r.width() < 0 ? 0 : r.width(), 139 return gfx::Rect(r.x(), r.y(), r.width() < 0 ? 0 : r.width(),
139 r.height() < 0 ? 0 : r.height()); 140 r.height() < 0 ? 0 : r.height());
140 } 141 }
141 142
142 WebCore::IntRect ToIntRect(const gfx::Rect& r) { 143 WebCore::IntRect ToIntRect(const gfx::Rect& r) {
143 return WebCore::IntRect(r.x(), r.y(), r.width(), r.height()); 144 return WebCore::IntRect(r.x(), r.y(), r.width(), r.height());
144 } 145 }
145 146
147 // Security --------------------------------------------------------------------
148
149 std::string FrameToOrigin(WebCore::Frame* frame) {
150 if (!frame || !frame->document())
151 return "null";
152 return StringToStdString(frame->document()->securityOrigin()->toString());
153 }
154
146 } // namespace webkit_glue 155 } // namespace webkit_glue
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698