| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 } | 106 } |
| 107 | 107 |
| 108 // |uniqueName| is normally calculated in a somewhat complicated way by the | 108 // |uniqueName| is normally calculated in a somewhat complicated way by the |
| 109 // FrameTree class, but for test purposes the approximation below should be | 109 // FrameTree class, but for test purposes the approximation below should be |
| 110 // close enough. | 110 // close enough. |
| 111 String nameToUniqueName(const String& name) | 111 String nameToUniqueName(const String& name) |
| 112 { | 112 { |
| 113 static int uniqueNameCounter = 0; | 113 static int uniqueNameCounter = 0; |
| 114 StringBuilder uniqueName; | 114 StringBuilder uniqueName; |
| 115 uniqueName.append(name); | 115 uniqueName.append(name); |
| 116 uniqueName.append(" "); | 116 uniqueName.append(' '); |
| 117 uniqueName.appendNumber(uniqueNameCounter++); | 117 uniqueName.appendNumber(uniqueNameCounter++); |
| 118 return uniqueName.toString(); | 118 return uniqueName.toString(); |
| 119 } | 119 } |
| 120 | 120 |
| 121 } // namespace | 121 } // namespace |
| 122 | 122 |
| 123 void loadFrame(WebFrame* frame, const std::string& url) | 123 void loadFrame(WebFrame* frame, const std::string& url) |
| 124 { | 124 { |
| 125 WebURLRequest urlRequest; | 125 WebURLRequest urlRequest; |
| 126 urlRequest.initialize(); | 126 urlRequest.initialize(); |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 m_testWebViewClient->scheduleAnimation(); | 338 m_testWebViewClient->scheduleAnimation(); |
| 339 } | 339 } |
| 340 | 340 |
| 341 void TestWebViewWidgetClient::didMeaningfulLayout(WebMeaningfulLayout layoutType
) | 341 void TestWebViewWidgetClient::didMeaningfulLayout(WebMeaningfulLayout layoutType
) |
| 342 { | 342 { |
| 343 m_testWebViewClient->didMeaningfulLayout(layoutType); | 343 m_testWebViewClient->didMeaningfulLayout(layoutType); |
| 344 } | 344 } |
| 345 | 345 |
| 346 } // namespace FrameTestHelpers | 346 } // namespace FrameTestHelpers |
| 347 } // namespace blink | 347 } // namespace blink |
| OLD | NEW |